cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [07/14] cxf git commit: Removing unnecessary type information
Date Fri, 10 Feb 2017 15:41:55 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
index 16722ae..df4cabd 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
@@ -45,7 +45,7 @@ public class NettyHttpTransportFactory extends AbstractTransportFactory implemen
     /**
      * This constant holds the prefixes served by this factory.
      */
-    private static final Set<String> URI_PREFIXES = new HashSet<String>();
+    private static final Set<String> URI_PREFIXES = new HashSet<>();
     static {
         URI_PREFIXES.add("netty://");
     }
@@ -75,7 +75,7 @@ public class NettyHttpTransportFactory extends AbstractTransportFactory implemen
      * @param ans The transport ids.
      */
     public void setActivationNamespaces(Collection<String> ans) {
-        setTransportIds(new ArrayList<String>(ans));
+        setTransportIds(new ArrayList<>(ans));
     }
     
     public Set<String> getUriPrefixes() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
index 7700949..68f2e9d 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
@@ -104,7 +104,7 @@ public class NettyHttpServerEngineFactoryHolder {
             }
             //Engines
 
-            List<NettyHttpServerEngine> engineList = new ArrayList<NettyHttpServerEngine>();
+            List<NettyHttpServerEngine> engineList = new ArrayList<>();
             for (NettyHttpServerEngineConfigType engine : config.getEngine()) {
                 NettyHttpServerEngine eng = new NettyHttpServerEngine();
                

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
index 05ccc77..08bce14b 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
@@ -408,7 +408,7 @@ public class NettyHttpServletRequest implements HttpServletRequest {
                                 HttpHeaders.Names.ACCEPT_LANGUAGE));
 
         if (locales == null || locales.isEmpty()) {
-            locales = new ArrayList<Locale>();
+            locales = new ArrayList<>();
             locales.add(Locale.getDefault());
         }
         return Utils.enumeration(locales);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
