Skip to content
Permalink
Browse files

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.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857906 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
mthl committed Apr 21, 2019
1 parent e344340 commit 990c8a3aab36bcb7ae003dc6b378461b97e0a416
Showing with 1,246 additions and 1,246 deletions.
  1. +1 −1 applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
  2. +1 −1 applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/FinAccountTests.java
  3. +10 −10 ...ting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
  4. +1 −1 ...unting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java
  5. +1 −1 ...ounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java
  6. +1 −1 ...counting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
  7. +11 −11 ...ions/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
  8. +7 −7 ...ications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
  9. +12 −12 .../accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
  10. +1 −1 applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
  11. +4 −4 applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
  12. +51 −51 applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
  13. +23 −23 applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
  14. +8 −8 applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
  15. +2 −2 applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
  16. +1 −1 applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java
  17. +3 −3 applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java
  18. +3 −3 applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
  19. +3 −3 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
  20. +5 −5 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
  21. +8 −8 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java
  22. +16 −16 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
  23. +1 −1 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java
  24. +3 −3 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
  25. +29 −29 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java
  26. +11 −11 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java
  27. +42 −42 applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
  28. +4 −4 applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java
  29. +18 −18 applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
  30. +15 −15 applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
  31. +2 −2 applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
  32. +2 −2 applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
  33. +1 −1 ...ons/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
  34. +1 −1 ...ications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
  35. +6 −6 ...s/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
  36. +5 −5 ...ations/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
  37. +2 −2 ...tions/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
  38. +16 −16 applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
  39. +10 −10 applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java
  40. +28 −28 applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java
  41. +4 −4 applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.java
  42. +1 −1 ...ications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
  43. +1 −1 ...ns/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
  44. +1 −1 ...ns/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java
  45. +66 −66 .../manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
  46. +5 −5 applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
  47. +3 −3 applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
  48. +1 −1 applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java
  49. +10 −10 ...cations/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java
  50. +2 −2 applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java
  51. +1 −1 applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
  52. +3 −3 applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
  53. +2 −2 applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java
  54. +1 −1 applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
  55. +2 −2 applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
  56. +3 −3 applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java
  57. +7 −7 applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java
  58. +1 −1 ...ons/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java
  59. +2 −2 applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
  60. +1 −1 applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
  61. +1 −1 applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
  62. +1 −1 applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java
  63. +3 −3 applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
  64. +3 −3 applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
  65. +4 −4 applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
  66. +9 −9 applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java
  67. +1 −1 applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
  68. +1 −1 applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
  69. +8 −8 applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
  70. +6 −6 applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
  71. +1 −1 applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
  72. +8 −8 applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
  73. +1 −1 applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
  74. +10 −10 applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
  75. +15 −15 applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java
  76. +16 −16 applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
  77. +3 −3 applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java
  78. +25 −25 applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
  79. +3 −3 applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java
  80. +2 −2 applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java
  81. +13 −13 applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java
  82. +4 −4 applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java
  83. +7 −7 applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
  84. +9 −9 applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
  85. +17 −17 applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
  86. +2 −2 applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java
  87. +1 −1 applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java
  88. +1 −1 applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java
  89. +11 −11 applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java
  90. +2 −2 applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
  91. +2 −2 ...ications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java
  92. +8 −8 applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
  93. +1 −1 ...tions/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java
  94. +3 −3 ...ations/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
  95. +2 −2 framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java
  96. +4 −4 framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java
  97. +1 −1 framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java
  98. +2 −2 framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
  99. +4 −4 ...work/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
  100. +7 −7 framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java
  101. +2 −2 framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
  102. +1 −1 framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
  103. +2 −2 framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java
  104. +3 −3 framework/base/src/main/java/org/apache/ofbiz/base/util/test/ObjectTypeTests.java
  105. +2 −2 framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java
  106. +1 −1 framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
  107. +1 −1 framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java
  108. +5 −5 framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
  109. +1 −1 framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
  110. +4 −4 framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
  111. +4 −4 framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
  112. +4 −4 framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
  113. +2 −2 framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
  114. +1 −1 framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
  115. +3 −3 framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
  116. +2 −2 framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
  117. +1 −1 framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java
  118. +1 −1 framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
  119. +2 −2 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
  120. +2 −2 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java
  121. +16 −16 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java
  122. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java
  123. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java
  124. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java
  125. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java
  126. +2 −2 framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java
  127. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
  128. +28 −28 framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
  129. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
  130. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java
  131. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
  132. +26 −26 framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
  133. +2 −2 framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java
  134. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java
  135. +5 −5 framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
  136. +5 −5 framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
  137. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java
  138. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java
  139. +2 −2 framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java
  140. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
  141. +3 −3 framework/entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java
  142. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
  143. +6 −6 framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
  144. +4 −4 framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
  145. +2 −2 framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
  146. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
  147. +14 −14 framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
  148. +1 −1 framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java
  149. +2 −2 framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
  150. +15 −15 framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java
  151. +3 −3 framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
  152. +3 −3 framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
  153. +2 −2 framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
  154. +5 −5 framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
  155. +6 −6 framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java
  156. +22 −22 framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
  157. +9 −9 framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
  158. +1 −1 framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java
  159. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
  160. +4 −4 framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
  161. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java
  162. +6 −6 framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
  163. +3 −3 framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java
  164. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
  165. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
  166. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
  167. +8 −8 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
  168. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
  169. +3 −3 ...ework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
  170. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
  171. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
  172. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
  173. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java
  174. +1 −1 ...ework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
  175. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java
  176. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
  177. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
  178. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
  179. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
  180. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
  181. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
  182. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
  183. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
  184. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
  185. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
  186. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
  187. +1 −1 ...ork/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
  188. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
  189. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java
  190. +2 −2 framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java
  191. +1 −1 framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java
  192. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java
  193. +2 −2 framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java
  194. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java
  195. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java
  196. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java
  197. +10 −10 framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java
  198. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
  199. +2 −2 framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
  200. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java
  201. +4 −4 framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
  202. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
  203. +8 −8 framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
  204. +3 −3 framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java
  205. +2 −2 framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java
  206. +1 −1 framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java
  207. +1 −1 framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java
  208. +2 −2 framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java
  209. +1 −1 framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
  210. +15 −15 framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
  211. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
  212. +4 −4 framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
  213. +2 −2 framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java
  214. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
  215. +5 −5 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
  216. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
  217. +2 −2 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
  218. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java
  219. +2 −2 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java
  220. +2 −2 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
  221. +3 −3 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
  222. +2 −2 framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java
  223. +11 −11 framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java
  224. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
  225. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java
  226. +1 −1 framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
  227. +35 −35 framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
  228. +32 −32 framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
  229. +2 −2 .../webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
  230. +4 −4 framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
  231. +4 −4 framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
  232. +1 −1 framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java
  233. +5 −5 ...ework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
  234. +26 −26 framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
  235. +8 −8 framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
  236. +1 −1 framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java
  237. +6 −6 framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
  238. +6 −6 framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
  239. +6 −6 framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java
  240. +1 −1 framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java
