You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/10 15:41:51 UTC

[03/14] cxf git commit: Removing unnecessary type information

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
index 081ccd5..4b5af87 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
@@ -495,14 +495,14 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
 
         Set<Foo> fooSet = port.getFooSet();
         assertEquals(2, fooSet.size());
-        assertEquals("size: 2", port.doFooList(new ArrayList<Foo>(fooSet)));
+        assertEquals("size: 2", port.doFooList(new ArrayList<>(fooSet)));
         
         assertEquals(24, port.echoIntDifferentWrapperName(24));
         
         String echoMsg = port.echo("Hello");
         assertEquals("Hello", echoMsg);
         
-        List<String> rev = new ArrayList<String>(Arrays.asList(DocLitWrappedCodeFirstServiceImpl.DATA));
+        List<String> rev = new ArrayList<>(Arrays.asList(DocLitWrappedCodeFirstServiceImpl.DATA));
         Collections.reverse(rev);
         
         String s;
@@ -532,7 +532,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
         assertEquals("string1string2string3string3string2string1Hello24", s);
         
         
-        s = port.listInput(new ArrayList<String>());
+        s = port.listInput(new ArrayList<>());
         assertEquals("", s);
 
         s = port.listInput(null);
@@ -683,7 +683,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
         String ret[] = port.convertToString(new int[] {1, 2, 3});
         assertEquals(3, ret.length);
 
-        List<String> rev = new ArrayList<String>(Arrays.asList(RpcLitCodeFirstServiceImpl.DATA));
+        List<String> rev = new ArrayList<>(Arrays.asList(RpcLitCodeFirstServiceImpl.DATA));
         Collections.reverse(rev);        
         
         String s;
@@ -713,7 +713,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
         assertEquals("string1string2string3string3string2string1Hello24", s);
         
         
