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

applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java

@@ -72,7 +72,7 @@ public static Map<String, Object> getCommissionForProduct(DispatchContext ctx, M
         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"));

applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/FinAccountTests.java

@@ -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");

applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java

@@ -81,7 +81,7 @@ public static Map<String, Object> ccAuth(DispatchContext ctx, Map<String, Object
         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 static Map<String, Object> ccCapture(DispatchContext ctx, Map<String, Obj
         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 static Map<String, Object> ccRefund(DispatchContext ctx, Map<String, Obje
         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 Map<String, Object> voidTransaction(GenericValue authTransaction,
         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 Map<String, Object> voidTransaction(GenericValue authTransaction,
 
     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 static Map<String, Object> ccAuthCapture(DispatchContext ctx, Map<String,
         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 static Map<String, Object> ccAuthCapture(DispatchContext ctx, Map<String,
     }
 
     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 Map<String, Object> processRefundTransResult(Map<String, Object>
     }
 
     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");

applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java

@@ -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);

applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java

@@ -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);

applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java

@@ -51,7 +51,7 @@ private static Map<String, String> buildCustomerBillingInfo(Map<String, Object>
         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;

applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java

@@ -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 @@ public static Map<String, Object> paymentAuthentication(DispatchContext ctx, Map
         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 static Map<String, Object> paymentAuthentication(DispatchContext ctx, Map
         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 static Map<String, Object> paymentAuthorisation(DispatchContext ctx, Map<
         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 static Map<String, Object> paymentAuthorisation(DispatchContext ctx, Map<
         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 static Map<String, Object> paymentRelease(DispatchContext ctx, Map<String
         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 static Map<String, Object> paymentRelease(DispatchContext ctx, Map<String
         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 static Map<String, Object> paymentVoid(DispatchContext ctx, Map<String, O
         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 static Map<String, Object> paymentVoid(DispatchContext ctx, Map<String, O
         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 static Map<String, Object> paymentRefund(DispatchContext ctx, Map<String,
         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 static Map<String, Object> paymentRefund(DispatchContext ctx, Map<String,
         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");

applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java

@@ -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()));
         }