cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [04/14] cxf git commit: Removing unnecessary type information
Date Fri, 10 Feb 2017 15:41:52 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
index e8639f9..6c7d3e6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
@@ -56,7 +56,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
         TokenProviderParameters providerParameters = 
             createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
         
-        List<AttributeStatementProvider> customProviderList = new ArrayList<AttributeStatementProvider>();
+        List<AttributeStatementProvider> customProviderList = new ArrayList<>();
         customProviderList.add(new CustomAttributeProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList);
         
@@ -84,7 +84,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
             createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
         
         List<AuthenticationStatementProvider> customProviderList = 
-            new ArrayList<AuthenticationStatementProvider>();
+            new ArrayList<>();
         customProviderList.add(new CustomAuthenticationProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAuthenticationStatementProviders(customProviderList);
         
@@ -112,7 +112,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
             createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
         
         List<AuthenticationStatementProvider> customProviderList = 
-            new ArrayList<AuthenticationStatementProvider>();
+            new ArrayList<>();
         customProviderList.add(new CustomAuthenticationProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAuthenticationStatementProviders(customProviderList);
         
@@ -140,12 +140,12 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
             createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
         
         List<AuthenticationStatementProvider> customProviderList = 
-            new ArrayList<AuthenticationStatementProvider>();
+            new ArrayList<>();
         customProviderList.add(new CustomAuthenticationProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAuthenticationStatementProviders(customProviderList);
         
         List<AttributeStatementProvider> customAttributeProviderList = 
-            new ArrayList<AttributeStatementProvider>();
+            new ArrayList<>();
         customAttributeProviderList.add(new CustomAttributeProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customAttributeProviderList);
         
@@ -171,7 +171,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
         TokenProviderParameters providerParameters = 
             createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
         
-        List<AttributeStatementProvider> customProviderList = new ArrayList<AttributeStatementProvider>();
+        List<AttributeStatementProvider> customProviderList = new ArrayList<>();
         customProviderList.add(new CustomAttributeProvider());
         customProviderList.add(new CustomAttributeProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList);
@@ -200,7 +200,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
             createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE);
         
         List<AuthDecisionStatementProvider> customProviderList = 
-            new ArrayList<AuthDecisionStatementProvider>();
+            new ArrayList<>();
         customProviderList.add(new CustomAuthDecisionProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAuthDecisionStatementProviders(customProviderList);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
index aaa4636..1b52e7f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
@@ -479,7 +479,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
         
         STSPropertiesMBean stsProperties = providerParameters.getStsProperties();
         SignatureProperties sigProperties = new SignatureProperties();
-        List<String> acceptedC14nAlgorithms = new ArrayList<String>();
+        List<String> acceptedC14nAlgorithms = new ArrayList<>();
         acceptedC14nAlgorithms.add(WSConstants.C14N_EXCL_OMIT_COMMENTS);
         acceptedC14nAlgorithms.add(WSConstants.C14N_EXCL_WITH_COMMENTS);
         sigProperties.setAcceptedC14nAlgorithms(acceptedC14nAlgorithms);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
index 331979f..aef68a7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
@@ -161,7 +161,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
             // expected on the wrong attribute provider
         }
         
-        List<AttributeStatementProvider> customProviderList = new ArrayList<AttributeStatementProvider>();
+        List<AttributeStatementProvider> customProviderList = new ArrayList<>();
         customProviderList.add(new CustomAttributeProvider());
         ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
index 2bf239b..c499470 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
@@ -57,7 +57,7 @@ public class RealmSupportTest extends org.junit.Assert {
         realmCHandler.setRealm("B");
         realmCHandler.setSupportedClaimTypes(Collections.singletonList(URI.create("Claim-C")));
         
-        List<ClaimsHandler> claimHandlers = new ArrayList<ClaimsHandler>();
+        List<ClaimsHandler> claimHandlers = new ArrayList<>();
         claimHandlers.add(realmAHandler);
         claimHandlers.add(realmBHandler);
         claimHandlers.add(realmCHandler);
@@ -91,7 +91,7 @@ public class RealmSupportTest extends org.junit.Assert {
         realmCHandler.setRealm("B");
         realmCHandler.setSupportedClaimTypes(Collections.singletonList(URI.create("Claim-C")));
         
-        List<ClaimsHandler> claimHandlers = new ArrayList<ClaimsHandler>();
+        List<ClaimsHandler> claimHandlers = new ArrayList<>();
         claimHandlers.add(realmAHandler);
         claimHandlers.add(realmBHandler);
         claimHandlers.add(realmCHandler);
@@ -126,7 +126,7 @@ public class RealmSupportTest extends org.junit.Assert {
         realmCHandler.setSupportedRealms(Collections.singletonList("A"));
         realmCHandler.setSupportedClaimTypes(Collections.singletonList(URI.create("Claim-C")));
         
-        List<ClaimsHandler> claimHandlers = new ArrayList<ClaimsHandler>();
+        List<ClaimsHandler> claimHandlers = new ArrayList<>();
         claimHandlers.add(realmAHandler);
         claimHandlers.add(realmBHandler);
         claimHandlers.add(realmCHandler);
@@ -165,7 +165,7 @@ public class RealmSupportTest extends org.junit.Assert {
         realmCHandler.setSupportedRealms(Collections.singletonList("A"));
         realmCHandler.setSupportedClaimTypes(Collections.singletonList(URI.create("Claim-C")));
         
-        List<ClaimsHandler> claimHandlers = new ArrayList<ClaimsHandler>();
+        List<ClaimsHandler> claimHandlers = new ArrayList<>();
         claimHandlers.add(realmAHandler);
         claimHandlers.add(realmBHandler);
         claimHandlers.add(realmCHandler);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
index 140d342..eab6bc6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
@@ -129,7 +129,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
             // expected
         }
         
-        List<WSSecurityEngineResult> signedResults = new ArrayList<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> signedResults = new ArrayList<>();
         WSSecurityEngineResult signedResult = new WSSecurityEngineResult(WSConstants.SIGN);
         CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
         cryptoType.setAlias("myclientkey");
@@ -206,7 +206,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
             // expected
         }
         
-        List<WSSecurityEngineResult> signedResults = new ArrayList<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> signedResults = new ArrayList<>();
         WSSecurityEngineResult signedResult = new WSSecurityEngineResult(WSConstants.SIGN);
         CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
         cryptoType.setAlias("myservicekey");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index c3aa337..50626eb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -333,7 +333,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
         validatorParameters.setToken(validateTarget);
         
         assertTrue(samlTokenValidator.canHandleToken(validateTarget));
-        List<String> certConstraints = new ArrayList<String>();
+        List<String> certConstraints = new ArrayList<>();
         certConstraints.add("XYZ");
         certConstraints.add(".*CN=www.sts.com.*");
         ((SAMLTokenValidator)samlTokenValidator).setSubjectConstraints(certConstraints);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index 0838611..3f3ad5c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -98,7 +98,7 @@ public class SAMLBatchUnitTest extends AbstractBusClientServerTestBase {
         String wsdlLocation = 
             "https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
         
-        List<BatchRequest> requestList = new ArrayList<BatchRequest>();
+        List<BatchRequest> requestList = new ArrayList<>();
         BatchRequest request = new BatchRequest();
         request.setAppliesTo("https://localhost:8081/doubleit/services/doubleittransportsaml1");
         request.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index a04391a..993cb93 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -562,7 +562,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider {
 
         Element responseCollection = getDocumentElement((DOMSource)obj[0]);
         Node child = responseCollection.getFirstChild();
-        List<SecurityToken> tokens = new ArrayList<SecurityToken>();
+        List<SecurityToken> tokens = new ArrayList<>();
         while (child != null) {
             if (child instanceof Element 
                 && "RequestSecurityTokenResponse".equals(((Element)child).getLocalName())) {
@@ -612,7 +612,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider {
         
         Element responseCollection = getDocumentElement((DOMSource)obj[0]);
         Node child = responseCollection.getFirstChild();
-        List<SecurityToken> tokens = new ArrayList<SecurityToken>();
+        List<SecurityToken> tokens = new ArrayList<>();
         while (child != null) {
             if (child instanceof Element 
                 && "RequestSecurityTokenResponse".equals(((Element)child).getLocalName())) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
index dd8ae8e..dc87a2e 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
@@ -85,7 +85,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
     }
 
     public List<URI> getSupportedClaimTypes() {
-        List<URI> list = new ArrayList<URI>();
+        List<URI> list = new ArrayList<>();
         list.add(ROLE);
         list.add(GIVEN_NAME);
         list.add(LANGUAGE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
index 81bde90..5eaefb0 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
@@ -71,7 +71,7 @@ public class CustomAttributeStatementProvider implements AttributeStatementProvi
             return null;
         }
 
-        List<AttributeBean> attributeList = new ArrayList<AttributeBean>();
+        List<AttributeBean> attributeList = new ArrayList<>();
         String tokenType = providerParameters.getTokenRequirements().getTokenType();
 
         AttributeStatementBean attrBean = new AttributeStatementBean();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
index d77b355..c2d25b4 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
@@ -66,7 +66,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
     }
 
     public List<URI> getSupportedClaimTypes() {
-        List<URI> list = new ArrayList<URI>();
+        List<URI> list = new ArrayList<>();
         list.add(ROLE);
         list.add(GIVEN_NAME);
         list.add(LANGUAGE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
index b1e4abb..5f097c0 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
@@ -227,7 +227,7 @@ public class SCTSAMLTokenProvider implements TokenProvider {
         // Parse the AttributeStatements
         List<AttributeStatementBean> attrBeanList = null;
         if (attributeStatementProviders != null && attributeStatementProviders.size() > 0) {
-            attrBeanList = new ArrayList<AttributeStatementBean>();
+            attrBeanList = new ArrayList<>();
             for (AttributeStatementProvider statementProvider : attributeStatementProviders) {
                 AttributeStatementBean statementBean = statementProvider.getStatement(tokenParameters);
                 if (statementBean != null) {
@@ -242,7 +242,7 @@ public class SCTSAMLTokenProvider implements TokenProvider {
 
         // If no statements, then default to the DefaultAttributeStatementProvider
         if (attrBeanList == null || attrBeanList.isEmpty()) {
-            attrBeanList = new ArrayList<AttributeStatementBean>();
+            attrBeanList = new ArrayList<>();
             AttributeStatementProvider attributeProvider = new DefaultAttributeStatementProvider();
             AttributeStatementBean attributeBean = attributeProvider.getStatement(tokenParameters);
             attrBeanList.add(attributeBean);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
index 03abf85..1f1eb58 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
@@ -70,7 +70,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
     }
 
     public List<URI> getSupportedClaimTypes() {
-        List<URI> list = new ArrayList<URI>();
+        List<URI> list = new ArrayList<>();
         list.add(ROLE);
         list.add(GIVEN_NAME);
         list.add(LANGUAGE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
index ab6c740..90ea62b 100644
--- a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
+++ b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
@@ -259,7 +259,7 @@ public class WSDiscoveryClient implements Closeable {
                 Header h = new Header(seq.getName(),
                                       seq,
                                       new JAXBDataBinding(getJAXBContext()));
-                List<Header> headers = new ArrayList<Header>();
+                List<Header> headers = new ArrayList<>();
                 headers.add(h);
                 p.getRequestContext()
                     .put(Header.HEADER_LIST, headers);
@@ -333,7 +333,7 @@ public class WSDiscoveryClient implements Closeable {
             p.getTypes().add(type);
         }
         ProbeMatchesType pmt = probe(p, defaultProbeTimeout);
-        List<EndpointReference> er = new ArrayList<EndpointReference>();
+        List<EndpointReference> er = new ArrayList<>();
         for (ProbeMatchType pm : pmt.getProbeMatch()) {
             for (String add : pm.getXAddrs()) {
                 W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index 3d086b8..556ad0e 100644
--- a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -60,7 +60,7 @@ public final class WSDiscoveryClientTest {
    
     static NetworkInterface findIpv4Interface() throws Exception {
         Enumeration<NetworkInterface> ifcs = NetworkInterface.getNetworkInterfaces();
-        List<NetworkInterface> possibles = new ArrayList<NetworkInterface>();
+        List<NetworkInterface> possibles = new ArrayList<>();
         while (ifcs.hasMoreElements()) {
             NetworkInterface ni = ifcs.nextElement();
             if (ni.supportsMulticast()

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java
index 644ba65..c0a368a 100644
--- a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java
+++ b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java
@@ -86,7 +86,7 @@ public class CXFWSNHelper extends WSNHelper {
                     endpoint.setProperties(new HashMap<String, Object>());
                 }
                 endpoint.getProperties().put("javax.xml.ws.wsdl.description", wsdlLocation.toExternalForm());
-                List<Source> mt = new ArrayList<Source>();
+                List<Source> mt = new ArrayList<>();
                 StreamSource src = new StreamSource(wsdlLocation.openStream(), wsdlLocation.toExternalForm());
                 mt.add(src);
                 endpoint.setMetadata(mt);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
index ce5dfb7..a6e56fc 100644
--- a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
+++ b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
@@ -91,7 +91,7 @@ public class WSNHelper {
                     endpoint.setProperties(new HashMap<String, Object>());
                 }
                 endpoint.getProperties().put("javax.xml.ws.wsdl.description", wsdlLocation.toExternalForm());
-                List<Source> mt = new ArrayList<Source>();
+                List<Source> mt = new ArrayList<>();
                 StreamSource src = new StreamSource(wsdlLocation.openStream(), wsdlLocation.toExternalForm());
                 mt.add(src);
                 endpoint.setMetadata(mt);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
index 831ff3a..287694d 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
@@ -72,7 +72,7 @@ public abstract class AbstractCreatePullPoint extends AbstractEndpoint
     }
     
     public List<String> getPullEndpoints() {
-        return new ArrayList<String>(pullPoints.keySet());
+        return new ArrayList<>(pullPoints.keySet());
     }
 
     public EndpointMBean getPullEndpoint(String name) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
index 4aa69dd..8878df9 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
@@ -128,11 +128,11 @@ public abstract class AbstractNotificationBroker extends AbstractEndpoint
     }
     
     public List<String> getPublisher() {
-        return new ArrayList<String>(publishers.keySet());
+        return new ArrayList<>(publishers.keySet());
     }
     
     public List<String> getSubscriptions() {
-        return new ArrayList<String>(subscriptions.keySet());
+        return new ArrayList<>(subscriptions.keySet());
     }
     
     public EndpointMBean getPublisher(String name) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
index 1ac391a..02ad62b 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
@@ -136,7 +136,7 @@ public abstract class JmsPublisher extends AbstractPublisher implements Consumer
         if (demand) {
             try {
                 producers = new HashMap<Destination, Object>();
-                advisories = new ArrayList<ConsumerEventSource>();
+                advisories = new ArrayList<>();
                 for (TopicExpressionType topic : this.topic) {
                     ConsumerEventSource advisory 
                         = new ConsumerEventSource(connection, topicConverter.toActiveMQTopic(topic));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
index 5dcffbe..22a372b 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
@@ -135,7 +135,7 @@ public class JmsPullPoint extends AbstractPullPoint {
                 max = 256;
             }
             initSession();
-            List<NotificationMessageHolderType> messages = new ArrayList<NotificationMessageHolderType>();
+            List<NotificationMessageHolderType> messages = new ArrayList<>();
             for (int i = 0; i < max; i++) {
                 Message msg = null;
                 synchronized (consumerSession) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java
index bd21816..70511f7 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java
@@ -67,7 +67,7 @@ public class JaxwsEndpointManager implements EndpointManager {
                         endpoint.setProperties(new HashMap<String, Object>());
                     }
                     endpoint.getProperties().put("javax.xml.ws.wsdl.description", wsdlLocation.toExternalForm());
-                    List<Source> mt = new ArrayList<Source>();
+                    List<Source> mt = new ArrayList<>();
                     StreamSource src = new StreamSource(wsdlLocation.openStream(), wsdlLocation.toExternalForm());
                     mt.add(src);
                     endpoint.setMetadata(mt);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
index 40b1c44..279290f 100644
--- a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
+++ b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
@@ -351,7 +351,7 @@ public abstract class WsnBrokerTest extends Assert {
     public static class TestConsumer implements Consumer.Callback {
 
         final List<NotificationMessageHolderType> notifications 
-            = new ArrayList<NotificationMessageHolderType>();
+            = new ArrayList<>();
 
         public void notify(NotificationMessageHolderType message) {
             synchronized (notifications) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java b/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
index 95b7859..76dced8 100644
--- a/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
+++ b/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
@@ -112,7 +112,7 @@ public class CheckXKRSS {
 
     XKMSService createXKMSService(boolean enableXKRSS) {
         XKMSService xkmsService = new XKMSService();
-        List<Register> keyRegisterHandlers = new ArrayList<Register>();
+        List<Register> keyRegisterHandlers = new ArrayList<>();
         keyRegisterHandlers.add(new Register() {
 
             @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
index 97e1803..86737b1 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
@@ -191,7 +191,7 @@ public class AegisClientServerTest extends AbstractBusClientServerTestBase {
         proxyFactory.getInInterceptors().add(new LoggingInInterceptor());
         proxyFactory.getOutInterceptors().add(new LoggingOutInterceptor());
         SportsService service = (SportsService) proxyFactory.create();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("ffang");
         String ret = service.getGeneric(list);
         assertEquals(ret, "ffang");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
index 6c2a013..b5e1e8a 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
@@ -120,7 +120,7 @@ public class AegisJaxWsTest extends AbstractJUnit4SpringContextTests {
     @Test
     public void testBigList() throws Exception {
         int size = 1000;
-        List<String> l = new ArrayList<String>(size);
+        List<String> l = new ArrayList<>(size);
         for (int x = 0; x < size; x++) {
             l.add("Need to create a pretty big soap message to make sure we go over "
                   + "some of the default buffer sizes and such so we can see what really"
@@ -140,7 +140,7 @@ public class AegisJaxWsTest extends AbstractJUnit4SpringContextTests {
     //CXF-3376
     public void testByteArray() throws Exception {
         int size = 50;
-        List<Integer> ints = new ArrayList<Integer>(size);
+        List<Integer> ints = new ArrayList<>(size);
         for (int x = 0; x < size; x++) {
             ints.add(x);
         }        

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
index c6e5192..ffc84ad 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
@@ -34,7 +34,7 @@ public class SportsServiceImpl implements SportsService {
 
     /** {@inheritDoc}*/
     public Collection<Team> getTeams() {
-        List<Team> teams = new ArrayList<Team>();
+        List<Team> teams = new ArrayList<>();
         teams.add(new Team("Patriots", "New England"));
         return teams;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
index 0d48ef3..a782b2e 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
@@ -62,7 +62,7 @@ public class HashMapAdapter extends XmlAdapter<HashMapAdapter.HashMapType, Map<S
     }
 
     public static class HashMapType {
-        private List<HashMapEntryType> entry = new ArrayList<HashMapEntryType>();
+        private List<HashMapEntryType> entry = new ArrayList<>();
 
         public List<HashMapEntryType> getEntry() {
             return entry;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
index 9bc9be8..34c3bc3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
@@ -175,7 +175,7 @@ public abstract class AbstractJAXRSContinuationsTest extends AbstractBusClientSe
                                                              new ArrayBlockingQueue<Runnable>(10));
         CountDownLatch startSignal = new CountDownLatch(1);
         CountDownLatch doneSignal = new CountDownLatch(1);
-        List<BookWorker> workers = new ArrayList<BookWorker>(5);
+        List<BookWorker> workers = new ArrayList<>(5);
         for (int x = 1; x < 6; x++) {
             workers.add(new BookWorker("http://localhost:" + port + getBaseAddress() + pathSegment + "/" + x, 
                                        Integer.toString(x), 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
index b3d83b4..26df2df 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
@@ -70,7 +70,7 @@ public class BookApplication extends Application {
 
     @Override 
     public Set<Object> getSingletons() {
-        Set<Object> classes = new HashSet<Object>();
+        Set<Object> classes = new HashSet<>();
         org.apache.cxf.systest.jaxrs.BookStore store = 
             new org.apache.cxf.systest.jaxrs.BookStore(uriInfo);
         store.setDefaultNameAndId(defaultName, defaultId);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
index 1dd886c..a0348fa 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
@@ -97,7 +97,7 @@ public class BookServer extends AbstractBusTestServerBase {
         JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
         sf.setBus(bus);
         sf.setResourceClasses(BookStore.class, SimpleBookStore.class, BookStorePerRequest.class);
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         
         //default lifecycle is per-request, change it to singleton
         BinaryDataProvider<Object> p = new BinaryDataProvider<Object>();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
index fac5206..f4950b0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
@@ -83,7 +83,7 @@ public class BookServer20 extends AbstractBusTestServerBase {
         sf.setBus(bus);
         sf.setResourceClasses(BookStore.class);
         
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         
         providers.add(new PreMatchContainerRequestFilter2());
         providers.add(new PreMatchContainerRequestFilter());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
index aa61a70..3bd00ce 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
@@ -45,7 +45,7 @@ public class BookServerThrottled extends AbstractBusTestServerBase {
     protected void run() {
         JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
         sf.setResourceClasses(BookStore.class);
-        List<Feature> features = new ArrayList<Feature>();
+        List<Feature> features = new ArrayList<>();
         ThrottlingFeature tf = new ThrottlingFeature(new ThrottlingManagerImpl()); 
         features.add(tf);
         sf.setFeatures(features);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index f21729b..329ebb7 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -678,7 +678,7 @@ public class BookStore {
     @Produces({"application/xml", "application/json" })
     @Consumes({"application/xml", "application/json" })
     public List<Book> postBookGetCollection(@Nullable Book book) throws Exception {
-        List<Book> list = new ArrayList<Book>();
+        List<Book> list = new ArrayList<>();
         if (book != null) {
             list.add(book);
         }
@@ -735,7 +735,7 @@ public class BookStore {
     @Path("/collections")
     @Produces({"application/xml", "application/json" })
     public List<Book> getBookCollection() throws Exception {
-        return new ArrayList<Book>(books.values());
+        return new ArrayList<>(books.values());
     }
     
     @POST
@@ -1231,7 +1231,7 @@ public class BookStore {
     @GET
     @Path("/books/interface/adapter-list")
     public List<? extends BookInfoInterface> getBookAdapterInterfaceList() throws Exception {
-        List<BookInfoInterface> list = new ArrayList<BookInfoInterface>();
+        List<BookInfoInterface> list = new ArrayList<>();
         list.add(new BookInfo2(doGetBook("123")));
         return list;
     }
@@ -1240,7 +1240,7 @@ public class BookStore {
     @Path("/books/adapter-list")
     @XmlJavaTypeAdapter(BookInfoAdapter.class)
     public List<? extends BookInfo> getBookAdapterList() throws Exception {
-        List<BookInfo> list = new ArrayList<BookInfo>();
+        List<BookInfo> list = new ArrayList<>();
         list.add(new BookInfo(doGetBook("123")));
         return list;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Books.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Books.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Books.java
index e884ebb..3ab3d3b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Books.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Books.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Books {
 
-    private List<Book> books = new ArrayList<Book>();
+    private List<Book> books = new ArrayList<>();
     
     public Books() {
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
index 594cc03..2900838 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
@@ -89,7 +89,7 @@ public class Chapter {
     @Path("/matched-resources")
     @Produces("text/plain")
     public String getMatchedResources(@Context UriInfo ui) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (Object obj : ui.getMatchedResources()) {
             list.add(obj.toString());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index 892cfe9..18d35f2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -488,7 +488,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
     private GenericEntity<List<Book>> createGenericEntity() {
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
         return new GenericEntity<List<Book>>(books) {
@@ -557,14 +557,14 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
     }
     
     private WebClient createWebClient(String address) {
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new ClientHeaderRequestFilter());
         providers.add(new ClientHeaderResponseFilter());
         return WebClient.create(address, providers);
     }
     
     private WebClient createWebClientPost(String address) {
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new ClientHeaderRequestFilter());
         providers.add(new ClientHeaderResponseFilter());
         providers.add(new ClientReaderInterceptor());
@@ -658,7 +658,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
     @Test
     public void testClientFiltersLocalResponse() {
         String address = "http://localhost:" + PORT + "/bookstores";
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new ClientCacheRequestFilter());
         providers.add(new ClientHeaderResponseFilter(true));
         WebClient wc = WebClient.create(address, providers);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 19b01df..9653dcc 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -186,7 +186,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
     @Test
     public void testNonExistent() throws Exception {
         String address = "http://168.168.168.168/bookstore";
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new TestResponseFilter());
         WebClient wc =  WebClient.create(address, providers);
         Future<Book> future = wc.async().get(Book.class);
@@ -243,7 +243,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
     @Test
     public void testPostBookProcessingException() throws Exception {
         String address = "http://localhost:" + PORT + "/bookstore/";
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new FaultyBookWriter());
         WebClient wc = WebClient.create(address, providers);
         
@@ -260,7 +260,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
     @Test
     public void testGetBookResponseProcessingException() throws Exception {
         String address = "http://localhost:" + PORT + "/bookstore/books/123";
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new FaultyBookReader());
         WebClient wc = WebClient.create(address, providers);
         
@@ -425,7 +425,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
         
     }
     private WebClient createWebClient(String address) {
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         return WebClient.create(address, providers);
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 91d2407..437ce57 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -630,7 +630,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         wc.accept("application/xml").type("application/xml");
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
         Book book = wc.postCollection(books, Book.class, Book.class);
@@ -648,7 +648,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         wc.accept("application/xml").type("application/xml");
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
         GenericEntity<List<Book>> genericCollectionEntity = 
@@ -670,7 +670,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         wc.accept("application/xml").type("application/xml");
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
         
@@ -703,10 +703,10 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         wc.accept("application/xml").type("application/xml");
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
-        List<Book> books2 = new ArrayList<Book>(wc.postAndGetCollection(books, Book.class, Book.class));
+        List<Book> books2 = new ArrayList<>(wc.postAndGetCollection(books, Book.class, Book.class));
         assertNotNull(books2);
         assertNotSame(books, books2);
         assertEquals(2, books2.size());
@@ -738,7 +738,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         WebClient wc = WebClient.create(endpointAddress);
         wc.accept("application/xml").type("application/xml");
         Book b1 = new Book("Book", 666L);
-        List<Book> books = new ArrayList<Book>(wc.postObjectGetCollection(b1, Book.class));
+        List<Book> books = new ArrayList<>(wc.postObjectGetCollection(b1, Book.class));
         assertNotNull(books);
         assertEquals(1, books.size());
         Book b = books.get(0);
@@ -940,7 +940,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
     @Test
     public void testProxyWithCollectionMatrixParams() throws Exception {
         BookStore proxy = JAXRSClientFactory.create("http://localhost:" + PORT, BookStore.class);
-        List<String> params = new ArrayList<String>(); 
+        List<String> params = new ArrayList<>(); 
         params.add("12");
         params.add("3");
         Book book = proxy.getBookByMatrixListParams(params);
@@ -1095,7 +1095,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         BookStore store = JAXRSClientFactory.create("http://localhost:" + PORT, BookStore.class);
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
         List<Book> books2 = store.getBookCollection(books);
@@ -1139,11 +1139,11 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
                                            + "/bookstore/jaxbelementxmlrootcollections");
         Book b1 = new Book("CXF in Action", 123L);
         Book b2 = new Book("CXF Rocks", 124L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b1);
         books.add(b2);
         store.type("application/xml").accept("application/xml");
-        List<Book> books2 = new ArrayList<Book>(store.postAndGetCollection(books, Book.class, Book.class));
+        List<Book> books2 = new ArrayList<>(store.postAndGetCollection(books, Book.class, Book.class));
         assertNotNull(books2);
         assertNotSame(books, books2);
         assertEquals(2, books2.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
index dcfafba..83a4553 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
@@ -127,7 +127,7 @@ public class JAXRSClientServerNonSpringBookTest extends AbstractBusClientServerT
                                               BookStoreNoAnnotationsInterface.class,
                               "classpath:org/apache/cxf/systest/jaxrs/resources/resources2.xml", null);
         Book book = new Book("From Model", 1L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(book);
         books = proxy.getBooks(books);
         assertEquals(1, books.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
index ac940d0..d4e9705 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
@@ -70,7 +70,7 @@ public class JAXRSClientServerStreamingTest extends AbstractBusClientServerTestB
             JAXBElementProvider<?> p2 = new CustomJaxbProvider();
             p2.setProduceMediaTypes(Collections.singletonList("text/xml"));
             
-            List<Object> providers = new ArrayList<Object>();
+            List<Object> providers = new ArrayList<>();
             providers.add(p1);
             providers.add(p2);
             sf.setProviders(providers);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
index c56ee4b..5154c4c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
@@ -104,7 +104,7 @@ public class JAXRSClientServerUserResourceDefaultTest extends AbstractBusClientS
             echoDefaultParam.setJavaType(SAXSource.class);
             op3.setParameters(Collections.singletonList(echoDefaultParam));
             
-            List<UserOperation> ops = new ArrayList<UserOperation>();
+            List<UserOperation> ops = new ArrayList<>();
             ops.add(op);
             ops.add(op2);
             ops.add(op3);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
index ab60f94..eddd03a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
@@ -66,7 +66,7 @@ public class JAXRSClientServerUserResourceTest extends AbstractBusClientServerTe
             op2.setName("getBookChapter");
             op2.setParameters(Collections.singletonList(new Parameter(ParameterType.PATH, "id")));
             
-            List<UserOperation> ops = new ArrayList<UserOperation>();
+            List<UserOperation> ops = new ArrayList<>();
             ops.add(op);
             ops.add(op2);
             

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 1f1c76e..df1cee8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -445,7 +445,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
             WebClient.client(client).header("Content-Type", "multipart/mixed;type=application/xml");
         }
         
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(new Book("CXF 1", 1L));
         books.add(new Book("CXF 2", 2L));
         List<Book> books2 = addHeader ? client.addBooks(books) : client.addBooksWithoutHeader(books);
@@ -598,7 +598,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         objects.put(MediaType.APPLICATION_OCTET_STREAM, attIs);
         
         Collection<? extends Attachment> coll = client.postAndGetCollection(objects, Attachment.class);
-        List<Attachment> result = new ArrayList<Attachment>(coll);
+        List<Attachment> result = new ArrayList<>(coll);
         Book jaxb2 = readBookFromInputStream(result.get(0).getDataHandler().getInputStream());
         assertEquals("jaxb", jaxb2.getName());
         assertEquals(1L, jaxb2.getId());
@@ -643,7 +643,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         objects.put(MediaType.APPLICATION_OCTET_STREAM, attIs);
         
         Collection<? extends Attachment> coll = client.postAndGetCollection(objects, Attachment.class);
-        List<Attachment> result = new ArrayList<Attachment>(coll);
+        List<Attachment> result = new ArrayList<>(coll);
         assertEquals(2, result.size());
         Book json2 = readJSONBookFromInputStream(result.get(0).getDataHandler().getInputStream());
         assertEquals("json", json2.getName());
@@ -670,7 +670,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         objects.put(MediaType.APPLICATION_JSON, json);
         objects.put(MediaType.APPLICATION_OCTET_STREAM, is1);
         Collection<? extends Attachment> coll = client.postAndGetCollection(objects, Attachment.class);
-        List<Attachment> result = new ArrayList<Attachment>(coll);
+        List<Attachment> result = new ArrayList<>(coll);
         Book jaxb2 = readBookFromInputStream(result.get(0).getDataHandler().getInputStream());
         assertEquals("jaxb", jaxb2.getName());
         assertEquals(1L, jaxb2.getId());
@@ -695,7 +695,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         MultipartStore client = JAXRSClientFactory.create(address, MultipartStore.class);
         
         Map<String, Book> map = client.getBookJaxbJson();
-        List<Book> result = new ArrayList<Book>(map.values());
+        List<Book> result = new ArrayList<>(map.values());
         Book jaxb = result.get(0);
         assertEquals("jaxb", jaxb.getName());
         assertEquals(1L, jaxb.getId());
@@ -716,7 +716,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         MultipartStore client = JAXRSClientFactory.create(address, MultipartStore.class);
         
         Map<String, Book> map = client.getBookJson();
-        List<Book> result = new ArrayList<Book>(map.values());
+        List<Book> result = new ArrayList<>(map.values());
         assertEquals(1, result.size());
         Book json = result.get(0);
         assertEquals("json", json.getName());
@@ -735,7 +735,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         MultipartStore client = JAXRSClientFactory.create(address, MultipartStore.class);
         
         Map<String, Object> map = client.getBookJaxbJsonObject();
-        List<Object> result = new ArrayList<Object>(map.values());
+        List<Object> result = new ArrayList<>(map.values());
         assertEquals(2, result.size());
         assertTrue(((Attachment)result.get(0)).getContentType().toString().contains("application/xml"));
         assertTrue(((Attachment)result.get(1)).getContentType().toString().contains("application/json"));
@@ -751,12 +751,12 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         Book json = new Book("json", 2L);
         InputStream is1 = 
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg");
-        List<Attachment> objects = new ArrayList<Attachment>();
+        List<Attachment> objects = new ArrayList<>();
         objects.add(new Attachment("<theroot>", MediaType.APPLICATION_XML, jaxb));
         objects.add(new Attachment("thejson", MediaType.APPLICATION_JSON, json));
         objects.add(new Attachment("theimage", MediaType.APPLICATION_OCTET_STREAM, is1));
         Collection<? extends Attachment> coll = client.postAndGetCollection(objects, Attachment.class);
-        List<Attachment> result = new ArrayList<Attachment>(coll);
+        List<Attachment> result = new ArrayList<>(coll);
         Book jaxb2 = readBookFromInputStream(result.get(0).getDataHandler().getInputStream());
         assertEquals("jaxb", jaxb2.getName());
         assertEquals(1L, jaxb2.getId());
@@ -779,11 +779,11 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         
         Book b = new Book("jaxb", 1L);
         Book b2 = new Book("jaxb2", 2L);
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(b);
         books.add(b2);
         Collection<? extends Book> coll = client.postAndGetCollection(books, Book.class);
-        List<Book> result = new ArrayList<Book>(coll);
+        List<Book> result = new ArrayList<>(coll);
         Book jaxb = result.get(0);
         assertEquals("jaxb", jaxb.getName());
         assertEquals(1L, jaxb.getId());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
index eb00309..15788d2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
@@ -705,7 +705,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         BookStoreJaxrsJaxws proxy = JAXRSClientFactory.create(baseAddress,
                                                                   BookStoreJaxrsJaxws.class);
         BookSubresource bs = proxy.getBookSubresource("679");
-        List<String> parts = new ArrayList<String>();
+        List<String> parts = new ArrayList<>();
         parts.add("CXF in Action - ");
         parts.add(Integer.toString(679));
         Book b = bs.getTheBook3("679", parts);
@@ -858,7 +858,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         bean.setAddress(baseAddress);
         bean.setResourceClass(BookStoreJaxrsJaxws.class);
         TestFeature testFeature = new TestFeature();
-        List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+        List<AbstractFeature> features = new ArrayList<>();
         features.add(testFeature);
         bean.setFeatures(features);
         BookStoreJaxrsJaxws proxy = (BookStoreJaxrsJaxws)bean.create();
@@ -888,7 +888,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         bean.setResourceClass(BookStoreJaxrsJaxws.class);
         final boolean addBadOutInterceptor = true;
         TestFeature testFeature = new TestFeature(addBadOutInterceptor);
-        List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+        List<AbstractFeature> features = new ArrayList<>();
         features.add(testFeature);
         bean.setFeatures(features);
         BookStoreJaxrsJaxws proxy = (BookStoreJaxrsJaxws)bean.create();
@@ -912,7 +912,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         bean.setAddress(baseAddress);
         bean.setResourceClass(BookStoreJaxrsJaxws.class);
         TestFeature testFeature = new TestFeature();
-        List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+        List<AbstractFeature> features = new ArrayList<>();
         features.add(testFeature);
         bean.setFeatures(features);
         BookStoreJaxrsJaxws proxy = (BookStoreJaxrsJaxws)bean.create();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
index d0c4288..40f6005 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
@@ -160,7 +160,7 @@ public class MultipartStore {
         if (atts.size() != 1) {
             throw new WebApplicationException();
         }
-        List<Attachment> newAtts = new ArrayList<Attachment>();
+        List<Attachment> newAtts = new ArrayList<>();
         Attachment at = atts.get(0);
         MultivaluedMap<String, String> headers = at.getHeaders();
         if (!"http://host/bar".equals(headers.getFirst("Content-Location"))) {
@@ -429,7 +429,7 @@ public class MultipartStore {
     @Consumes("multipart/mixed")
     @Produces("multipart/mixed;type=text/xml")
     public List<Book> addBooks(List<Book> books) {
-        List<Book> books2 = new ArrayList<Book>();
+        List<Book> books2 = new ArrayList<>();
         books2.addAll(books);
         return books2;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
index 281f997..edcd69d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
@@ -70,13 +70,13 @@ public class CrossOriginSimpleTest extends AbstractBusClientServerTestBase {
 
     @Before
     public void before() {
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         configClient = WebClient.create("http://localhost:" + PORT + "/config", providers);
     }
 
     private List<String> headerValues(Header[] headers) {
-        List<String> values = new ArrayList<String>();
+        List<String> values = new ArrayList<>();
         for (Header h : headers) {
             for (HeaderElement e : h.getElements()) {
                 values.add(e.getName());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
index a3636cd..d742d01 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
@@ -167,7 +167,7 @@ public abstract class AbstractFailoverTest extends AbstractBusClientServerTestBa
         String address2 = "http://localhost:" + NON_PORT + "/non-existent2";
         
         FailoverFeature feature = new FailoverFeature();
-        List<String> alternateAddresses = new ArrayList<String>();
+        List<String> alternateAddresses = new ArrayList<>();
         alternateAddresses.add(address);
         alternateAddresses.add(address2);
         CustomRetryStrategy strategy = new CustomRetryStrategy();
@@ -208,7 +208,7 @@ public abstract class AbstractFailoverTest extends AbstractBusClientServerTestBa
                                                 FailoverFeature feature) {
         JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
         bean.setAddress(address);
-        List<Feature> features = new ArrayList<Feature>();
+        List<Feature> features = new ArrayList<>();
         features.add(feature);
         bean.setFeatures(features);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java
index 27e46e1..c799956 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java
@@ -107,7 +107,7 @@ public class CircuitBreakerFailoverTest extends AbstractFailoverTest {
     
     private FailoverFeature customizeFeature(CircuitBreakerFailoverFeature feature, 
             boolean random, String ...address) {
-        List<String> alternateAddresses = new ArrayList<String>();
+        List<String> alternateAddresses = new ArrayList<>();
         for (String s : address) {
             alternateAddresses.add(s);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
index f27d1a8..cfbe508 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
@@ -56,7 +56,7 @@ public class FailoverTest extends AbstractFailoverTest {
     
     private FailoverFeature getCustomFeature(boolean custom, boolean random, String ...address) {
         FailoverFeature feature = new FailoverFeature();
-        List<String> alternateAddresses = new ArrayList<String>();
+        List<String> alternateAddresses = new ArrayList<>();
         for (String s : address) {
             alternateAddresses.add(s);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorTest.java
index ca97087..b0a98c2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorTest.java
@@ -83,7 +83,7 @@ public class LoadDistributorTest extends AbstractBusClientServerTestBase {
     @Test    
     public void testSingleAltAddress() throws Exception {
         LoadDistributorFeature feature = new LoadDistributorFeature();
-        List<String> alternateAddresses = new ArrayList<String>();
+        List<String> alternateAddresses = new ArrayList<>();
         alternateAddresses.add(Server.ADDRESS2);
         SequentialStrategy strategy = new SequentialStrategy();
         strategy.setAlternateAddresses(alternateAddresses);
@@ -100,7 +100,7 @@ public class LoadDistributorTest extends AbstractBusClientServerTestBase {
     
     private FailoverFeature getFeature(String ...address) {
         FailoverFeature feature = new FailoverFeature();
-        List<String> alternateAddresses = new ArrayList<String>();
+        List<String> alternateAddresses = new ArrayList<>();
         for (String s : address) {
             alternateAddresses.add(s);
         }
@@ -127,7 +127,7 @@ public class LoadDistributorTest extends AbstractBusClientServerTestBase {
                                                 FailoverFeature feature) {
         JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
         bean.setAddress(address);
-        List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+        List<AbstractFeature> features = new ArrayList<>();
         features.add(feature);
         bean.setFeatures(features);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMap.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMap.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMap.java
index 1e7c9ea..194f543 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMap.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMap.java
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class IntegerUserMap {
     @XmlElement(nillable = false, name = "entry")
-    List<IntegerUserEntry> entries = new ArrayList<IntegerUserEntry>();
+    List<IntegerUserEntry> entries = new ArrayList<>();
 
     public List<IntegerUserEntry> getEntries() {
         return entries;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
index a6d6a52..c5ba2b9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBProviderTest.java
@@ -76,7 +76,7 @@ public class JAXBProviderTest extends AbstractBusClientServerTestBase {
         WebClient client = WebClient.create("http://localhost:" + PORT + "/resource/jaxb");
         WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(3000000);
 
-        List<String> values = new ArrayList<String>();
+        List<String> values = new ArrayList<>();
         values.add(MediaType.APPLICATION_XML);
         client.getHeaders().put("content-type", values);
         JAXBElement<String> test = new JAXBElement<String>(new QName("org.apache.cxf", "jaxbelement"),

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
index 91432ea..3678323 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
@@ -59,8 +59,8 @@ class WebSocketTestClient {
     private String url;
     
     WebSocketTestClient(String url) {
-        this.received = Collections.synchronizedList(new ArrayList<Object>());
-        this.fragments = Collections.synchronizedList(new ArrayList<Object>());
+        this.received = Collections.synchronizedList(new ArrayList<>());
+        this.fragments = Collections.synchronizedList(new ArrayList<>());
         this.latch = new CountDownLatch(1);
         this.client = new AsyncHttpClient();
         this.url = url;
@@ -97,7 +97,7 @@ class WebSocketTestClient {
 
     public List<Response> getReceivedResponses() {
         Object[] objs = received.toArray();
-        List<Response> responses = new ArrayList<Response>(objs.length);
+        List<Response> responses = new ArrayList<>(objs.length);
         for (Object o : objs) {
             responses.add(new Response(o));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
index 2b922c9..4093fbf 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
@@ -1263,7 +1263,7 @@ public class HandlerInvocationTest extends AbstractBusClientServerTestBase {
 
     public class MyHandlerResolver implements HandlerResolver {
         @SuppressWarnings("rawtypes")
-        List<Handler> chain = new ArrayList<Handler>();
+        List<Handler> chain = new ArrayList<>();
         String bindingID;
 
         public MyHandlerResolver(Handler<?>... handlers) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
index 89d7d3c..e88de77 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
@@ -71,7 +71,7 @@ public class HandlerTestImpl implements HandlerTest {
 
     public final List<String> pingWithArgs(String handlerCommand) throws PingException {
 
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add(handlerCommand);
         ret.addAll(getHandlersInfo(context.getMessageContext()));
 
@@ -111,7 +111,7 @@ public class HandlerTestImpl implements HandlerTest {
     private List<String> getHandlersInfo(MessageContext ctx) {
         List<String> ret = CastUtils.cast((List<?>)ctx.get("handler.info"));
         if (ret == null) {
-            ret = new ArrayList<String>();
+            ret = new ArrayList<>();
         }
         return ret;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
index 53ccafb..2012b1a 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
@@ -180,7 +180,7 @@ public abstract class TestHandlerBase {
         if (ctx.containsKey("handler.info")) { 
             handlerInfoList = CastUtils.cast((List<?>)ctx.get("handler.info")); 
         } else {
-            handlerInfoList = new ArrayList<String>();
+            handlerInfoList = new ArrayList<>();
             ctx.put("handler.info", handlerInfoList);
             ctx.setScope("handler.info", MessageContext.Scope.APPLICATION);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
index bd00fc9..6757766 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
@@ -85,7 +85,7 @@ public final class AnyClientServerTest extends AbstractBusClientServerTestBase {
         Greeter port = ss.getSoapPort();
         updateAddressPort(port, PORT);
         
-        List<Port> any = new ArrayList<Port>();
+        List<Port> any = new ArrayList<>();
         Port anyPort = new Port();
         Port anyPort1 = new Port();
         JAXBElement<String> ele1 = new JAXBElement<String>(


Mime
View raw message