@@ -72,7 +72,7 @@
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"));
@@ -39,7 +39,7 @@ public FinAccountTests(String name) {

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");
@@ -81,7 +81,7 @@ private static boolean isVoidableResponse(String responseCode) {
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 @@ private static boolean isVoidableResponse(String responseCode) {
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 @@ private static boolean isVoidableResponse(String responseCode) {
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 @@ private static boolean isVoidableResponse(String responseCode) {
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 @@ private static boolean isVoidableResponse(String responseCode) {

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 @@ private static boolean isVoidableResponse(String responseCode) {
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 @@ private static boolean isVoidableResponse(String responseCode) {
}

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 @@ private static void buildVoidTransaction(Map<String, Object> params, Properties
}

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 @@ private static void processCaptureTransResult(Map<String, Object> request, Map<S
}

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 @@ private static void processCaptureTransResult(Map<String, Object> request, Map<S
}

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");
@@ -25,7 +25,7 @@
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);
@@ -25,7 +25,7 @@
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);
@@ -51,7 +51,7 @@
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;
@@ -49,7 +49,7 @@

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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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");
@@ -51,7 +51,7 @@ private 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 @@ private 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 @@ private 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 @@ private 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 @@ private 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 static HttpHost getHost(String hostName, int port, String scheme) {

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 static HttpPost getHttpPost(String uri, Map<String, String> parameters) t
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()));
}

0 comments on commit 990c8a3

Please sign in to comment.
You can’t perform that action at this time.