index 3f2b2b7..5902bca 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
@@ -120,7 +120,7 @@ public final class NettySpringTypesFactory {
                                            QName name, 
                                            Class<?> c,
                                            JAXBContext context) throws JAXBException {
-        List<V> list = new ArrayList<V>();
+        List<V> list = new ArrayList<>();
         Node data = null;
            
         Unmarshaller u = context.createUnmarshaller();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
index d3800a3..5623736 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
@@ -107,7 +107,7 @@ public final class Utils {
                                                       HttpRequest request) {
         String cookieString = request.headers().get(COOKIE);
         if (cookieString != null) {
-            List<Cookie> foundCookie = new ArrayList<Cookie>();
+            List<Cookie> foundCookie = new ArrayList<>();
             Set<Cookie> cookies = CookieDecoder.decode(cookieString);
             for (Cookie cookie : cookies) {
                 if (cookie.getName().equals(name)) {
@@ -124,7 +124,7 @@ public final class Utils {
                                                 HttpResponse response) {
         String cookieString = response.headers().get(COOKIE);
         if (cookieString != null) {
-            List<Cookie> foundCookie = new ArrayList<Cookie>();
+            List<Cookie> foundCookie = new ArrayList<>();
             Set<Cookie> cookies = CookieDecoder.decode(cookieString);
             for (Cookie cookie : cookies) {
                 if (cookie.getName().equals(name)) {
@@ -175,7 +175,7 @@ public final class Utils {
             return null;
         }
 
-        List<Locale> locales = new ArrayList<Locale>();
+        List<Locale> locales = new ArrayList<>();
 
         for (String str : acceptLanguageHeader.split(",")) {
             String[] arr = str.trim().replace("-", "_").split(";");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index f08bd2a..a97196c 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -504,7 +504,7 @@ public class NettyHttpDestinationTest extends Assert {
             }
 
             public Set<String> getUriPrefixes() {
-                return new HashSet<String>(Collections.singletonList("http"));
+                return new HashSet<>(Collections.singletonList("http"));
             }
             
         };
@@ -664,12 +664,12 @@ public class NettyHttpDestinationTest extends Assert {
                 EasyMock.expect(request.getAttribute("org.eclipse.jetty.ajax.Continuation")).andReturn(null);
                 EasyMock.expect(request.getAttribute("http.service.redirection")).andReturn(null).anyTimes();
 
-                List<String> contentType = new ArrayList<String>();
+                List<String> contentType = new ArrayList<>();
                 contentType.add("text/xml");
                 contentType.add("charset=utf8");
-                List<String> authHeader = new ArrayList<String>();
+                List<String> authHeader = new ArrayList<>();
                 authHeader.add(BASIC_AUTH);
-                List<String> headerNames = new ArrayList<String>();
+                List<String> headerNames = new ArrayList<>();
                 headerNames.add("content-type");
                 headerNames.add(AUTH_HEADER);
                 
@@ -738,7 +738,7 @@ public class NettyHttpDestinationTest extends Assert {
         Map<String, List<String>> responseHeaders =
             CastUtils.cast((Map<?, ?>)outMsg.get(Message.PROTOCOL_HEADERS));
         assertNotNull("expected response headers", responseHeaders);
-        List<String> challenges = new ArrayList<String>();
+        List<String> challenges = new ArrayList<>();
         challenges.add(BASIC_CHALLENGE);
         challenges.add(DIGEST_CHALLENGE);
         challenges.add(CUSTOM_CHALLENGE);
@@ -824,7 +824,7 @@ public class NettyHttpDestinationTest extends Assert {
                      3,
                      response.getAddFieldCallCount());
         Enumeration e = response.getFieldValues(CHALLENGE_HEADER);
-        List<String> challenges = new ArrayList<String>();
+        List<String> challenges = new ArrayList<>();
         while (e.hasMoreElements()) {
             challenges.add((String)e.nextElement());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
index ad3a6a6..e47d553 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
@@ -536,6 +536,6 @@ public class UndertowHTTPServerEngine implements ServerEngine {
     }
     
     public List<CXFUndertowHttpHandler> getHandlers() {
-        return handlers != null ? handlers : new ArrayList<CXFUndertowHttpHandler>();
+        return handlers != null ? handlers : new ArrayList<>();
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
index 3e5f5a4..ec75b6b 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
@@ -111,7 +111,7 @@ public class UndertowHTTPServerEngineFactoryHolder {
             }
             //Engines
 
-            List<UndertowHTTPServerEngine> engineList = new ArrayList<UndertowHTTPServerEngine>();
+            List<UndertowHTTPServerEngine> engineList = new ArrayList<>();
             for (UndertowHTTPServerEngineConfigType engine : config.getEngine()) {
                 UndertowHTTPServerEngine eng = new UndertowHTTPServerEngine();
                 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
index 016ed0a..8f3bdf2 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
@@ -93,7 +93,7 @@ public class UndertowServerEngineFactoryParser extends AbstractBPBeanDefinitionP
        
     protected Metadata parseEngineHandlers(List<Element> engines, ComponentMetadata enclosingComponent, 
                                            ParserContext context) {
-        List<MapEntry> entries = new ArrayList<MapEntry>();
+        List<MapEntry> entries = new ArrayList<>();
         for (Element engine : engines) {
             String port = engine.getAttribute("port");
             ValueMetadata keyValue = createValue(context, port);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
index 7e88ed1..0be3188 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
@@ -118,7 +118,7 @@ public final class UndertowSpringTypesFactory {
                                            QName name, 
                                            Class<?> c,
                                            JAXBContext context) throws JAXBException {
-        List<V> list = new ArrayList<V>();
+        List<V> list = new ArrayList<>();
         Node data = null;
            
         Unmarshaller u = context.createUnmarshaller();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index bc51936..4ebb432 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -506,7 +506,7 @@ public class UndertowHTTPDestinationTest extends Assert {
             }
 
             public Set<String> getUriPrefixes() {
-                return new HashSet<String>(Collections.singletonList("http"));
+                return new HashSet<>(Collections.singletonList("http"));
             }
             
         };
@@ -671,7 +671,7 @@ public class UndertowHTTPDestinationTest extends Assert {
                 httpFields.add(new HttpString("content-type"), "charset=utf8");
                 httpFields.put(new HttpString(UndertowHTTPDestinationTest.AUTH_HEADER), 
                                UndertowHTTPDestinationTest.BASIC_AUTH);
-                List<String> headers = new ArrayList<String>();
+                List<String> headers = new ArrayList<>();
                 for (HttpString header : httpFields.getHeaderNames()) {
                     headers.add(header.toString());
                 }
@@ -743,7 +743,7 @@ public class UndertowHTTPDestinationTest extends Assert {
         Map<String, List<String>> responseHeaders =
             CastUtils.cast((Map<?, ?>)outMsg.get(Message.PROTOCOL_HEADERS));
         assertNotNull("expected response headers", responseHeaders);
-        List<String> challenges = new ArrayList<String>();
+        List<String> challenges = new ArrayList<>();
         challenges.add(BASIC_CHALLENGE);
         challenges.add(DIGEST_CHALLENGE);
         challenges.add(CUSTOM_CHALLENGE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index a909822..29e9aab 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -112,7 +112,7 @@ public class UndertowHTTPServerEngineTest extends Assert {
         engine.setTlsServerParameters(new TLSServerParameters());
         engine.finalizeConfig();
 
-        List<UndertowHTTPServerEngine> list = new ArrayList<UndertowHTTPServerEngine>();
+        List<UndertowHTTPServerEngine> list = new ArrayList<>();
         list.add(engine);
         factory.setEnginesList(list);
         engine = factory.createUndertowHTTPServerEngine(PORT2, "https");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index f7b1390..e81ebb7 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -179,7 +179,7 @@ public abstract class HTTPConduit
     private static final String HTTP_POST_METHOD = "POST";
     private static final String HTTP_GET_METHOD = "GET";
     private static final Set<String> KNOWN_HTTP_VERBS_WITH_NO_CONTENT = 
-        new HashSet<String>(Arrays.asList(new String[]{"GET", "HEAD", "OPTIONS", "TRACE"}));
+        new HashSet<>(Arrays.asList(new String[]{"GET", "HEAD", "OPTIONS", "TRACE"}));
     /**
      * This constant is the Message(Map) key for a list of visited URLs that
      * is used in redirect loop protection.
@@ -1915,7 +1915,7 @@ public abstract class HTTPConduit
         @SuppressWarnings("unchecked")
         Set<String> authURLs = (Set<String>) message.get(KEY_AUTH_URLS);
         if (authURLs == null) {
-            authURLs = new HashSet<String>();
+            authURLs = new HashSet<>();
             message.put(KEY_AUTH_URLS, authURLs);
         }
         // If we have been here (URL & Realm) before for this particular message

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
index e09d549..fd74556 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
@@ -72,7 +72,7 @@ public class HTTPTransportFactory
     /**
      * This constant holds the prefixes served by this factory.
      */
-    private static final Set<String> URI_PREFIXES = new HashSet<String>();
+    private static final Set<String> URI_PREFIXES = new HashSet<>();
     static {
         URI_PREFIXES.add("http://");
         URI_PREFIXES.add("https://");
@@ -125,7 +125,7 @@ public class HTTPTransportFactory
      * @param ans The transport ids.
      */
     public void setActivationNamespaces(Collection<String> ans) {
-        setTransportIds(new ArrayList<String>(ans));
+        setTransportIds(new ArrayList<>(ans));
     }
 
     public EndpointInfo createEndpointInfo(

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index 8aecbd3..09c8bc6 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -80,7 +80,7 @@ public class Headers {
     private static final Set<String> HTTP_HEADERS_SINGLE_VALUE_ONLY;
     private static final String USER_AGENT;
     static {
-        HTTP_HEADERS_SINGLE_VALUE_ONLY = new HashSet<String>();
+        HTTP_HEADERS_SINGLE_VALUE_ONLY = new HashSet<>();
         HTTP_HEADERS_SINGLE_VALUE_ONLY.add(HTTP_HEADERS_SETCOOKIE);
         HTTP_HEADERS_SINGLE_VALUE_ONLY.add(HTTP_HEADERS_LINK);
         USER_AGENT = initUserAgent();
@@ -149,9 +149,9 @@ public class Headers {
             }
         }
         if (cookies == null) {
-            cookies = new ArrayList<String>();
+            cookies = new ArrayList<>();
         } else {
-            cookies = new ArrayList<String>(cookies);
+            cookies = new ArrayList<>(cookies);
         }
         headers.put(HttpHeaderHelper.COOKIE, cookies);
         for (Cookie c : sessionCookies.values()) {
@@ -300,7 +300,7 @@ public class Headers {
     }
 
     private static List<String> createMutableList(String val) {
-        return new ArrayList<String>(Arrays.asList(new String[] {val}));
+        return new ArrayList<>(Arrays.asList(new String[] {val}));
     }
 
     /**
@@ -444,7 +444,7 @@ public class Headers {
             String mappedName = HttpHeaderHelper.getHeaderKey(fname);
             List<String> values = headers.get(mappedName);
             if (values == null) {
-                values = new ArrayList<String>();
+                values = new ArrayList<>();
                 headers.put(mappedName, values);
             }
             for (Enumeration<String> e2 = req.getHeaders(fname); e2.hasMoreElements();) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/NoOpPolicyInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/NoOpPolicyInterceptorProvider.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/NoOpPolicyInterceptorProvider.java
index 854e032..d49266d 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/NoOpPolicyInterceptorProvider.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/NoOpPolicyInterceptorProvider.java
@@ -43,7 +43,7 @@ public class NoOpPolicyInterceptorProvider
         new QName("http://cxf.apache.org/transports/http/configuration", "client");
     
     static {
-        Collection<QName> types = new ArrayList<QName>();
+        Collection<QName> types = new ArrayList<>();
         types.add(HTTP_CONF_NAME);
         ASSERTION_TYPES = types;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
index 1a4a048..03f5eb2 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
@@ -116,7 +116,7 @@ class SSLSocketFactoryWrapper extends SSLSocketFactory {
         return socket;        
     }
     private String[] findProtocols(String p, String[] options) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String s : options) {
             if (s.equals(p)) {
                 return new String[] {p};

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
index 5d3287c..4ab2ef4 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
@@ -283,7 +283,7 @@ public final class DefaultHostnameVerifier implements HostnameVerifier {
                 if (type == subjectType) {
                     final String s = (String) list.get(1);
                     if (subjectAltList == null) {
-                        subjectAltList = new ArrayList<String>();
+                        subjectAltList = new ArrayList<>();
                     }
                     subjectAltList.add(s);
                 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
index 8d24646..a4b6764 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
@@ -94,7 +94,7 @@ public class ServiceListGeneratorServlet extends HttpServlet {
         if (bus != null) {
             privateEndpoints = (List<String>)bus.getProperty("org.apache.cxf.private.endpoints");
         } else {
-            privateEndpoints = new ArrayList<String>();
+            privateEndpoints = new ArrayList<>();
         }
         
         AbstractDestination[] soapEndpoints = getSOAPEndpoints(destinations, privateEndpoints);
@@ -152,7 +152,7 @@ public class ServiceListGeneratorServlet extends HttpServlet {
 
     private AbstractDestination[] getSOAPEndpoints(AbstractDestination[] destinations,
                                                    List<String> privateEndpoints) {
-        List<AbstractDestination> soapEndpoints = new ArrayList<AbstractDestination>();
+        List<AbstractDestination> soapEndpoints = new ArrayList<>();
         for (AbstractDestination sd : destinations) {
             if (null != sd.getEndpointInfo().getName() && null != sd.getEndpointInfo().getInterface()
                 && !isPrivate(sd.getEndpointInfo(), privateEndpoints)) {
@@ -164,7 +164,7 @@ public class ServiceListGeneratorServlet extends HttpServlet {
     
     private AbstractDestination[] getRestEndpoints(AbstractDestination[] destinations,
                                                    List<String> privateEndpoints) {
-        List<AbstractDestination> restfulDests = new ArrayList<AbstractDestination>();
+        List<AbstractDestination> restfulDests = new ArrayList<>();
         for (AbstractDestination sd : destinations) {
             // use some more reasonable check - though this one seems to be the only option at the moment
             if (null == sd.getEndpointInfo().getInterface()

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/test/java/org/apache/cxf/transport/http/CXFAuthenticatorCleanupTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/CXFAuthenticatorCleanupTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/CXFAuthenticatorCleanupTest.java
index 015cf2b..ea3b3dd 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/CXFAuthenticatorCleanupTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/CXFAuthenticatorCleanupTest.java
@@ -42,7 +42,7 @@ public class CXFAuthenticatorCleanupTest {
     
     @Test
     public void runCleanupTestStrongRef() throws Exception {
-        final List<Integer> traceLengths = new ArrayList<Integer>();
+        final List<Integer> traceLengths = new ArrayList<>();
         
         //create a chain of CXFAuthenticators, strongly referenced to prevent cleanups
         Authenticator.setDefault(new Authenticator() {
@@ -57,7 +57,7 @@ public class CXFAuthenticatorCleanupTest {
         Authenticator.requestPasswordAuthentication("localhost", add,
                                                     8080, "http", "hello", "http");
         
-        List<CXFAuthenticator> list = new ArrayList<CXFAuthenticator>();
+        List<CXFAuthenticator> list = new ArrayList<>();
         for (int x = 0; x < 20; x++) {
             CXFAuthenticator.addAuthenticator();
             list.add(CXFAuthenticator.instance);
@@ -100,7 +100,7 @@ public class CXFAuthenticatorCleanupTest {
     @Test
     public void runCleanupTestWeakRef() throws Exception {
         InetAddress add = InetAddress.getLocalHost();
-        final List<Integer> traceLengths = new ArrayList<Integer>();
+        final List<Integer> traceLengths = new ArrayList<>();
         //create a chain of CXFAuthenticators, strongly referenced to prevent cleanups
         Authenticator.setDefault(new Authenticator() {
             protected PasswordAuthentication getPasswordAuthentication() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
index ee6f890..85f4856 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
@@ -61,7 +61,7 @@ public class HTTPConduitTest extends Assert {
     private Message getNewMessage() {
         Message message = new MessageImpl();
         Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-        List<String> contentTypes = new ArrayList<String>();
+        List<String> contentTypes = new ArrayList<>();
         contentTypes.add("text/xml");
         contentTypes.add("charset=utf8");
         headers.put("content-type", contentTypes);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index 2541b32..cfd7604 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -60,7 +60,7 @@ public class HTTPConduitURLConnectionTest extends Assert {
     private Message getNewMessage() {
         Message message = new MessageImpl();
         Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-        List<String> contentTypes = new ArrayList<String>();
+        List<String> contentTypes = new ArrayList<>();
         contentTypes.add("text/xml");
         contentTypes.add("charset=utf8");
         headers.put("content-type", contentTypes);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index c307159..f89eaf4 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -269,11 +269,11 @@ public class HTTPConduitURLEasyMockTest extends Assert {
 
     private void setUpHeaders(Message message) {
         Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-        List<String> contentTypes = new ArrayList<String>();
+        List<String> contentTypes = new ArrayList<>();
         contentTypes.add("text/xml;charset=utf8");
         headers.put("content-type", contentTypes);
         
-        List<String> acceptTypes = new ArrayList<String>();
+        List<String> acceptTypes = new ArrayList<>();
         acceptTypes.add("text/xml;charset=utf8");
         acceptTypes.add("text/plain");
         headers.put("Accept", acceptTypes);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index c8e9d56..765a796 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -75,7 +75,7 @@ public class PolicyUtilsTest extends Assert {
         control.verify();
 
         control.reset();
-        Collection<PolicyAssertion> as = new ArrayList<PolicyAssertion>();
+        Collection<PolicyAssertion> as = new ArrayList<>();
         AssertionInfoMap aim = new AssertionInfoMap(as);
         EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(aim);
         control.replay();
@@ -120,7 +120,7 @@ public class PolicyUtilsTest extends Assert {
 
         AssertionInfoMap aim = new AssertionInfoMap(CastUtils.cast(Collections.EMPTY_LIST,
                                                                    PolicyAssertion.class));
-        Collection<AssertionInfo> ais = new ArrayList<AssertionInfo>();
+        Collection<AssertionInfo> ais = new ArrayList<>();
         ais.add(eai);
         ais.add(cmai);
         ais.add(icmai);
@@ -173,7 +173,7 @@ public class PolicyUtilsTest extends Assert {
         AssertionInfo cmai = getServerPolicyAssertionInfo(cmp); 
         AssertionInfo icmai = getServerPolicyAssertionInfo(icmp);
 
-        Collection<AssertionInfo> ais = new ArrayList<AssertionInfo>();
+        Collection<AssertionInfo> ais = new ArrayList<>();
         ais.add(eai);
         ais.add(mai);
         ais.add(cmai);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
index 21d31cc..6224fe8 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
@@ -44,7 +44,7 @@ public class JMSMessageHeadersType {
 
     public List<JMSPropertyType> getProperty() {
         if (property == null) {
-            property = new ArrayList<JMSPropertyType>();
+            property = new ArrayList<>();
         }
         return this.property;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
index c176051..ca52cb5 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
@@ -46,7 +46,7 @@ public class JMSTransportFactory extends AbstractTransportFactory implements Con
             "http://cxf.apache.org/transports/jms/configuration"
         );
 
-    private static final Set<String> URI_PREFIXES = new HashSet<String>();
+    private static final Set<String> URI_PREFIXES = new HashSet<>();
     static {
         URI_PREFIXES.add("jms://");
         URI_PREFIXES.add("jms:");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
index 2c5a1b6..b89b626 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/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/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java b/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
index 05b628d..9bf6119 100644
--- a/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
+++ b/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
@@ -61,7 +61,7 @@ public class LocalTransportFactory extends AbstractTransportFactory
         = LocalTransportFactory.class.getName() + ".includeProperties";
 
     private static final Logger LOG = LogUtils.getL7dLogger(LocalTransportFactory.class);
-    private static final Set<String> URI_PREFIXES = new HashSet<String>();
+    private static final Set<String> URI_PREFIXES = new HashSet<>();
     private static final String NULL_ADDRESS 
         = LocalTransportFactory.class.getName() + ".nulladdress";
 
@@ -74,14 +74,14 @@ public class LocalTransportFactory extends AbstractTransportFactory
 
     private Set<String> messageFilterProperties;
     private Set<String> messageIncludeProperties;
-    private Set<String> uriPrefixes = new HashSet<String>(URI_PREFIXES);
+    private Set<String> uriPrefixes = new HashSet<>(URI_PREFIXES);
     private volatile Executor executor;
 
     public LocalTransportFactory() {
         super(DEFAULT_NAMESPACES);
         
-        messageFilterProperties = new HashSet<String>();
-        messageIncludeProperties = new HashSet<String>();
+        messageFilterProperties = new HashSet<>();
+        messageIncludeProperties = new HashSet<>();
         messageFilterProperties.add(Message.REQUESTOR_ROLE); 
         
         messageIncludeProperties.add(Message.PROTOCOL_HEADERS);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
index c4a2aeb..8a29189 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
@@ -120,7 +120,7 @@ public class UDPConduit extends AbstractConduit {
                     }
                 }
                 if (mp != null) {
-                    Collection<String> s = new ArrayList<String>(message.getExchange().keySet());
+                    Collection<String> s = new ArrayList<>(message.getExchange().keySet());
                     for (String s2 : s) {
                         message.getExchange().remove(s2);
                     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
index 8a8b353..f40d6f1 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
@@ -203,7 +203,7 @@ public class UDPDestination extends AbstractDestination {
         }
         if (ret == null) {
             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/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
index c097cc3..1f6bd4e 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
@@ -48,12 +48,12 @@ public class UDPTransportFactory extends AbstractTransportFactory
         = Arrays.asList(TRANSPORT_ID);
 
     private static final Logger LOG = LogUtils.getL7dLogger(UDPTransportFactory.class);
-    private static final Set<String> URI_PREFIXES = new HashSet<String>();
+    private static final Set<String> URI_PREFIXES = new HashSet<>();
     static {
         URI_PREFIXES.add("udp://");
     }
     
-    private Set<String> uriPrefixes = new HashSet<String>(URI_PREFIXES);
+    private Set<String> uriPrefixes = new HashSet<>(URI_PREFIXES);
 
     public UDPTransportFactory() {
         super(DEFAULT_NAMESPACES);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
index b1da539..d8e0504 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
@@ -53,7 +53,7 @@ public class WebSocketTransportFactory extends AbstractTransportFactory implemen
             "http://cxf.apache.org/transports/websocket/configuration"
         );
 
-    private static final Set<String> URI_PREFIXES = new HashSet<String>();
+    private static final Set<String> URI_PREFIXES = new HashSet<>();
     static {
         URI_PREFIXES.add("ws://");
         URI_PREFIXES.add("wss://");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
index 4ee68a2..c4271a2 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
@@ -42,7 +42,7 @@ public class AddressingPolicyInterceptorProvider extends AbstractPolicyIntercept
     private static final MAPCodec MAP_CODEC = new MAPCodec();
     
     static {
-        Collection<QName> types = new ArrayList<QName>();
+        Collection<QName> types = new ArrayList<>();
         types.add(MetadataConstants.ADDRESSING_ASSERTION_QNAME);
         types.add(MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
         types.add(MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
index c546edf..b2e2eb8 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
@@ -559,7 +559,7 @@ public class MAPCodec extends AbstractSoapInterceptor {
                             }
                         } else if (null != headerElement.getAttribute(IS_REFERENCE_PARAM_ATTR_NAME)) {
                             if (null == referenceParameterHeaders) {
-                                referenceParameterHeaders = new HashSet<Element>();
+                                referenceParameterHeaders = new HashSet<>();
                             }
                             referenceParameterHeaders.add(headerElement); 
                         } else if (headerURI.contains(Names.WSA_NAMESPACE_PATTERN)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
index 8cab1ee..3f157ea 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
@@ -173,7 +173,7 @@ public class VersionTransformer extends org.apache.cxf.ws.addressing.VersionTran
      * Augment the set of headers understood by the protocol binding with the 2004/08 header QNames.
      */
     static {
-        Set<QName> headers = new HashSet<QName>();
+        Set<QName> headers = new HashSet<>();
         headers.addAll(Names.HEADERS);
         Names200408.addHeaders(headers);
         Names200403.addHeaders(headers);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index 4be1fc7..6f64fb3 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -657,7 +657,7 @@ public class MAPAggregatorTest extends Assert {
         endpoint.getEndpointInfo();
         EasyMock.expectLastCall().andReturn(endpointInfo).anyTimes();
         List<ExtensibilityElement> endpointExts =
-            new ArrayList<ExtensibilityElement>();
+            new ArrayList<>();
         endpointInfo.getExtensors(EasyMock.eq(ExtensibilityElement.class));
         EasyMock.expectLastCall().andReturn(endpointExts).anyTimes();
         BindingInfo bindingInfo = control.createMock(BindingInfo.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 4d575bb..56e3de5 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -328,7 +328,7 @@ public class MAPCodecTest extends Assert {
         mimeHeaders = new HashMap<String, List<String>>();
         message.put(MIME_HEADERS, mimeHeaders);
         if (preExistingSOAPAction) {
-            List<String> soapAction = new ArrayList<String>();
+            List<String> soapAction = new ArrayList<>();
             soapAction.add("\"foobar\"");
             mimeHeaders.put(SoapBindingConstants.SOAP_ACTION, soapAction);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
index c9d23df..37ce86f 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
@@ -51,7 +51,7 @@ public class AssertionBuilderRegistryImpl extends AssertionBuilderFactoryImpl im
     private static final Logger LOG 
         = LogUtils.getL7dLogger(AssertionBuilderRegistryImpl.class);
     private boolean ignoreUnknownAssertions = true; 
-    private Set<QName> ignored = new HashSet<QName>();
+    private Set<QName> ignored = new HashSet<>();
     private Bus bus;
     private boolean dynamicLoaded;
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
index fd3e848..c046825 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
@@ -60,7 +60,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
         if (a instanceof PolicyContainingAssertion) {
             Policy p = ((PolicyContainingAssertion)a).getPolicy();
             if (p != null) {
-                List<Assertion> pcs = new ArrayList<Assertion>();
+                List<Assertion> pcs = new ArrayList<>();
                 getAssertions(p, pcs);
                 for (Assertion na : pcs) {
                     putAssertionInfo(na);
@@ -70,7 +70,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
         AssertionInfo ai = new AssertionInfo(a);
         Collection<AssertionInfo> ail = get(a.getName());
         if (ail == null) {
-            ail = new ArrayList<AssertionInfo>();
+            ail = new ArrayList<>();
             put(a.getName(), ail);
         }
         for (AssertionInfo ai2 : ail) {
@@ -140,7 +140,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
     
     public List<List<Assertion>> checkEffectivePolicy(Policy policy) {
         List<List<Assertion>> validated = new ArrayList<List<Assertion>>(4);       
-        List<QName> errors = new ArrayList<QName>();
+        List<QName> errors = new ArrayList<>();
         Iterator<List<Assertion>> alternatives = policy.getAlternatives();
         while (alternatives.hasNext()) {
             List<Assertion> pc = alternatives.next();
@@ -191,7 +191,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
         }
     }
     private static Collection<Assertion> getAssertions(PolicyOperator p) {
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
         getAssertions(p, assertions);
         return assertions;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
index ee92e62..5f8c4b8 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
@@ -77,7 +77,7 @@ public class ClientPolicyInFaultInterceptor extends AbstractPolicyInterceptor {
 
         List<Interceptor<? extends Message>> faultInterceptors = 
             new ArrayList<Interceptor<? extends Message>>();
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
         
         // 1. Check overridden policy
         Policy p = (Policy)msg.getContextualProperty(PolicyConstants.POLICY_OVERRIDE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
index d46e3b6..966a4dd 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
@@ -227,7 +227,7 @@ public class EffectivePolicyImpl implements EffectivePolicy {
     protected Collection<Assertion> getSupportedAlternatives(PolicyEngine engine,
                                                              Policy p, 
                                                              Message m) {
-        Collection<Assertion> alternatives = new ArrayList<Assertion>();
+        Collection<Assertion> alternatives = new ArrayList<>();
 
         for (Iterator<List<Assertion>> it = p.getAlternatives(); it.hasNext();) {
             List<Assertion> alternative = it.next();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
index a2c56a4..055529d 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
@@ -176,7 +176,7 @@ public class EndpointPolicyImpl implements EndpointPolicy {
     }
     
     protected Collection<Assertion> getSupportedAlternatives(Message msg) {
-        Collection<Assertion> alternatives = new ArrayList<Assertion>();
+        Collection<Assertion> alternatives = new ArrayList<>();
 
         for (Iterator<List<Assertion>> it = policy.getAlternatives(); it.hasNext();) {
             List<Assertion> alternative = it.next();
@@ -200,10 +200,10 @@ public class EndpointPolicyImpl implements EndpointPolicy {
             return;
         }
 
-        List<Assertion> v = new ArrayList<Assertion>();
+        List<Assertion> v = new ArrayList<>();
         List<Assertion> fv = null;
         if (requestor) {
-            fv = new ArrayList<Assertion>();
+            fv = new ArrayList<>();
         }
        
         // vocabulary of alternative chosen for endpoint
@@ -256,7 +256,7 @@ public class EndpointPolicyImpl implements EndpointPolicy {
     }
 
     Collection<Assertion> getSupportedAlternatives(Policy p, Message msg) {
-        Collection<Assertion> alternatives = new ArrayList<Assertion>();
+        Collection<Assertion> alternatives = new ArrayList<>();
         for (Iterator<List<Assertion>> it = p.getAlternatives(); it.hasNext();) {
             List<Assertion> alternative = it.next();
             if (engine.supportsAlternative(alternative, null, msg)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
index c9e2e32..698718d 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
@@ -125,7 +125,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
         Policy p = m.getAnnotation(Policy.class);
         Policies ps = m.getAnnotation(Policies.class);
         if (p != null || ps != null) {
-            List<Policy> list = new ArrayList<Policy>();
+            List<Policy> list = new ArrayList<>();
             if (p != null) {
                 list.add(p);
             }
@@ -245,7 +245,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
         Policy p = cls.getAnnotation(Policy.class);
         Policies ps = cls.getAnnotation(Policies.class);
         if (p != null || ps != null) {
-            list = new ArrayList<Policy>();
+            list = new ArrayList<>();
             if (p != null) {
                 list.add(p);
             }
@@ -307,7 +307,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
         Policy p = cls.getAnnotation(Policy.class);
         Policies ps = cls.getAnnotation(Policies.class);
         if (p != null || ps != null) {
-            List<Policy> list = new ArrayList<Policy>();
+            List<Policy> list = new ArrayList<>();
             if (p != null) {
                 list.add(p);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyDataEngineImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyDataEngineImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyDataEngineImpl.java
index 3e1aaa6..1d5fc0d 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyDataEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyDataEngineImpl.java
@@ -60,7 +60,7 @@ public class PolicyDataEngineImpl implements PolicyDataEngine {
                                          PolicyCalculator<T> policyCalculator) {
         Collection<Assertion> alternative = getPolicyEngine().getClientEndpointPolicy(ei, c, m)
             .getChosenAlternative();
-        List<T> filteredPolicies = new ArrayList<T>();
+        List<T> filteredPolicies = new ArrayList<>();
         for (Assertion a : alternative) {
             if (policyCalculator.getDataClassName().equals(a.getName())) {
                 T p = JaxbAssertion.cast(a, policyCalculator.getDataClass()).getData();
@@ -83,7 +83,7 @@ public class PolicyDataEngineImpl implements PolicyDataEngine {
                                          PolicyCalculator<T> policyCalculator) {
         Collection<Assertion> alternative = getPolicyEngine()
             .getServerEndpointPolicy(ei, d, m).getChosenAlternative();
-        List<T> filteredPolicies = new ArrayList<T>();
+        List<T> filteredPolicies = new ArrayList<>();
         for (Assertion a : alternative) {
             if (policyCalculator.getDataClassName().equals(a.getName())) {
                 T p = JaxbAssertion.cast(a, policyCalculator.getDataClass()).getData();
@@ -94,7 +94,7 @@ public class PolicyDataEngineImpl implements PolicyDataEngine {
     }
 
     private <T> List<T> getPoliciesFromMessage(QName name, Message message, Class<T> dataClass) {
-        List<T> policies = new ArrayList<T>();
+        List<T> policies = new ArrayList<>();
         AssertionInfoMap amap = message.get(AssertionInfoMap.class);
         if (null == amap || amap.isEmpty()) {
             return policies;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 6155a38..11a9972 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -520,7 +520,7 @@ public class PolicyEngineImpl implements PolicyEngine, BusExtension {
      */
     Collection<Assertion> getAssertions(PolicyComponent pc, boolean includeOptional) {
     
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
     
         if (Constants.TYPE_ASSERTION == pc.getType()) {
             Assertion a = (Assertion)pc;
@@ -536,7 +536,7 @@ public class PolicyEngineImpl implements PolicyEngine, BusExtension {
         if (pc == null || pc.getChosenAlternative() == null) {
             return null;
         }
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
         for (Assertion assertion : pc.getChosenAlternative()) {
             if (Constants.TYPE_ASSERTION == assertion.getType()) {
                 if (includeOptional || !assertion.isOptional()) {
@@ -582,7 +582,7 @@ public class PolicyEngineImpl implements PolicyEngine, BusExtension {
      */
     Set<QName> getVocabulary(PolicyComponent pc, boolean includeOptional) {
         Collection<Assertion> assertions = getAssertions(pc, includeOptional);
-        Set<QName> vocabulary = new HashSet<QName>();
+        Set<QName> vocabulary = new HashSet<>();
         for (Assertion a : assertions) {
             vocabulary.add(a.getName());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
index fba11fd..b313a38 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
@@ -68,7 +68,7 @@ public class PolicyInInterceptor extends AbstractPolicyInterceptor {
         }
 
         List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>();
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
         
         // 1. Check overridden policy
         Policy p = (Policy)msg.getContextualProperty(PolicyConstants.POLICY_OVERRIDE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
index a14911e..7b832ee 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
@@ -76,7 +76,7 @@ public class PolicyOutInterceptor extends AbstractPolicyInterceptor {
             return;
         }
 
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
 
         // 1. Check overridden policy
         Policy p = (Policy)msg.getContextualProperty(PolicyConstants.POLICY_OVERRIDE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
index 0482f02..313fa5d 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
@@ -86,7 +86,7 @@ public class ServerPolicyOutFaultInterceptor extends AbstractPolicyInterceptor {
         
         List<Interceptor<? extends Message>> faultInterceptors = 
             new ArrayList<Interceptor<? extends Message>>();
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
 
         // 1. Check overridden policy
         Policy p = (Policy)msg.getContextualProperty(PolicyConstants.POLICY_OVERRIDE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
index 5902dbb..1c2e279 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
@@ -77,7 +77,7 @@ public class WSPolicyFeature extends AbstractFeature {
 
     public WSPolicyFeature(Policy... ps) {
         super();
-        policies = new ArrayList<Policy>();
+        policies = new ArrayList<>();
         Collections.addAll(policies, ps);
     }
 
@@ -154,7 +154,7 @@ public class WSPolicyFeature extends AbstractFeature {
         DescriptionInfo i = endpoint.getEndpointInfo().getDescription();
         Collection<Policy> loadedPolicies = null;
         if (policyElements != null || policyReferenceElements != null) {
-            loadedPolicies = new ArrayList<Policy>();
+            loadedPolicies = new ArrayList<>();
             PolicyBuilder builder = bus.getExtension(PolicyBuilder.class); 
             if (null != policyElements) {
                 for (Element e : policyElements) {
@@ -191,7 +191,7 @@ public class WSPolicyFeature extends AbstractFeature {
     
     public Collection<Policy> getPolicies() {
         if (policies == null) {
-            policies = new ArrayList<Policy>();
+            policies = new ArrayList<>();
         }
         return policies;
     }
@@ -202,7 +202,7 @@ public class WSPolicyFeature extends AbstractFeature {
 
     public Collection<Element> getPolicyElements() {
         if (policyElements == null) {
-            policyElements = new ArrayList<Element>();
+            policyElements = new ArrayList<>();
         }
         return policyElements;
     }
@@ -213,7 +213,7 @@ public class WSPolicyFeature extends AbstractFeature {
     
     public Collection<Element> getPolicyReferenceElements() {
         if (policyReferenceElements == null) {
-            policyReferenceElements = new ArrayList<Element>();
+            policyReferenceElements = new ArrayList<>();
         }
         return policyReferenceElements;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
index 5167ce0..3d622b2 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
@@ -158,7 +158,7 @@ public class ExternalAttachmentProvider extends AbstractPolicyProvider {
         }
         
         // read the document and build the attachments
-        attachments = new ArrayList<PolicyAttachment>();
+        attachments = new ArrayList<>();
         Document doc = null;
         try {
             InputStream is = location.getInputStream();
@@ -250,7 +250,7 @@ public class ExternalAttachmentProvider extends AbstractPolicyProvider {
     }  
     
     Collection<DomainExpression> readDomainExpressions(Element appliesToElem) {
-        Collection<DomainExpression> des = new ArrayList<DomainExpression>();
+        Collection<DomainExpression> des = new ArrayList<>();
         for (Node nd = appliesToElem.getFirstChild(); nd != null; nd = nd.getNextSibling()) {
             if (Node.ELEMENT_NODE == nd.getNodeType()) {
                 DomainExpressionBuilderRegistry debr 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
index 2bff1ac..7f036ed 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
@@ -337,7 +337,7 @@ public class Wsdl11AttachmentPolicyProvider extends AbstractPolicyProvider {
                 return null;
             }
             
-            List<T> list = new ArrayList<T>(extensors.size());
+            List<T> list = new ArrayList<>(extensors.size());
             for (ExtensibilityElement e : extensors) {
                 if (cls.isInstance(e)) {
                     list.add(cls.cast(e));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptorProvider.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptorProvider.java
index 98d2a3f..fe7441f 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptorProvider.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptorProvider.java
@@ -35,7 +35,7 @@ public class MTOMPolicyInterceptorProvider extends AbstractPolicyInterceptorProv
     private static final MTOMPolicyInterceptor INTERCEPTOR = new MTOMPolicyInterceptor();
     
     static {
-        Collection<QName> types = new ArrayList<QName>();
+        Collection<QName> types = new ArrayList<>();
         types.add(MetadataConstants.MTOM_ASSERTION_QNAME);
         ASSERTION_TYPES = types;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
index ed88265..7e00214 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
@@ -49,7 +49,7 @@ public abstract class BaseAlternativeSelector implements AlternativeSelector {
     }
 
     protected boolean isCompatible(List<Assertion> alternative, List<Assertion> r) {
-        List<QName> rNames = new ArrayList<QName>(r.size());
+        List<QName> rNames = new ArrayList<>(r.size());
         for (Assertion ra : r) {
             rNames.add(ra.getName());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java
index 3560aca..4526b0e 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java
@@ -35,8 +35,8 @@ public class PolicyFeatureBeanDefinitionParser extends AbstractBeanDefinitionPar
 
     @Override
     protected void parseChildElements(Element e, ParserContext ctx, BeanDefinitionBuilder bean) {
-        List<Element> ps = new ArrayList<Element>();
-        List<Element> prs = new ArrayList<Element>();     
+        List<Element> ps = new ArrayList<>();
+        List<Element> prs = new ArrayList<>();     
         
         Element elem = DOMUtils.getFirstElement(e);
         while (elem != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
index deebdf7..0cef357 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
@@ -68,7 +68,7 @@ public class AssertionInfoMapTest extends Assert {
                                                                    PolicyAssertion.class));
         AssertionInfo ai1 = new AssertionInfo(a1);
         AssertionInfo ai2 = new AssertionInfo(a2);
-        Collection<AssertionInfo> ais = new ArrayList<AssertionInfo>();
+        Collection<AssertionInfo> ais = new ArrayList<>();
         AssertionInfo bi = new AssertionInfo(b);
         AssertionInfo ci = new AssertionInfo(c);
         ais.add(ai1);
@@ -89,17 +89,17 @@ public class AssertionInfoMapTest extends Assert {
         EasyMock.expect(c.isAsserted(aim)).andReturn(true).anyTimes();
         
         
-        List<Assertion> alt1 = new ArrayList<Assertion>();
+        List<Assertion> alt1 = new ArrayList<>();
         alt1.add(a1);
         alt1.add(b);
         
-        List<Assertion> alt2 = new ArrayList<Assertion>();
+        List<Assertion> alt2 = new ArrayList<>();
         alt2.add(a2);
         alt2.add(c);
                 
         control.replay();
-        assertTrue(!aim.supportsAlternative(alt1, new ArrayList<QName>()));
-        assertTrue(aim.supportsAlternative(alt2, new ArrayList<QName>()));
+        assertTrue(!aim.supportsAlternative(alt1, new ArrayList<>()));
+        assertTrue(aim.supportsAlternative(alt2, new ArrayList<>()));
         control.verify();     
     }  
     
@@ -147,7 +147,7 @@ public class AssertionInfoMapTest extends Assert {
     public void testCheck() throws PolicyException {
         QName aqn = new QName("http://x.y.z", "a");
         Assertion a = new PrimitiveAssertion(aqn);
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
         assertions.add(a);
         AssertionInfoMap aim = new AssertionInfoMap(assertions);
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index ddacb3a..59c97fb 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -99,7 +99,7 @@ public class EffectivePolicyImplTest extends Assert {
         EndpointPolicyImpl endpointPolicy = control.createMock(EndpointPolicyImpl.class);
         Policy p = control.createMock(Policy.class);
         EasyMock.expect(endpointPolicy.getPolicy()).andReturn(p);
-        Collection<Assertion> chosenAlternative = new ArrayList<Assertion>();
+        Collection<Assertion> chosenAlternative = new ArrayList<>();
         EasyMock.expect(endpointPolicy.getChosenAlternative()).andReturn(chosenAlternative);
         PolicyEngineImpl pe = new PolicyEngineImpl();
         effectivePolicy.initialiseInterceptors(pe, false, msg);
@@ -268,7 +268,7 @@ public class EffectivePolicyImplTest extends Assert {
         
         control.reset();        
         EasyMock.expect(engine.getAlternativeSelector()).andReturn(selector);
-        Collection<Assertion> alternative = new ArrayList<Assertion>();
+        Collection<Assertion> alternative = new ArrayList<>();
         EasyMock.expect(selector.selectAlternative(policy, engine, assertor, null, m)).andReturn(alternative);
         control.replay();        
         epi.chooseAlternative(engine, assertor, m);
@@ -300,7 +300,7 @@ public class EffectivePolicyImplTest extends Assert {
     @SuppressWarnings("unchecked")
     private void testInitialiseInterceptors(boolean useIn, boolean fault) {
         EffectivePolicyImpl epi = new EffectivePolicyImpl();        
-        List<Assertion> alternative = new ArrayList<Assertion>();
+        List<Assertion> alternative = new ArrayList<>();
         epi.setChosenAlternative(alternative);
         
         PolicyEngineImpl engine = control.createMock(PolicyEngineImpl.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index cc863d1..8a321a6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -182,7 +182,7 @@ public class EndpointPolicyImplTest extends Assert {
         control.reset();
         EasyMock.expect(engine.isEnabled()).andReturn(true).anyTimes();
         EasyMock.expect(engine.getAlternativeSelector()).andReturn(selector);
-        Collection<Assertion> alternative = new ArrayList<Assertion>();
+        Collection<Assertion> alternative = new ArrayList<>();
         EasyMock.expect(selector.selectAlternative(policy, engine, assertor, null, m)).andReturn(alternative);
         control.replay();
         epi.chooseAlternative(m);
@@ -327,8 +327,8 @@ public class EndpointPolicyImplTest extends Assert {
         PolicyEngineImpl engine = control.createMock(PolicyEngineImpl.class);
 
         EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, engine, requestor, null);
-        Collection<Assertion> v = new ArrayList<Assertion>();
-        Collection<Assertion> fv = new ArrayList<Assertion>();
+        Collection<Assertion> v = new ArrayList<>();
+        Collection<Assertion> fv = new ArrayList<>();
         QName aqn = new QName("http://x.y.z", "a");
         v.add(mockAssertion(aqn, requestor ? 2 : 1, false));
         v.add(mockAssertion(aqn, requestor ? 2 : 1, false));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index e7ada1d..3d0e3c5 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -83,7 +83,7 @@ public class PolicyDataEngineImplTest extends Assert {
         AssertionInfo ai = getTestPolicyAssertionInfo(policy);
         AssertionInfoMap aim = new AssertionInfoMap(CastUtils.cast(Collections.EMPTY_LIST,
                                                                    PolicyAssertion.class));
-        Collection<AssertionInfo> ais = new ArrayList<AssertionInfo>();
+        Collection<AssertionInfo> ais = new ArrayList<>();
         ais.add(ai);
         aim.put(TEST_POLICY_NAME, ais);
         checkAssertWithMap(aim);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index 0d123c7..2afbd6f 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -632,7 +632,7 @@ public class PolicyEngineTest extends Assert {
     @Test
     public void testAddAssertions() {
         engine = new PolicyEngineImpl();
-        Collection<Assertion> assertions = new ArrayList<Assertion>();
+        Collection<Assertion> assertions = new ArrayList<>();
         
         Assertion a = control.createMock(Assertion.class);
         EasyMock.expect(a.getType()).andReturn(Constants.TYPE_ASSERTION);
@@ -669,7 +669,7 @@ public class PolicyEngineTest extends Assert {
     }
         
     private Set<String> getInterceptorIds(List<Interceptor<? extends Message>> interceptors) {
-        Set<String> ids = new HashSet<String>();
+        Set<String> ids = new HashSet<>();
         for (Interceptor<? extends Message> i : interceptors) {
             ids.add(((PhaseInterceptor<? extends Message>)i).getId());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index 75f23da..137953e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -78,7 +78,7 @@ public class PolicyInterceptorProviderRegistryImplTest extends Assert {
         EasyMock.expect(pp.getInFaultInterceptors()).andReturn(pifl);
         EasyMock.expect(pp.getOutInterceptors()).andReturn(pol);
         EasyMock.expect(pp.getOutFaultInterceptors()).andReturn(pofl);
-        Collection<QName> assertionTypes = new ArrayList<QName>();
+        Collection<QName> assertionTypes = new ArrayList<>();
         assertionTypes.add(ASSERTION);
         EasyMock.expect(pp.getAssertionTypes()).andReturn(assertionTypes);
         control.replay();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index 9db0743..7c6a6c0 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -456,7 +456,7 @@ public class PolicyInterceptorsTest extends Assert {
         Assertion assertion = control.createMock(Assertion.class);
         EasyMock.expect(assertion.getName()).andReturn(ASSERTION_QNAME);
         Collection<Assertion> assertions = 
-            new ArrayList<Assertion>();
+            new ArrayList<>();
         assertions.add(assertion);
         
         Policy policyOverride = control.createMock(Policy.class);


Mime
View raw message