-        s = port.listInput(new ArrayList<String>());
+        s = port.listInput(new ArrayList<>());
         assertEquals("", s);
 
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
index 019bb8b..e1d4a33 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
@@ -216,7 +216,7 @@ public interface DocLitWrappedCodeFirstService {
     @XmlType(name = "doFooList", propOrder = { "dbReves" })
     class DoFooListRequest {
         @XmlElement(name = "dbRef", required = true)
-        protected List<Foo> dbReves = new ArrayList<Foo>();
+        protected List<Foo> dbReves = new ArrayList<>();
 
         public List<Foo> getDbReves() {
             return dbReves;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
index 6ce719e..39c13f3 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
@@ -79,7 +79,7 @@ public class JaxwsAsyncFailOverTest  extends AbstractBusClientServerTestBase {
          
     @Test
     public void testUseFailOverOnClient() throws Exception {
-        List<String> serviceList = new ArrayList<String>();
+        List<String> serviceList = new ArrayList<>();
         serviceList.add("http://localhost:" + PORT + "/SoapContext/GreeterPort");
 
         RandomStrategy strategy = new RandomStrategy();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
index bd5ce39..13b67af 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
@@ -107,7 +107,7 @@ public class LocatorServiceImpl implements LocatorService {
     
     public List<Endpoint> listEndpoints() {
         LOG.info("Executing operation listEndpoints");
-        return new ArrayList<Endpoint>();
+        return new ArrayList<>();
     }
 
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java
index 3c572b2..658a826 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java
@@ -26,7 +26,7 @@ import org.apache.cxf.systest.jaxws.base.WrapperString;
 public class TestServiceImpl implements TestService {
     @Override
     public List<WrapperString> getList() {
-        List<WrapperString> list = new ArrayList<WrapperString>();
+        List<WrapperString> list = new ArrayList<>();
 
         list.add(new WrapperString("Test"));
         list.add(new WrapperString("Test 2"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
index 64863e9..e48972d 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
@@ -52,7 +52,7 @@ public class JavaFirstSchemaValidationTest extends Assert {
     static final String PORT2 = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
     static final String PORT_UNUSED = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
 
-    private static List<Server> serverList = new ArrayList<Server>();
+    private static List<Server> serverList = new ArrayList<>();
     private static PersonServiceAnnotated annotatedClient;
     private static PersonService client;
     private static PersonServiceRPC rpcClient;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
index 9e99252..571a70d 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
@@ -103,7 +103,7 @@ public class AttachmentStreamSourceXMLProvider implements Provider<StreamSource>
             }
 
             
-            List<String> contentTypeValues = new ArrayList<String>();
+            List<String> contentTypeValues = new ArrayList<>();
             contentTypeValues.add("application/xml+custom");
             respHeaders.put(Message.CONTENT_TYPE, contentTypeValues);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Chapter.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Chapter.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Chapter.java
index eaebf50..f45fb60 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Chapter.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/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/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 785bae7..4378f40 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -136,7 +136,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 
         ClaimCollection requestedClaims = createRequestClaimCollection();
 
-        List<URI> expectedClaims = new ArrayList<URI>();
+        List<URI> expectedClaims = new ArrayList<>();
         expectedClaims.add(ClaimTypes.FIRSTNAME);
         expectedClaims.add(ClaimTypes.LASTNAME);
         expectedClaims.add(ClaimTypes.EMAILADDRESS);
@@ -167,7 +167,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 
         ClaimCollection requestedClaims = createRequestClaimCollection();
 
-        List<URI> expectedClaims = new ArrayList<URI>();
+        List<URI> expectedClaims = new ArrayList<>();
         expectedClaims.add(ClaimTypes.FIRSTNAME);
         expectedClaims.add(ClaimTypes.LASTNAME);
         expectedClaims.add(ClaimTypes.EMAILADDRESS);
@@ -203,7 +203,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 
         ClaimCollection requestedClaims = createRequestClaimCollection();
 
-        List<URI> expectedClaims = new ArrayList<URI>();
+        List<URI> expectedClaims = new ArrayList<>();
         expectedClaims.add(ClaimTypes.FIRSTNAME);
         expectedClaims.add(ClaimTypes.LASTNAME);
         expectedClaims.add(ClaimTypes.EMAILADDRESS);
@@ -302,7 +302,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
         requestedClaims.add(claim);
 
         // Gender is not expected to be returned because not supported
-        List<URI> expectedClaims = new ArrayList<URI>();
+        List<URI> expectedClaims = new ArrayList<>();
         expectedClaims.add(ClaimTypes.FIRSTNAME);
         expectedClaims.add(ClaimTypes.LASTNAME);
         expectedClaims.add(ClaimTypes.EMAILADDRESS);
@@ -365,7 +365,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
         claim.setOptional(true);
         requestedClaims.add(claim);
         
-        List<URI> expectedClaims = new ArrayList<URI>();
+        List<URI> expectedClaims = new ArrayList<>();
         expectedClaims.add(ClaimTypes.FIRSTNAME);
         expectedClaims.add(ClaimTypes.LASTNAME);
         expectedClaims.add(ClaimTypes.EMAILADDRESS);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jcs/JAXRSJcsTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jcs/JAXRSJcsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jcs/JAXRSJcsTest.java
index 148c193..7355aa8 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jcs/JAXRSJcsTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jcs/JAXRSJcsTest.java
@@ -67,7 +67,7 @@ public class JAXRSJcsTest extends AbstractBusClientServerTestBase {
     private WebClient createWebClient() {
         URL busFile = JAXRSJcsTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         
         String address = "https://localhost:" + PORT + "/jcs/bookstore/books";
         WebClient client = 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
index 9ee411b..e7a2a69 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
@@ -123,7 +123,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase {
     @Test
     public void testJwsJsonBookDoubleHmac() throws Exception {
         String address = "https://localhost:" + PORT + "/jwsjsonhmac2";
-        List<String> properties = new ArrayList<String>();
+        List<String> properties = new ArrayList<>();
         properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.properties");
         properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties");
         Map<String, Object> map = new HashMap<String, Object>();
@@ -139,7 +139,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase {
     @Test
     public void testJwsJsonBookDoubleHmacSinglePropsFile() throws Exception {
         String address = "https://localhost:" + PORT + "/jwsjsonhmac2";
-        List<String> properties = new ArrayList<String>();
+        List<String> properties = new ArrayList<>();
         properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac2.properties");
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(JoseConstants.RSSEC_SIGNATURE_OUT_PROPS, properties);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
index 905fe60..a829c95 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
@@ -71,7 +71,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -98,7 +98,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -128,7 +128,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -154,7 +154,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -184,7 +184,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -210,7 +210,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -236,7 +236,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
     public void testSmallEncryptionKeySize() throws Exception {
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -268,7 +268,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -295,7 +295,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -325,7 +325,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -351,7 +351,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -378,7 +378,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -405,7 +405,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -435,7 +435,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
 
         String address = "http://localhost:" + PORT + "/jws/bookstore/books";
@@ -482,7 +482,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
index b116596..91715c5 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
@@ -72,7 +72,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -99,7 +99,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -136,7 +136,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -166,7 +166,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -203,7 +203,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JweWriterInterceptor());
 
@@ -237,7 +237,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -272,7 +272,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -300,7 +300,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 
@@ -336,7 +336,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JweJwsReferenceTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwsWriterInterceptor());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
index 9ee33af..f41f84a 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
@@ -76,7 +76,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter();
         clientFilter.setJwsRequired(false);
@@ -116,7 +116,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter();
         clientFilter.setJwsRequired(false);
@@ -159,7 +159,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter();
         clientFilter.setJwsRequired(false);
@@ -201,7 +201,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
         
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter();
         clientFilter.setJwsRequired(false);
@@ -244,7 +244,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
         
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter();
         clientFilter.setJwsRequired(false);
@@ -287,7 +287,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -324,7 +324,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -364,7 +364,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -400,7 +400,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -437,7 +437,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -478,7 +478,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -516,7 +516,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -552,7 +552,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -584,7 +584,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter();
         clientFilter.setJwsRequired(true);
@@ -627,7 +627,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -669,7 +669,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -708,7 +708,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAlgorithmTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
index be641a8..5eb652d 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
@@ -72,7 +72,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -112,7 +112,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -149,7 +149,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -191,7 +191,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -227,7 +227,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
index 7ce86d3..323f00b 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
@@ -72,7 +72,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -109,7 +109,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -145,7 +145,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -181,7 +181,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -217,7 +217,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -254,7 +254,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -291,7 +291,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -321,7 +321,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -352,7 +352,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -381,7 +381,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         URL busFile = JWTPropertiesTest.class.getResource("client.xml");
 
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         providers.add(new JacksonJsonProvider());
         providers.add(new JwtAuthenticationClientFilter());
 
@@ -397,7 +397,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
         claims.setIssuedAt(new Date().getTime() / 1000L);
         
         String badAddress = "https://localhost:" + PORT + "/badunsignedjwt/bookstore/books";
-        List<String> audiences = new ArrayList<String>();
+        List<String> audiences = new ArrayList<>();
         audiences.add(address);
         audiences.add(badAddress);
         claims.setAudiences(audiences);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
index 799c379..7a07931 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
@@ -74,7 +74,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
     }
     
     private List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
-        List<OAuthPermission> permissions = new ArrayList<OAuthPermission>();
+        List<OAuthPermission> permissions = new ArrayList<>();
         for (String requestScope : requestPermissions) {
             OAuthPermission oAuthPermission = AVAILABLE_PERMISSIONS.get(requestScope);
             permissions.add(oAuthPermission);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
index 9bab25d..96d1b40 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
@@ -159,7 +159,7 @@ public final class OAuth2TestUtils {
     }
     
     public static List<Object> setupProviders() {
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         JSONProvider<OAuthAuthorizationData> jsonP = new JSONProvider<OAuthAuthorizationData>();
         jsonP.setNamespaceMap(Collections.singletonMap("http://org.apache.cxf.rs.security.oauth",
                                                        "ns2"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
index 75e7d17..91d76d3 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
@@ -39,7 +39,7 @@ import org.apache.xml.security.utils.ClassLoaderUtils;
  * Extend the DefaultEHCacheCodeDataProvider to allow refreshing of tokens
  */
 public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
-    private Set<String> externalClients = new HashSet<String>();
+    private Set<String> externalClients = new HashSet<>();
     public OAuthDataProviderImpl(String servicePort) throws Exception {
         // filters/grants test client
         Client client = new Client("consumer-id", "this-is-a-secret", true);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/SamlCallbackHandler.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/SamlCallbackHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/SamlCallbackHandler.java
index 1a92f42..3897580 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/SamlCallbackHandler.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/SamlCallbackHandler.java
@@ -129,12 +129,12 @@ public class SamlCallbackHandler implements CallbackHandler {
                 if (roles == null) {
                     roles = Collections.singletonList("user");
                 }
-                List<AttributeBean> claims = new ArrayList<AttributeBean>();
+                List<AttributeBean> claims = new ArrayList<>();
                 AttributeBean roleClaim = new AttributeBean();
                 roleClaim.setSimpleName("subject-role");
                 roleClaim.setQualifiedName(SAMLClaim.SAML_ROLE_ATTRIBUTENAME_DEFAULT);
                 roleClaim.setNameFormat(SAML2Constants.ATTRNAME_FORMAT_UNSPECIFIED);
-                roleClaim.setAttributeValues(new ArrayList<Object>(roles));
+                roleClaim.setAttributeValues(new ArrayList<>(roles));
                 claims.add(roleClaim);
                 
                 List<String> authMethods = 
@@ -147,7 +147,7 @@ public class SamlCallbackHandler implements CallbackHandler {
                 authClaim.setSimpleName("http://claims/authentication");
                 authClaim.setQualifiedName("http://claims/authentication");
                 authClaim.setNameFormat("http://claims/authentication-format");
-                authClaim.setAttributeValues(new ArrayList<Object>(authMethods));
+                authClaim.setAttributeValues(new ArrayList<>(authMethods));
                 claims.add(authClaim);
                 
                 attrBean.setSamlAttributes(claims);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java
index ba0b56b..d54b863 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java
@@ -43,7 +43,7 @@ public class MemoryClientDataProvider implements ClientRegistrationProvider {
 
     @Override
     public List<Client> getClients(UserSubject resourceOwner) {
-        return new ArrayList<Client>(clients.values());
+        return new ArrayList<>(clients.values());
     }
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
index 5a6b26f..19bbd4f 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
@@ -153,12 +153,12 @@ public class SamlCallbackHandler implements CallbackHandler {
                 if (roles == null) {
                     roles = Collections.singletonList("user");
                 }
-                List<AttributeBean> claims = new ArrayList<AttributeBean>();
+                List<AttributeBean> claims = new ArrayList<>();
                 AttributeBean roleClaim = new AttributeBean();
                 roleClaim.setSimpleName("subject-role");
                 roleClaim.setQualifiedName(SAMLClaim.SAML_ROLE_ATTRIBUTENAME_DEFAULT);
                 roleClaim.setNameFormat(SAML2Constants.ATTRNAME_FORMAT_UNSPECIFIED);
-                roleClaim.setAttributeValues(new ArrayList<Object>(roles));
+                roleClaim.setAttributeValues(new ArrayList<>(roles));
                 claims.add(roleClaim);
                 
                 List<String> authMethods = CastUtils.cast((List<?>)m.getContextualProperty("saml.auth"));
@@ -170,7 +170,7 @@ public class SamlCallbackHandler implements CallbackHandler {
                 authClaim.setSimpleName("http://claims/authentication");
                 authClaim.setQualifiedName("http://claims/authentication");
                 authClaim.setNameFormat("http://claims/authentication-format");
-                authClaim.setAttributeValues(new ArrayList<Object>(authMethods));
+                authClaim.setAttributeValues(new ArrayList<>(authMethods));
                 claims.add(authClaim);
                 
                 attrBean.setSamlAttributes(claims);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/tracing/src/test/java/org/apache/cxf/systest/TestSpanReceiver.java
----------------------------------------------------------------------
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/TestSpanReceiver.java b/systests/tracing/src/test/java/org/apache/cxf/systest/TestSpanReceiver.java
index 0e896c5..d1da03d 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/TestSpanReceiver.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/TestSpanReceiver.java
@@ -31,7 +31,7 @@ import org.apache.htrace.core.SpanReceiver;
  * Test HTrace Span receiver
  */
 public class TestSpanReceiver extends SpanReceiver {
-    private static List<Span> spans = new ArrayList<Span>();
+    private static List<Span> spans = new ArrayList<>();
 
     public TestSpanReceiver(final HTraceConfiguration conf) {
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java b/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
index 07dfc86..1c0a39f 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
@@ -66,7 +66,7 @@ public final class JMSTestUtil {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return new ArrayList<TestCaseType>();
+        return new ArrayList<>();
     }
 
     public static TestCaseType getTestCase(String testId) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/AbstractVmJMSTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/AbstractVmJMSTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/AbstractVmJMSTest.java
index 4fb21dd..a53bd12 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/AbstractVmJMSTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/AbstractVmJMSTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractVmJMSTest {
     protected static ConnectionFactoryFeature cff;
     protected static ConnectionFactory cf;
     protected static BrokerService broker;
-    private List<Object> closeableResources = new ArrayList<Object>();
+    private List<Object> closeableResources = new ArrayList<>();
 
     public static void startBusAndJMS(Class<?> testClass) {
         String brokerURI = "vm://" + testClass.getName() + "?broker.persistent=false&broker.useJmx=false";

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
index e6f36bf..6300ef7 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
@@ -78,7 +78,7 @@ public class JMSClientServerTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(JMSClientServerTest.class);
  
     private static EmbeddedJMSBrokerLauncher broker;
-    private List<String> wsdlStrings = new ArrayList<String>();
+    private List<String> wsdlStrings = new ArrayList<>();
     
     @BeforeClass
     public static void startServers() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
index cfaf711..bdd5423 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
@@ -52,7 +52,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(JMSWSSecurityTest.class);
  
     private static EmbeddedJMSBrokerLauncher broker;
-    private List<String> wsdlStrings = new ArrayList<String>();
+    private List<String> wsdlStrings = new ArrayList<>();
     
     @BeforeClass
     public static void startServers() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
index 0702c49..b0eac67 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
@@ -210,7 +210,7 @@ public class JMSSharedQueueTest extends AbstractVmJMSTest {
 
         HelloWorldPortType port = markForClose(service.getPort(portName, HelloWorldPortType.class, cff));
 
-        Collection<ClientRunnable> clients = new ArrayList<ClientRunnable>();
+        Collection<ClientRunnable> clients = new ArrayList<>();
         for (int i = 0; i < 1; ++i) {
             clients.add(new ClientRunnable(port));
         }
@@ -256,7 +256,7 @@ public class JMSSharedQueueTest extends AbstractVmJMSTest {
         HelloWorldPortType portEng = markForClose(service.getPort(portNameEng, HelloWorldPortType.class, cff));
         HelloWorldPortType portSales = markForClose(service.getPort(portNameSales, HelloWorldPortType.class, cff));
 
-        Collection<ClientRunnable> clients = new ArrayList<ClientRunnable>();
+        Collection<ClientRunnable> clients = new ArrayList<>();
         for (int i = 0; i < 10; ++i) {
             clients.add(new ClientRunnable(portEng, "com.mycompany.eng:"));
             clients.add(new ClientRunnable(portSales, "com.mycompany.sales:"));
@@ -274,7 +274,7 @@ public class JMSSharedQueueTest extends AbstractVmJMSTest {
             new HelloWorldServiceRuntimeCorrelationIDDynamicPrefix(wsdl, serviceName);
         HelloWorldPortType port = markForClose(service.getPort(portName, HelloWorldPortType.class, cff));
 
-        Collection<ClientRunnable> clients = new ArrayList<ClientRunnable>();
+        Collection<ClientRunnable> clients = new ArrayList<>();
         for (int i = 0; i < 10; ++i) {
             clients.add(new ClientRunnable(port));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java
index c33fbf4..46c919a 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java
@@ -47,7 +47,7 @@ public class MyBeanLocator implements ConfiguredBeanLocator {
     @SuppressWarnings("unchecked")
     @Override
     public <T> Collection<? extends T> getBeansOfType(Class<T> type) {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         for (String name : registry.keySet()) {
             Object bean = registry.get(name);
             if (type.isAssignableFrom(bean.getClass())) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
index c15b51c..1667206 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
@@ -62,7 +62,7 @@ import org.junit.Test;
 public class HTTPConduitTest extends AbstractBusClientServerTestBase {
     private static final boolean IN_PROCESS = true;
     
-    private static List<String> servers = new ArrayList<String>();
+    private static List<String> servers = new ArrayList<>();
 
     private static Map<String, String> addrMap = new TreeMap<String, String>();
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index 61521e5..86c2d38 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -93,7 +93,7 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
     private static final boolean IN_PROCESS = true;
     
     private static TLSClientParameters tlsClientParameters = new TLSClientParameters();
-    private static List<String> servers = new ArrayList<String>();
+    private static List<String> servers = new ArrayList<>();
 
     private static Map<String, String> addrMap = new TreeMap<String, String>();
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
index 4ee4b45..5bee4a4 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
@@ -54,7 +54,7 @@ public class CXFFilterTest extends AbstractServletTest {
         WebLink[] links = res.getLinks();
         assertEquals("Wrong number of service links", 3, links.length);
         
-        Set<String> links2 = new HashSet<String>();
+        Set<String> links2 = new HashSet<>();
         for (WebLink l : links) {
             links2.add(l.getURLString());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
index a60f791..be828c1 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
@@ -104,7 +104,7 @@ public class CXFServletTest extends AbstractServletTest {
         WebLink[] links = res.getLinks();
         assertEquals("Wrong number of service links", 6, links.length);
         
-        Set<String> links2 = new HashSet<String>();
+        Set<String> links2 = new HashSet<>();
         for (WebLink l : links) {
             links2.add(l.getURLString());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
index a96b449..554fd75 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
@@ -61,7 +61,7 @@ public class ExternalServicesServletTest extends AbstractServletTest {
         WebLink[] links = res.getLinks();
         assertEquals("Wrong number of service links", 6, links.length);
         
-        Set<String> links2 = new HashSet<String>();
+        Set<String> links2 = new HashSet<>();
         for (WebLink l : links) {
             links2.add(l.getURLString());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java
index fbf8493..0c28f15 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java
@@ -129,7 +129,7 @@ public class NoSpringServletClientTest extends AbstractBusClientServerTestBase {
         WebConversation client = new WebConversation();
         WebResponse res = client.getResponse(serviceURL + "/services");
         WebLink[] links = res.getLinks();
-        Set<String> s = new HashSet<String>();
+        Set<String> s = new HashSet<>();
         for (WebLink l : links) {
             s.add(l.getURLString());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
index 66754f6..f033a8b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
@@ -104,7 +104,7 @@ public class BusExtensionLoadingTest extends Assert {
         @Override
         public Enumeration<URL> getResources(final String name) throws IOException {
             if (name.contains("cxf") || name.contains("bus")) {
-                return Collections.enumeration(new ArrayList<URL>());
+                return Collections.enumeration(new ArrayList<>());
             }
             return super.getResources(name);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
index a8828ec..71eee9f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
@@ -98,7 +98,7 @@ public class FailoverAddressOverrideTest extends AbstractBusClientServerTestBase
         SpringBusFactory bf = new SpringBusFactory();    
         bus = bf.createBus(getConfig());
         BusFactory.setDefaultBus(bus);
-        targets = new ArrayList<String>();
+        targets = new ArrayList<>();
     }
     
     @After

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
index ccf5b09..81c3f7f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
@@ -105,7 +105,7 @@ public class FailoverTest extends AbstractBusClientServerTestBase {
     
     @Before
     public void setUp() {
-        targets = new ArrayList<String>();
+        targets = new ArrayList<>();
         SpringBusFactory bf = new SpringBusFactory();    
         bus = bf.createBus(getConfig());
         BusFactory.setDefaultBus(bus);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
index f6741a6..7389489 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
@@ -40,7 +40,7 @@ public class GreeterImpl {
     
     public BareDocumentResponse testDocLitFault(String in) throws BadRecordLitFault {
         //System.out.println("Executing testDocLitFault sayHi\n");
-        List<Header> headers = new ArrayList<Header>();
+        List<Header> headers = new ArrayList<>();
         Header header = null;
         try {
             header = new Header(new QName("http://test", "test"), 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
index 8c0070e..72a8a45 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
@@ -363,7 +363,7 @@ public class InterceptorFaultTest extends AbstractBusClientServerTestBase {
             comparator = new PhaseComparator();
         }
         if (null == inPhases) {
-            inPhases = new ArrayList<Phase>();
+            inPhases = new ArrayList<>();
             inPhases.addAll(greeterBus.getExtension(PhaseManager.class).getInPhases());
             Collections.sort(inPhases, comparator);
         }        

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
index 3963b93..e148a78 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
@@ -102,7 +102,7 @@ public class MtomPolicyTest extends AbstractBusClientServerTestBase {
         sf.setAddress(address);
         
         WSPolicyFeature policyFeature = new WSPolicyFeature();
-        List<Element> policyElements = new ArrayList<Element>();
+        List<Element> policyElements = new ArrayList<>();
         if (mtomRequired) {
             policyElements.add(StaxUtils.read(
                 getClass().getResourceAsStream("mtom-policy.xml"))

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
index b70a3bc..d9146f7 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
@@ -96,7 +96,7 @@ public class OOBHeaderTest extends AbstractBusClientServerTestBase {
                         new JAXBDataBinding(ob.getClass()));
                 hdr.setMustUnderstand(mu);
 
-                List<Header> holder = new ArrayList<Header>();
+                List<Header> holder = new ArrayList<>();
                 holder.add(hdr);
                 
                 //Add List of headerHolders to requestContext.

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
index cb2e548..6c83c51 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
@@ -43,7 +43,7 @@ public class SayHiImpl implements SayHi {
                      targetNamespace = "http://apache.org/sayHi2", 
                      className = "org.apache.sayhi2.SayHiArrayResponse")
     public List<String> sayHiArray(@WebParam(name = "arg0", targetNamespace = "") List<String> arg0) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("Hi");
         return list;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl2.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl2.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl2.java
index b10fed6..0afae34 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl2.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl2.java
@@ -43,7 +43,7 @@ public class SayHiImpl2 implements SayHi {
                      targetNamespace = "http://apache.org/sayHi2", 
                      className = "org.apache.sayhi2.SayHiArrayResponse")
     public List<String> sayHiArray(@WebParam(name = "arg0", targetNamespace = "") List<String> arg0) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("Hi");
         return list;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArray.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArray.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArray.java
index 2412a6b..3c731f0 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArray.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArray.java
@@ -32,7 +32,7 @@ public class SayHiArray {
 
     public List<String> getArg0() {
         if (arg0 == null) {
-            arg0 = new ArrayList<String>();
+            arg0 = new ArrayList<>();
         }
         return this.arg0;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArrayResponse.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArrayResponse.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArrayResponse.java
index c9a3803..8573919 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArrayResponse.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/sayhi2/SayHiArrayResponse.java
@@ -34,7 +34,7 @@ public class SayHiArrayResponse {
 
     public List<String> getReturn() {
         if (res == null) {
-            res = new ArrayList<String>();
+            res = new ArrayList<>();
         }
         return this.res;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFinderImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFinderImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFinderImpl.java
index 3c378d7..8988a13 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFinderImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFinderImpl.java
@@ -29,7 +29,7 @@ public class AppleFinderImpl implements AppleFinder {
 
     public List<Apple> getApple(String appleType) {
         if (appleType.equalsIgnoreCase("Fuji")) {
-            List<Apple> apples = new ArrayList<Apple>();
+            List<Apple> apples = new ArrayList<>();
             apples.add(new Fuji("Red", "mild", "Fuji-1"));
             apples.add(new Fuji("Yellow", "sweet", "Fuji-2"));
             return apples;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
index 55a705b..c23b692 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
@@ -35,7 +35,7 @@ import org.apache.type_substitution.Porsche;
 public class CarDealerImpl implements CarDealer {
     public List<Car> getSedans(String carType) {
         if (carType.equalsIgnoreCase("Porsche")) {
-            List<Car> cars = new ArrayList<Car>();
+            List<Car> cars = new ArrayList<>();
             cars.add(newPorsche("Boxster", "1998", "white"));
             cars.add(newPorsche("BoxsterS", "1999", "red"));
             return cars;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 6c1aa2b..a245fa6 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -1999,7 +1999,7 @@ public abstract class AbstractTypeTestClient
                 assertTrue("testStringList(): Incorrect value for out param", yOrig.equals(z.value));
                 assertTrue("testStringList(): Incorrect return value", x.equals(ret));
             }
-            x = new ArrayList<String>();
+            x = new ArrayList<>();
             y = new Holder<List<String>>(yOrig);
             z = new Holder<List<String>>();
             try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
index b6736d6..a882394 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
@@ -41,8 +41,8 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
     protected static final QName PORT_NAME = new QName("http://apache.org/type_test/doc",
                                                        "TypeTestCORBAPort");
 
-    private static final Set<String> NOT_WORKING_TESTS = new HashSet<String>();
-    private static final Set<String> RUN_TESTS = new HashSet<String>();
+    private static final Set<String> NOT_WORKING_TESTS = new HashSet<>();
+    private static final Set<String> RUN_TESTS = new HashSet<>();
     static {
         
         String notWorking[] = new String[] {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index ee9b45f..12cd4d6 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -430,7 +430,7 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
     @ServiceMode(Mode.PAYLOAD)
     public static class GreeterProvider implements Provider<Source> {
         
-        public static final List<String> CALL_ARGS = new ArrayList<String>();
+        public static final List<String> CALL_ARGS = new ArrayList<>();
 
         public Source invoke(Source obj) {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
index f2ea9a0..c698674 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
@@ -98,7 +98,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase {
      */
     private void verifyCallbacks() {
         List<Callback> cbs = callback.getCallbacks();
-        Set<Long> acks = new HashSet<Long>();
+        Set<Long> acks = new HashSet<>();
         long nextNum = 1;
         for (Callback cb: cbs) {
             if (cb.isAccept()) {
@@ -304,7 +304,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase {
     @ServiceMode(Mode.PAYLOAD)
     public static class GreeterProvider implements Provider<Source> {
         
-        public static final List<String> CALL_ARGS = new ArrayList<String>();
+        public static final List<String> CALL_ARGS = new ArrayList<>();
 
         public Source invoke(Source obj) {
 
@@ -349,7 +349,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase {
     
     private static class RecordingMessageCallback implements MessageCallback {
         
-        private List<Callback> callbacks = new ArrayList<Callback>();
+        private List<Callback> callbacks = new ArrayList<>();
         
         @Override
         public void messageAccepted(String seqId, long msgNum) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
index fbd3239..1687603 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
@@ -1720,7 +1720,7 @@ public class SequenceTest extends AbstractBusClientServerTestBase {
         Map<Identifier, DestinationSequence> dsmap = new HashMap<Identifier, DestinationSequence>();
         Map<Identifier, Collection<RMMessage>> ommap = new HashMap<Identifier, Collection<RMMessage>>();
         Map<Identifier, Collection<RMMessage>> immap = new HashMap<Identifier, Collection<RMMessage>>();
-        Set<Identifier> ssclosed = new HashSet<Identifier>();
+        Set<Identifier> ssclosed = new HashSet<>();
 
         @Override
         public void createSourceSequence(SourceSequence seq) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 03919a5..748942b 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -47,8 +47,8 @@ public class MessageFlow extends Assert {
     public MessageFlow(List<byte[]> out, List<byte[]> in, String addrns, String rmns) throws Exception {
         addressingNamespace = addrns;
         rmNamespace = rmns;
-        inboundMessages = new ArrayList<Document>();
-        outboundMessages = new ArrayList<Document>();
+        inboundMessages = new ArrayList<>();
+        outboundMessages = new ArrayList<>();
         reset(out, in);
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/AbstractModifyRequestInterceptor.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/AbstractModifyRequestInterceptor.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/AbstractModifyRequestInterceptor.java
index 53432e9..1cfb202 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/AbstractModifyRequestInterceptor.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/AbstractModifyRequestInterceptor.java
@@ -45,7 +45,7 @@ public abstract class AbstractModifyRequestInterceptor implements PhaseIntercept
     
     private static final QName SEC_HEADER = 
         new QName(WSConstants.WSSE_NS, WSConstants.WSSE_LN, WSConstants.WSSE_PREFIX);
-    private Set<String> afterInterceptors = new HashSet<String>();
+    private Set<String> afterInterceptors = new HashSet<>();
     
     public AbstractModifyRequestInterceptor() {
         getAfter().add(PolicyBasedWSS4JOutInterceptor.class.getName());