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:57 UTC

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
index 61f3530..f379490 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
@@ -48,7 +48,7 @@ import org.apache.cxf.message.Message;
 public class SOAPMessageContextImpl extends WrappedMessageContext implements SOAPMessageContext {
     private static final SAAJInInterceptor SAAJ_IN = new SAAJInInterceptor();
     
-    private Set<String> roles = new HashSet<String>();
+    private Set<String> roles = new HashSet<>();
     
     public SOAPMessageContextImpl(Message m) {
         super(m, Scope.HANDLER);
@@ -91,7 +91,7 @@ public class SOAPMessageContextImpl extends WrappedMessageContext implements SOA
             if (header == null || !header.hasChildNodes()) {
                 return new Object[0];
             }
-            List<Object> ret = new ArrayList<Object>();
+            List<Object> ret = new ArrayList<>();
             Iterator<SOAPHeaderElement> it = CastUtils.cast(header.examineAllHeaderElements());
             while (it.hasNext()) {
                 SOAPHeaderElement she = it.next();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
index c1734fe..564f7ac 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
@@ -85,7 +85,7 @@ public class ParamValueType {
      */
     public List<DescriptionType> getDescription() {
         if (description == null) {
-            description = new ArrayList<DescriptionType>();
+            description = new ArrayList<>();
         }
         return this.description;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
index b95ae73..a06858e 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
@@ -101,7 +101,7 @@ public class PortComponentHandlerType {
      */
     public List<DescriptionType> getDescription() {
         if (description == null) {
-            description = new ArrayList<DescriptionType>();
+            description = new ArrayList<>();
         }
         return this.description;
     }
@@ -123,7 +123,7 @@ public class PortComponentHandlerType {
      */
     public List<DisplayNameType> getDisplayName() {
         if (displayName == null) {
-            displayName = new ArrayList<DisplayNameType>();
+            displayName = new ArrayList<>();
         }
         return this.displayName;
     }
@@ -145,7 +145,7 @@ public class PortComponentHandlerType {
      */
     public List<IconType> getIcon() {
         if (icon == null) {
-            icon = new ArrayList<IconType>();
+            icon = new ArrayList<>();
         }
         return this.icon;
     }
@@ -207,7 +207,7 @@ public class PortComponentHandlerType {
      */
     public List<ParamValueType> getInitParam() {
         if (initParam == null) {
-            initParam = new ArrayList<ParamValueType>();
+            initParam = new ArrayList<>();
         }
         return this.initParam;
     }
@@ -229,7 +229,7 @@ public class PortComponentHandlerType {
      */
     public List<XsdQNameType> getSoapHeader() {
         if (soapHeader == null) {
-            soapHeader = new ArrayList<XsdQNameType>();
+            soapHeader = new ArrayList<>();
         }
         return this.soapHeader;
     }
@@ -251,7 +251,7 @@ public class PortComponentHandlerType {
      */
     public List<CString> getSoapRole() {
         if (soapRole == null) {
-            soapRole = new ArrayList<CString>();
+            soapRole = new ArrayList<>();
         }
         return this.soapRole;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
index 43a2fa4..ea94824 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
@@ -91,7 +91,7 @@ public class HolderOutInterceptor extends AbstractPhaseInterceptor<Message> {
                 }
             }
         } else {
-            List<Object> holders = new ArrayList<Object>(outObjects);
+            List<Object> holders = new ArrayList<>(outObjects);
             for (int x = 0; x < outObjects.size(); x++) {
                 Object o = outObjects.get(x);
                 if (o instanceof Holder) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
index 85f949f..2d06a4d 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
@@ -70,7 +70,7 @@ public class SwAInInterceptor extends AbstractSoapInterceptor {
             return;
         }
         
-        Set<Integer> foundAtts = new HashSet<Integer>();
+        Set<Integer> foundAtts = new HashSet<>();
         MessageContentsList inObjects = MessageContentsList.getContentsList(message);
 
         for (MessagePartInfo mpi : sbi.getAttachments()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
index 8b13a6b..7f68c12 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
@@ -314,7 +314,7 @@ public class SwAOutInterceptor extends AbstractSoapInterceptor {
         
         Collection<Attachment> atts = message.getAttachments();
         if (atts == null) {
-            atts = new ArrayList<Attachment>();
+            atts = new ArrayList<>();
             message.setAttachments(atts);
         }
         return atts;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index 7291478..637bf4e 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -140,7 +140,7 @@ public class WrapperClassInInterceptor extends AbstractPhaseInterceptor<Message>
                         } else if (mpi == null || mpi.getTypeClass() == null) {
                             //header, but not mapped to a param on the method
                             if (removes == null) {
-                                removes = new ArrayList<Integer>();
+                                removes = new ArrayList<>();
                             }
                             removes.add(part.getIndex());
                         }
@@ -171,8 +171,8 @@ public class WrapperClassInInterceptor extends AbstractPhaseInterceptor<Message>
                                               MessageInfo messageInfo,
                                               MessageInfo wrappedMessageInfo,
                                               Class<?> wrapperClass) {
-        List<String> partNames = new ArrayList<String>();
-        List<String> elTypeNames = new ArrayList<String>();
+        List<String> partNames = new ArrayList<>();
+        List<String> elTypeNames = new ArrayList<>();
         List<Class<?>> partClasses = new ArrayList<Class<?>>();
         QName wrapperName = null;
         for (MessagePartInfo p : wrappedMessageInfo.getMessageParts()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
index f4037ad..f32e01a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
@@ -149,8 +149,8 @@ public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message
                                               MessageInfo messageInfo,
                                               MessageInfo wrappedMessageInfo,
                                               Class<?> wrapperClass) {
-        List<String> partNames = new ArrayList<String>();
-        List<String> elTypeNames = new ArrayList<String>();
+        List<String> partNames = new ArrayList<>();
+        List<String> elTypeNames = new ArrayList<>();
         List<Class<?>> partClasses = new ArrayList<Class<?>>();
         QName wrapperName = null;
         for (MessagePartInfo p : wrappedMessageInfo.getMessageParts()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
index 08f1819..0ade4e9 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
@@ -129,7 +129,7 @@ public class JaxWsEndpointImpl extends EndpointImpl {
     
     public JaxWsEndpointImpl(Bus bus, Service s, EndpointInfo ei, 
                              List<WebServiceFeature> wf) throws EndpointException {
-        this(bus, s, ei, null, wf, new ArrayList<Feature>(), true);
+        this(bus, s, ei, null, wf, new ArrayList<>(), true);
     }    
 
     public JaxWsEndpointImpl(Bus bus, Service s, EndpointInfo ei, JaxWsImplementorInfo implementorInfo, 
@@ -137,11 +137,11 @@ public class JaxWsEndpointImpl extends EndpointImpl {
         throws EndpointException {
         super(bus, s, ei);
         this.implInfo = implementorInfo;
-        this.wsFeatures = new ArrayList<WebServiceFeature>();
+        this.wsFeatures = new ArrayList<>();
         if (af != null) {
             features = CastUtils.cast(af);
         } else {
-            features = new ArrayList<Feature>();
+            features = new ArrayList<>();
         }
         if (wf != null) {
             for (WebServiceFeature f : wf) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
index 2616773..15d1192 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
@@ -52,7 +52,7 @@ public class JaxWsImplementorInfo {
     private Class<?> implementorClass;
     private Class<?> seiClass;
     private ParameterizedType seiType;
-    private List<WebService> wsAnnotations = new ArrayList<WebService>(2);
+    private List<WebService> wsAnnotations = new ArrayList<>(2);
     private WebServiceProvider wsProviderAnnotation;
 
     public JaxWsImplementorInfo(Class<?> ic) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
index 80043f5..c4a41c4 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
@@ -87,8 +87,8 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
     public JaxWsServiceConfiguration() {
         responseMethodClassCache = new HashMap<Object, Class<?>>();
         requestMethodClassCache = new HashMap<Object, Class<?>>();
-        responseMethodClassNotFoundCache = new ArrayList<Method>();
-        requestMethodClassNotFoundCache = new ArrayList<Method>();
+        responseMethodClassNotFoundCache = new ArrayList<>();
+        requestMethodClassNotFoundCache = new ArrayList<>();
         methodAnnotationCache = new HashMap<Method, Annotation[][]>();
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
index f39857b..29d1a51 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
@@ -142,7 +142,7 @@ public class JaxWsServiceFactoryBean extends ReflectionServiceFactoryBean {
     }
 
     private void loadWSFeatureAnnotation(Class<?> serviceClass, Class<?> implementorClass) {
-        List<WebServiceFeature> features = new ArrayList<WebServiceFeature>();
+        List<WebServiceFeature> features = new ArrayList<>();
         MTOM mtom = implInfo.getImplementorClass().getAnnotation(MTOM.class);
         if (mtom == null && serviceClass != null) {
             mtom = serviceClass.getAnnotation(MTOM.class);
@@ -302,7 +302,7 @@ public class JaxWsServiceFactoryBean extends ReflectionServiceFactoryBean {
             //the invoke method, however, this CAN cause other problems
             //such as addresses in the wsdl not getting updated and such
             //so we'll WARN about it.....
-            List<QName> enames = new ArrayList<QName>();
+            List<QName> enames = new ArrayList<>();
             for (ServiceInfo si : getService().getServiceInfos()) {
                 for (EndpointInfo ep : si.getEndpoints()) {
                     enames.add(ep.getName());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
index e66486b..709cd52 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
@@ -67,7 +67,7 @@ public abstract class AbstractJaxWsTest extends AbstractCXFTest {
         dfm.registerDestinationFactory("http://cxf.apache.org/transports/local", soapDF);
         
         localTransport = new LocalTransportFactory();
-        localTransport.setUriPrefixes(new HashSet<String>(Arrays.asList("http", "local")));
+        localTransport.setUriPrefixes(new HashSet<>(Arrays.asList("http", "local")));
         dfm.registerDestinationFactory(LocalTransportFactory.TRANSPORT_ID, localTransport);
         dfm.registerDestinationFactory("http://cxf.apache.org/transports/http", localTransport);
         dfm.registerDestinationFactory("http://cxf.apache.org/transports/http/configuration", localTransport);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
index 97bfbc0..de5349b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
@@ -225,7 +225,7 @@ public class CodeFirstTest extends AbstractJaxWsTest {
             assertEquals(strings.length, 2);
             assertEquals(strings[0], "HelloHello");
             assertEquals(strings[1], "BonjourBonjour");
-            List<String> listInput = new ArrayList<String>();
+            List<String> listInput = new ArrayList<>();
             listInput.add("Hello");
             listInput.add("Bonjour");
             List<String> list = proxy.getStringList(listInput);
@@ -346,7 +346,7 @@ public class CodeFirstTest extends AbstractJaxWsTest {
             assertEquals(listOut.get(0), "string1");
             assertEquals(listOut.get(1), "string2");
             assertEquals(listOut.get(2), "string3");
-            List<String> listIn = new ArrayList<String>();
+            List<String> listIn = new ArrayList<>();
             listIn.add("list1");
             listIn.add("list2");
             listIn.add("list3");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java
index c2de0fc..dd04972 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java
@@ -282,13 +282,13 @@ public class EndpointReferenceTest extends AbstractJaxWsTest {
         Element referenceParameter = fetchElementByNameAttribute(doc.getDocumentElement(),
                                                                  "wsa:ReferenceParameters",
                                                                  "");
-        List<Element> referenceParameters = new ArrayList<Element>();
+        List<Element> referenceParameters = new ArrayList<>();
         if (referenceParameter != null) {
             referenceParameters.add(referenceParameter);
         }
 
         Element metadata = fetchElementByNameAttribute(doc.getDocumentElement(), "wsa:metadata", "");
-        List<Element> metadataList = new ArrayList<Element>();
+        List<Element> metadataList = new ArrayList<>();
         if (metadata != null) {
             metadataList.add(metadata);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index 06c5be1..dd0f213 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -279,7 +279,7 @@ public class JAXWSMethodInvokerTest extends Assert {
         Message inMessage = new MessageImpl();
         inMessage.setExchange(ex);
         inMessage.put(JAXWSMethodInvoker.COPY_SOAP_HEADERS_BY_FAULT, Boolean.valueOf(copyHeadersByFault));
-        List<Header> headers = new ArrayList<Header>();
+        List<Header> headers = new ArrayList<>();
         DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
         Document headerDoc = builder.parse(new ByteArrayInputStream("<test:testValue xmlns:test=\"test\"/>"
             .getBytes()));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
index e4d86da..27537cd 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
@@ -53,7 +53,7 @@ public class SEIWithJAXBAnnoTest extends AbstractJaxWsTest {
         LoggingOutInterceptor log = new LoggingOutInterceptor(new PrintWriter(strWriter));
         ClientProxy.getClient(proxy).getOutInterceptors().add(log);
         
-        List<String> args = new ArrayList<String>();
+        List<String> args = new ArrayList<>();
         args.add("str1");
         args.add("str2");
         args.add("str3");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
index eb474fd..0a73e6e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
@@ -59,7 +59,7 @@ public class SOAPBindingTest extends AbstractJaxWsTest {
         assertTrue(binding.getRoles().contains(Soap12.getInstance().getUltimateReceiverRole()));
         
         String myrole = "http://myrole";
-        Set<String> roles = new HashSet<String>();
+        Set<String> roles = new HashSet<>();
         roles.add(myrole);
         
         binding.setRoles(roles);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
index e3a3537..2c604d3 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
@@ -38,7 +38,7 @@ public class SchemaFirstTest extends AbstractJaxWsTest {
         svr.setBus(bus);
         svr.setServiceBean(new EchoFoo());
         svr.setAddress("http://localhost:9000/hello");
-        List<String> schemas = new ArrayList<String>();
+        List<String> schemas = new ArrayList<>();
         schemas.add("/org/apache/cxf/jaxws/service/echoFoo.xsd");
         svr.setSchemaLocations(schemas);
         Server server = svr.create();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
index eebe55a..70e44ff 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
@@ -278,7 +278,7 @@ public class ServiceImplTest extends AbstractJaxWsTest {
 
         @SuppressWarnings("rawtypes")
         public List<Handler> getHandlerChain(PortInfo portInfo) {
-            List<Handler> handlerList = new ArrayList<Handler>();
+            List<Handler> handlerList = new ArrayList<>();
             this.info = portInfo;
             return handlerList;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index 29a53a0..3b68be6 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -73,8 +73,8 @@ public class WrapperClassGeneratorTest extends Assert {
         WrapperHelper wh = new JAXBDataBinding().createWrapperHelper(requestClass, null,
                                                              partNames, elTypeNames, partClasses);        
         
-        List<Object> paraList = new ArrayList<Object>();
-        List<String> valueList = new ArrayList<String>();
+        List<Object> paraList = new ArrayList<>();
+        List<String> valueList = new ArrayList<>();
         valueList.add("str1");
         valueList.add("str2");
         valueList.add("str3");
@@ -91,8 +91,8 @@ public class WrapperClassGeneratorTest extends Assert {
         
         wh = new JAXBDataBinding().createWrapperHelper(responseClass, null,
                                                              partNames, elTypeNames, partClasses);        
-        List<Object> resPara = new ArrayList<Object>();
-        List<Integer> intValueList = new ArrayList<Integer>();
+        List<Object> resPara = new ArrayList<>();
+        List<Integer> intValueList = new ArrayList<>();
         intValueList.add(1);
         intValueList.add(2);
         intValueList.add(3);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index dcd001a..8ad2c75 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -85,7 +85,7 @@ public class WebServiceContextImplTest extends Assert {
         MessageImpl msg = new MessageImpl();
         MessageContext context = new WrappedMessageContext(msg);
         Map<String, List<String>> headers = new HashMap<String, List<String>>();
-        List<String> values = new ArrayList<String>();
+        List<String> values = new ArrayList<>();
         values.add("Value1");
         headers.put("Header1", values);
         context.put(MessageContext.HTTP_REQUEST_HEADERS, headers);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index 834376c..5be8715 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -57,7 +57,7 @@ public class AbstractProtocolHandlerInterceptorTest extends Assert {
         binding = control.createMock(Binding.class);
         
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(null);
         expect(binding.getHandlerChain()).andReturn(list).anyTimes();
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 7ae1b60..2bfa345 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -166,7 +166,7 @@ public class HandlerChainBuilderTest extends Assert {
     }
 
     private List<PortComponentHandlerType> createHandlerChainType() {
-        List<PortComponentHandlerType> handlers = new ArrayList<PortComponentHandlerType>();
+        List<PortComponentHandlerType> handlers = new ArrayList<>();
 
         PortComponentHandlerType h = new PortComponentHandlerType();
         CString name = new CString();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index 99082ef..ff374d2 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -71,7 +71,7 @@ public class HandlerChainInvokerTest extends Assert {
         AbstractHandlerBase.clear();
 
         @SuppressWarnings("rawtypes")
-        List<Handler> handlers = new ArrayList<Handler>();
+        List<Handler> handlers = new ArrayList<>();
         for (int i = 0; i < logicalHandlers.length; i++) {
             logicalHandlers[i] = new TestLogicalHandler();
             handlers.add(logicalHandlers[i]);
@@ -97,7 +97,7 @@ public class HandlerChainInvokerTest extends Assert {
     @SuppressWarnings("rawtypes")
     @Test
     public void testInvokeEmptyHandlerChain() {
-        invoker = new HandlerChainInvoker(new ArrayList<Handler>());
+        invoker = new HandlerChainInvoker(new ArrayList<>());
         assertTrue(invoker.invokeLogicalHandlers(false, lmc));
         assertTrue(invoker.invokeProtocolHandlers(false, pmc));
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index 06ad3f4..457d889 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -111,7 +111,7 @@ public class LogicalHandlerInterceptorTest extends Assert {
     //NOTE: commented out as this has been covered by other tests.
     public void xtestReturnFalseClientSide() throws Exception {
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(new LogicalHandler<LogicalMessageContext>() {
             public void close(MessageContext arg0) {
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index 6b5adf9..94e9f95 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -46,7 +46,7 @@ public class LogicalMessageImplTest extends Assert {
         req = new AddNumbers();        
         req.setArg0(10);
         req.setArg1(20);
-        args = new ArrayList<Object>();
+        args = new ArrayList<>();
         args.add(req);
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index e40f132..abad44a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -96,7 +96,7 @@ public class SOAPHandlerInterceptorTest extends Assert {
     @Test
     public void testChangeSOAPBodyOutBound() throws Exception {
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(new SOAPHandler<SOAPMessageContext>() {
             public boolean handleMessage(SOAPMessageContext smc) {
                 Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -191,7 +191,7 @@ public class SOAPHandlerInterceptorTest extends Assert {
     @Test
     public void testChangeSOAPHeaderInBound() throws Exception {
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(new SOAPHandler<SOAPMessageContext>() {
             public boolean handleMessage(SOAPMessageContext smc) {
                 try {
@@ -289,7 +289,7 @@ public class SOAPHandlerInterceptorTest extends Assert {
     @Test
     public void testChangeSOAPHeaderOutBound() throws Exception {
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(new SOAPHandler<SOAPMessageContext>() {
             public boolean handleMessage(SOAPMessageContext smc) {
                 try {
@@ -391,7 +391,7 @@ public class SOAPHandlerInterceptorTest extends Assert {
     @Test
     public void testGetSOAPMessageInBound() throws Exception {
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(new SOAPHandler<SOAPMessageContext>() {
             public boolean handleMessage(SOAPMessageContext smc) {
                 try {
@@ -450,7 +450,7 @@ public class SOAPHandlerInterceptorTest extends Assert {
     @Test
     public void testGetUnderstoodHeadersReturnsNull() {
         @SuppressWarnings("rawtypes")
-        List<Handler> list = new ArrayList<Handler>();
+        List<Handler> list = new ArrayList<>();
         list.add(new SOAPHandler<SOAPMessageContext>() {
             public boolean handleMessage(SOAPMessageContext smc) {
                 return true;
@@ -475,7 +475,7 @@ public class SOAPHandlerInterceptorTest extends Assert {
         SoapMessage message = control.createMock(SoapMessage.class);
         Exchange exchange = control.createMock(Exchange.class);
         expect(message.getExchange()).andReturn(exchange).anyTimes();
-        expect(message.keySet()).andReturn(new HashSet<String>());
+        expect(message.keySet()).andReturn(new HashSet<>());
         expect(exchange.get(HandlerChainInvoker.class)).andReturn(invoker);
         control.replay();
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersImpl.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersImpl.java
index 8d48b1b..5cd4049 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersImpl.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersImpl.java
@@ -26,7 +26,7 @@ import java.util.List;
 public class AddNumbersImpl implements AddNumbers {
 
     public List<Integer> addNumbers(List<String> arg) {
-        List<Integer> res = new ArrayList<Integer>();
+        List<Integer> res = new ArrayList<>();
         res.add(100);
         res.add(200);
         return res;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
index 78c9e70..ea63420 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
@@ -252,7 +252,7 @@ public class AnnotationInterceptorTest extends AbstractJaxWsTest {
             return strings;
         }
         public List<String> getStringList(List<String> list) {
-            List<String> ret = new ArrayList<String>();
+            List<String> ret = new ArrayList<>();
             ret.add("Hello" + list.get(0));
             ret.add("Bonjour" + list.get(1));
             return ret;
@@ -277,7 +277,7 @@ public class AnnotationInterceptorTest extends AbstractJaxWsTest {
             return strings;
         }
         public List<String> getStringList(List<String> list) {
-            List<String> ret = new ArrayList<String>();
+            List<String> ret = new ArrayList<>();
             ret.add("Hello" + list.get(0));
             ret.add("Bonjour" + list.get(1));
             return ret;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java
index 84df4d2..c76f2a1 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java
@@ -48,7 +48,7 @@ public class Hello {
     
     @WebMethod(action = "myaction")
     public List<String> getGreetings() {
-        List<String> strings = new ArrayList<String>();
+        List<String> strings = new ArrayList<>();
         strings.add("Hello");
         strings.add("Bonjour");
         return strings;
@@ -63,7 +63,7 @@ public class Hello {
     }
     @WebMethod
     public List<String> getStringList(List<String> list) {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("Hello" + list.get(0));
         ret.add("Bonjour" + list.get(1));
         return ret;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java
index c8701d6..6963142 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java
@@ -32,7 +32,7 @@ public class Hello2 implements HelloInterface {
     }
     
     public List<String> getGreetings() {
-        List<String> strings = new ArrayList<String>();
+        List<String> strings = new ArrayList<>();
         strings.add("Hello");
         strings.add("Bonjour");
         return strings;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java
index 370ec1a..7cb8a1d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java
@@ -35,7 +35,7 @@ public class Hello3 implements HelloInterface {
     }
     
     public List<String> getGreetings() {
-        List<String> strings = new ArrayList<String>();
+        List<String> strings = new ArrayList<>();
         strings.add("Hello");
         strings.add("Bonjour");
         return strings;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloExcludeImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloExcludeImpl.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloExcludeImpl.java
index fcd6691..011edee 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloExcludeImpl.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloExcludeImpl.java
@@ -31,7 +31,7 @@ public class HelloExcludeImpl implements HelloExcludeOnInterface {
     }
     
     public List<String> getGreetings() {
-        List<String> strings = new ArrayList<String>();
+        List<String> strings = new ArrayList<>();
         strings.add("Hello");
         strings.add("Bonjour");
         return strings;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/SayHiImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/SayHiImpl.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/SayHiImpl.java
index 09b8a33..ffca16c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/SayHiImpl.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/SayHiImpl.java
@@ -41,7 +41,7 @@ public class SayHiImpl implements SayHi {
         return strings;
     }
     public List<String> getStringList(List<String> list) {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("Hello" + list.get(0));
         ret.add("Bonjour" + list.get(1));
         return ret;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java
index d1ed2a8..9954343 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java
@@ -72,7 +72,7 @@ public class ProviderImplTest extends org.junit.Assert {
     public void testCreateW3CEprNoMetadataEmptyCustomMetadata() throws Exception {
         ProviderImpl impl = new ProviderImpl();
         W3CEndpointReference w3Epr = impl.createW3CEndpointReference(
-            "http://myaddress", null, null, new ArrayList<Element>(), null, null);
+            "http://myaddress", null, null, new ArrayList<>(), null, null);
         
         java.io.StringWriter sw = new java.io.StringWriter();
         StreamResult result = new StreamResult(sw);
@@ -118,7 +118,7 @@ public class ProviderImplTest extends org.junit.Assert {
         ProviderImpl impl = new ProviderImpl();
         DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
         Element element = builder.newDocument().createElement("customMetadata");
-        List<Element> metadata = new ArrayList<Element>();
+        List<Element> metadata = new ArrayList<>();
         metadata.add(element);
         W3CEndpointReference w3Epr = impl.createW3CEndpointReference(
                          "http://myaddress", null, null, 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 2cc2082..b769855 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -421,7 +421,7 @@ public class DynamicClientFactory {
     
     protected SchemaCompiler createSchemaCompiler() {
         SchemaCompiler compiler = 
-            JAXBUtils.createSchemaCompilerWithDefaultAllocator(new HashSet<String>());
+            JAXBUtils.createSchemaCompilerWithDefaultAllocator(new HashSet<>());
         if (schemaCompilerOptions != null && schemaCompilerOptions.length > 0) {
             compiler.getOptions().parseArguments(schemaCompilerOptions);
         }
@@ -926,7 +926,7 @@ public class DynamicClientFactory {
             return element;
         }
         element = (Element)cloneNode(element.getOwnerDocument(), element, true);
-        List<Node> ns = new ArrayList<Node>();
+        List<Node> ns = new ArrayList<>();
 
         impElemList = DOMUtils.findAllElementsByTagNameNS(element,
                                                           "http://www.w3.org/2001/XMLSchema",

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
index 7564407..548331b 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
@@ -65,7 +65,7 @@ public class ClientProxyFactoryBean extends AbstractBasicInterceptorProvider {
     private String password;
     private Map<String, Object> properties;
     private Bus bus;
-    private List<Feature> features = new ArrayList<Feature>();
+    private List<Feature> features = new ArrayList<>();
     private DataBinding dataBinding;
 
     public ClientProxyFactoryBean() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
index 71224a0..dcd9506 100644
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
@@ -80,7 +80,7 @@ public class BasicNameManager implements NameManager {
             }
         }
         
-        Set<String> poorPrefixURIs = new HashSet<String>();
+        Set<String> poorPrefixURIs = new HashSet<>();
         for (SchemaInfo schemaInfo : service.getSchemas()) {
             NamespacePrefixList schemaPrefixList = schemaInfo.getSchema().getNamespaceContext();
             for (String declaredPrefix : schemaPrefixList.getDeclaredPrefixes()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
index 7ff0097..af01a191 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
@@ -94,7 +94,7 @@ public class JavascriptUtils {
         defaultValueForSimpleType.put("unsignedLong", "0");
         defaultValueForSimpleType.put("float", "0.0");
         defaultValueForSimpleType.put("double", "0.0");
-        nonStringSimpleTypes = new HashSet<String>();
+        nonStringSimpleTypes = new HashSet<>();
         nonStringSimpleTypes.add("int");
         nonStringSimpleTypes.add("long");
         nonStringSimpleTypes.add("unsignedInt");
@@ -102,12 +102,12 @@ public class JavascriptUtils {
         nonStringSimpleTypes.add("float");
         nonStringSimpleTypes.add("double");
 
-        intTypes = new HashSet<String>();
+        intTypes = new HashSet<>();
         intTypes.add("int");
         intTypes.add("long");
         intTypes.add("unsignedInt");
         intTypes.add("unsignedLong");
-        floatTypes = new HashSet<String>();
+        floatTypes = new HashSet<>();
         floatTypes.add("float");
         floatTypes.add("double");
 
@@ -663,7 +663,7 @@ public class JavascriptUtils {
     
     public static List<XmlSchemaObject> getContentElements(XmlSchemaComplexType type,
                                                            SchemaCollection collection) {
-        List<XmlSchemaObject> results = new ArrayList<XmlSchemaObject>();
+        List<XmlSchemaObject> results = new ArrayList<>();
         QName baseTypeName = XmlSchemaUtils.getBaseType(type);
         if (baseTypeName != null) {
             XmlSchemaComplexType baseType = (XmlSchemaComplexType)collection.getTypeByQName(baseTypeName);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
index 10db451..b72ec45 100644
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
@@ -38,7 +38,7 @@ public class NamespacePrefixAccumulator {
 
     public NamespacePrefixAccumulator(SchemaCollection schemaCollection) {
         attributes = new StringBuilder();
-        prefixes = new HashSet<String>();
+        prefixes = new HashSet<>();
         fallbackNamespacePrefixMap = new HashMap<String, String>();
         nsCounter = 0;
         this.schemaCollection = schemaCollection;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
index 0ad4f67..56b8fa7 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
@@ -94,7 +94,7 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
 
     // Javascript parameter names for the input parameters,
     // derived from the parts.
-    private List<String> inputParameterNames = new ArrayList<String>();
+    private List<String> inputParameterNames = new ArrayList<>();
     // when not wrapped, we use this to keep track of the bits.
     private List<ParticleInfo> unwrappedElementsAndNames;
 
@@ -144,9 +144,9 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
         code.append("\n// Javascript for " + intf.getName() + "\n\n");
 
         currentInterfaceClassName = nameManager.getJavascriptName(intf.getName());
-        operationsWithNameConflicts = new HashSet<OperationInfo>();
-        inputMessagesWithNameConflicts = new HashSet<MessageInfo>();
-        outputMessagesWithNameConflicts = new HashSet<MessageInfo>();
+        operationsWithNameConflicts = new HashSet<>();
+        inputMessagesWithNameConflicts = new HashSet<>();
+        outputMessagesWithNameConflicts = new HashSet<>();
         localOperationsNameMap = new HashMap<String, OperationInfo>();
         localInputMessagesNameMap = new HashMap<String, MessageInfo>();
         localOutputMessagesNameMap = new HashMap<String, MessageInfo>();
@@ -240,7 +240,7 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
 
         StringBuilder parameterList = new StringBuilder();
 
-        inputParameterNames = new ArrayList<String>();
+        inputParameterNames = new ArrayList<>();
 
         if (isWrapped) {
             collectWrapperElementInfo();
@@ -271,7 +271,7 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
      * visit the input message parts and collect relevant data.
      */
     private void collectUnwrappedInputInfo() {
-        unwrappedElementsAndNames = new ArrayList<ParticleInfo>();
+        unwrappedElementsAndNames = new ArrayList<>();
         if (currentOperation.getInput() != null) {
             getElementsForParts(currentOperation.getInput(), unwrappedElementsAndNames);
         }
@@ -511,7 +511,7 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
         if (parts.size() != 1) {
             unsupportedConstruct("MULTIPLE_OUTPUTS", outputMessage.getName().toString());
         }
-        List<ParticleInfo> elements = new ArrayList<ParticleInfo>();
+        List<ParticleInfo> elements = new ArrayList<>();
         String functionName = outputDeserializerFunctionName(outputMessage);
         code.append("function " + functionName + "(cxfjsutils, partElement) {\n");
         getElementsForParts(outputMessage, elements);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
index cfdee1e..4c3ab48 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
@@ -187,7 +187,7 @@ public class JsSimpleDomNode extends ScriptableObject {
     private void establishChildren() {
         if (!childrenWrapped) {
             if (wrappedNode.hasChildNodes()) {
-                children = new ArrayList<JsSimpleDomNode>();
+                children = new ArrayList<>();
                 Node node = wrappedNode.getFirstChild();
                 int x = 0;
                 while (node != null) {
@@ -203,7 +203,7 @@ public class JsSimpleDomNode extends ScriptableObject {
                     x++;
                 }
             } else {
-                children = new ArrayList<JsSimpleDomNode>();
+                children = new ArrayList<>();
             }
             childrenWrapped = true;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
index 219c819..9f9a225 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
@@ -77,7 +77,7 @@ public class JsXMLHttpRequest extends ScriptableObject {
     private static Charset utf8 = Charset.forName("utf-8");
     private static Set<String> validMethods;
     static {
-        validMethods = new HashSet<String>();
+        validMethods = new HashSet<>();
         validMethods.add("GET");
         validMethods.add("POST");
         validMethods.add("HEAD");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
index 87cb933..380e2fd 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
@@ -52,7 +52,7 @@ public class SimpleDocLitWrappedImpl implements SimpleDocLitWrapped {
     private InheritanceTestDerived lastInheritanceTestDerived;
     
     public String echoWithHeader(String what) {
-        List<Header> headers = new ArrayList<Header>();
+        List<Header> headers = new ArrayList<>();
         Header dummyHeader;
         try {
             dummyHeader = new Header(new QName("uri:org.apache.cxf", "dummy"), "decapitated",

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
index 72aa7d2..07ee016 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
@@ -115,7 +115,7 @@ public class PersistOutInterceptor extends AbstractPhaseInterceptor<Message> {
         exchangeProperty.setValue(value);
 
         if (exchange.getProperties() == null) {
-            exchange.setProperties(new ArrayList<ExchangeDataProperty>());
+            exchange.setProperties(new ArrayList<>());
         }
         exchange.getProperties().add(exchangeProperty);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
index 6b3bacf..5d2ade7 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
@@ -68,7 +68,7 @@ public class InstrumentationManagerImpl extends JMXConnectorPolicyType
     private Bus bus;
     private MBServerConnectorFactory mcf;    
     private MBeanServer mbs;
-    private Set<ObjectName> busMBeans = new HashSet<ObjectName>();
+    private Set<ObjectName> busMBeans = new HashSet<>();
     private boolean connectFailed;
     private String persistentBusId;
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 99e3bf9..176b069 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -116,7 +116,7 @@ public abstract class AbstractClient implements Client {
         "org.apache.cxf.transport.complete_if_service_not_available";
     
     private static final Logger LOG = LogUtils.getL7dLogger(AbstractClient.class);
-    private static final Set<String> KNOWN_METHODS = new HashSet<String>(
+    private static final Set<String> KNOWN_METHODS = new HashSet<>(
         Arrays.asList("GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "TRACE"));
     
     protected ClientConfiguration cfg = new ClientConfiguration();
@@ -823,7 +823,7 @@ public abstract class AbstractClient implements Client {
 
     protected String[] parseQuotedHeaderValue(String originalValue) {
         // this algorithm isn't perfect; see CXF-3518 for further discussion.
-        List<String> results = new ArrayList<String>();
+        List<String> results = new ArrayList<>();
         char[] chars = originalValue.toCharArray();
 
         int lastIndex = chars.length - 1;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 221cbd4..25cf93b 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -391,7 +391,7 @@ public class ClientProxyImpl extends AbstractClient implements
         if (headers == null || headers.size() == 0) {
             return null;
         }
-        List<MediaType> types = new ArrayList<MediaType>();
+        List<MediaType> types = new ArrayList<>();
         for (String s : headers) {
             types.add(JAXRSUtils.toMediaType(s));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/UrlEncodingParamConverter.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/UrlEncodingParamConverter.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/UrlEncodingParamConverter.java
index 5b5bbd5..bb8c75d 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/UrlEncodingParamConverter.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/UrlEncodingParamConverter.java
@@ -35,7 +35,7 @@ public class UrlEncodingParamConverter implements ParamConverter<String> {
     public UrlEncodingParamConverter(String encodeClientParametersListStr) {
         if (encodeClientParametersListStr != null) {
             String[] chars = encodeClientParametersListStr.trim().split(" ");
-            encodeClientParametersList = new HashSet<Character>();
+            encodeClientParametersList = new HashSet<>();
             for (String ch : chars) {
                 // this may need to be tuned though this should cover URI reserved chars
                 encodeClientParametersList.add(Character.valueOf(ch.charAt(0)));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index a8a266d..4aac466 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -172,7 +172,7 @@ public class JAXRSClientFactoryBeanTest extends Assert {
         bean.setAddress("http://bar");
         bean.setResourceClass(BookStoreSubresourcesOnly.class);
         TestFeature testFeature = new TestFeature();
-        List<Feature> features = new ArrayList<Feature>();
+        List<Feature> features = new ArrayList<>();
         features.add(testFeature);
         bean.setFeatures(features);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
----------------------------------------------------------------------
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
index c445209..033c9ab 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
@@ -48,12 +48,12 @@ public class SwaggerFeature extends AbstractSwaggerFeature {
     protected void addSwaggerResource(Server server, Bus bus) {
         ApiListingResourceJSON apiListingResource = new ApiListingResourceJSON();
         if (!runAsFilter) {
-            List<Object> serviceBeans = new ArrayList<Object>();
+            List<Object> serviceBeans = new ArrayList<>();
             serviceBeans.add(apiListingResource);
             ((JAXRSServiceFactoryBean)server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName())).
                 setResourceClassesFromBeans(serviceBeans);
         }
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         if (runAsFilter) {
             providers.add(new SwaggerContainerRequestFilter(apiListingResource));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
index 477fc59..fdeec0a 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
@@ -93,7 +93,7 @@ public final class SwaggerUtils {
         
         
         Map<String, List<UserOperation>> userOpsMap = new LinkedHashMap<String, List<UserOperation>>();
-        Set<String> tags = new HashSet<String>();
+        Set<String> tags = new HashSet<>();
         List<Map<String, Object>> tagsProp = CastUtils.cast((List<?>)map.get("tags"));
         if (tagsProp != null) {
             for (Map<String, Object> tagProp : tagsProp) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
index 6580663..26c837b 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
@@ -76,7 +76,7 @@ public class ServerProviderFactoryTest extends Assert {
         assertEquals(1, pf.getPreMatchContainerRequestFilters().size());
         assertTrue(pf.getPreMatchContainerRequestFilters().get(0).getProvider() instanceof WadlGenerator);
         
-        List<Object> providers = new ArrayList<Object>();
+        List<Object> providers = new ArrayList<>();
         WadlGenerator wg = new WadlGenerator();
         providers.add(wg);
         TestHandler th = new TestHandler();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index f072c85..c9e63fa 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -319,7 +319,7 @@ public class WadlGeneratorTest extends Assert {
             ResourceUtils.createClassResourceInfo(BookStore.class, BookStore.class, true, true);
         ClassResourceInfo cri2 = 
             ResourceUtils.createClassResourceInfo(Orders.class, Orders.class, true, true);
-        List<ClassResourceInfo> cris = new ArrayList<ClassResourceInfo>();
+        List<ClassResourceInfo> cris = new ArrayList<>();
         cris.add(cri1);
         cris.add(cri2);
         Message m = mockMessage("http://localhost:8080/baz", "", WadlGenerator.WADL_QUERY, cris);
@@ -551,7 +551,7 @@ public class WadlGeneratorTest extends Assert {
                          new Param("hid", "header", "xs:int"),
                          new Param("provider.bar", "query", "xs:int"),
                          new Param("bookstate", "query", "xs:string",
-                                 new HashSet<String>(Arrays.asList("NEW", "USED", "OLD"))),
+                                 new HashSet<>(Arrays.asList("NEW", "USED", "OLD"))),
                          new Param("a", "query", "xs:string", true));
         
         verifyXmlJsonRepresentations(requestEls.get(0), book2El, "InputBook");
@@ -773,7 +773,7 @@ public class WadlGeneratorTest extends Assert {
         assertEquals(p.getDefaultValue(), paramEl.getAttribute("default"));
         Set<String> options = p.getOptions();
         if (options != null) {
-            Set<String> actualOptions = new HashSet<String>();
+            Set<String> actualOptions = new HashSet<>();
             List<Element> els = DOMUtils.getChildrenWithNamespace(paramEl, WadlGenerator.WADL_NS);
             assertFalse(els.isEmpty());
             assertEquals(options.size(), els.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
index 9585994..c282280 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
@@ -635,7 +635,7 @@ public class AtomPojoProvider extends AbstractConfigurableProvider
             Method m = cls.getMethod(methodName, new Class[]{List.class});
             Class<Object> realCls 
                 = (Class<Object>)InjectionUtils.getActualType(m.getGenericParameterTypes()[0]);
-            List<Object> objects = new ArrayList<Object>();
+            List<Object> objects = new ArrayList<>();
             for (Entry e : feed.getEntries()) {
                 objects.add(readFromEntry(e, realCls));
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
index 1e99871..becb806 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
@@ -154,7 +154,7 @@ public final class JSONUtils {
         }
         if (primitiveArrayKeys != null) { 
             conf.setPrimitiveArrayKeys(
-                new HashSet<String>(primitiveArrayKeys));
+                new HashSet<>(primitiveArrayKeys));
         }
         
         XMLInputFactory factory = depthProps != null 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index 025748c..060af5c 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -60,7 +60,7 @@ public class AtomPojoProviderTest extends Assert {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         
         Books books = new Books();
-        List<Book> bs = new ArrayList<Book>();
+        List<Book> bs = new ArrayList<>();
         bs.add(new Book("a"));
         bs.add(new Book("b"));
         books.setBooks(bs);
@@ -83,7 +83,7 @@ public class AtomPojoProviderTest extends Assert {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         
         Books books = new Books();
-        List<Book> bs = new ArrayList<Book>();
+        List<Book> bs = new ArrayList<>();
         bs.add(new Book("a"));
         bs.add(new Book("b"));
         books.setBooks(bs);
@@ -183,7 +183,7 @@ public class AtomPojoProviderTest extends Assert {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         MediaType mt = MediaType.valueOf("application/atom+xml;type=feed");
         Books books = new Books();
-        List<Book> bs = new ArrayList<Book>();
+        List<Book> bs = new ArrayList<>();
         bs.add(new Book("a"));
         bs.add(new Book("b"));
         books.setBooks(bs);
@@ -332,7 +332,7 @@ public class AtomPojoProviderTest extends Assert {
 
         public Books readFrom(Feed element) {
             Books books = new Books();
-            List<Book> list = new ArrayList<Book>();
+            List<Book> list = new ArrayList<>();
             CustomEntryReader entryReader = new CustomEntryReader();
             for (Entry e : element.getEntries()) {
                 list.add(entryReader.readFrom(e));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 88a5ab7..288c404 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -769,7 +769,7 @@ public class JSONProviderTest extends Assert {
         p.setNamespaceMap(namespaceMap);
         p.setIgnoreNamespaces(ignoreNamespaces);
         
-        List<TagVO2> tags = new ArrayList<TagVO2>();
+        List<TagVO2> tags = new ArrayList<>();
         tags.add(createTag2("a", "b"));
         tags.add(createTag2("c", "d"));
         ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -799,7 +799,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testWriteUnqualifiedCollection() throws Exception {
         JSONProvider<List<Book>> p = new JSONProvider<List<Book>>();
-        List<Book> books = new ArrayList<Book>();
+        List<Book> books = new ArrayList<>();
         books.add(new Book("CXF", 123L));
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         Method m = CollectionsResource.class.getMethod("getBooks", new Class[0]);
@@ -836,7 +836,7 @@ public class JSONProviderTest extends Assert {
             b2 = ((Book[])o)[1];
         } else if (type == Set.class) {
             Set<Book> set = CastUtils.cast((Set<?>)o);
-            List<Book> books = new ArrayList<Book>(new TreeSet<Book>(set));
+            List<Book> books = new ArrayList<>(new TreeSet<Book>(set));
             b1 = books.get(0);
             b2 = books.get(1);
         } else {
@@ -1399,7 +1399,7 @@ public class JSONProviderTest extends Assert {
         TagVO2 tag = new TagVO2("A", "B");
         TagVO2Holder holder = new TagVO2Holder();
         holder.setTag(tag);
-        List<TagVO2Holder> list = new ArrayList<TagVO2Holder>();
+        List<TagVO2Holder> list = new ArrayList<>();
         list.add(holder);
     
         //ParameterizedType required for Lists of Objects
@@ -1446,7 +1446,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testDropElementsIgnored() throws Exception {
         JSONProvider<ManyTags> provider = new JSONProvider<ManyTags>();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("ManyTags");
         list.add("list");
         list.add("tags");
@@ -1464,7 +1464,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testDropElements() throws Exception {
         JSONProvider<ManyTags> provider = new JSONProvider<ManyTags>();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("ManyTags");
         list.add("tags");
         provider.setOutDropElements(list);
@@ -1499,7 +1499,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testDropQualifiedElements() throws Exception {
         JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("{http://tags}thetag");
         provider.setOutDropElements(list);
         Map<String, String> map = new HashMap<String, String>();
@@ -1753,7 +1753,7 @@ public class JSONProviderTest extends Assert {
     @XmlType(name = "", propOrder = {"title", "comments" })
     public static class Post {
         private String title;
-        private List<Comment> comments = new ArrayList<Comment>();
+        private List<Comment> comments = new ArrayList<>();
         public void setTitle(String title) {
             this.title = title;
         }
@@ -1893,7 +1893,7 @@ public class JSONProviderTest extends Assert {
        
         public void addParameterDefinition(ParameterDefinition parameterDefinition) {
             if (parameterList == null) {
-                parameterList = new ArrayList<ParameterDefinition>();
+                parameterList = new ArrayList<>();
             }
             parameterList.add(parameterDefinition);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
index f62d3b4..7c9189d 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
@@ -28,7 +28,7 @@ import org.apache.cxf.aegis.type.java5.XmlFlattenedArray;
 
 @XmlRootElement(name = "Tags")
 public class Tags {
-    private List<TagVO> list = new ArrayList<TagVO>();
+    private List<TagVO> list = new ArrayList<>();
     
     public Tags() {
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractComplexCondition.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractComplexCondition.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractComplexCondition.java
index 10c5cf6..b728bea 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractComplexCondition.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractComplexCondition.java
@@ -42,7 +42,7 @@ public abstract class AbstractComplexCondition<T> implements SearchCondition<T>
     }
     
     public List<T> findAll(Collection<T> pojos) {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         for (T pojo : pojos) {
             if (isMet(pojo)) {
                 result.add(pojo);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
index b097bf5e..7710bba 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
@@ -71,7 +71,7 @@ public class Beanspector<T> {
             }
         }
         // check type equality for getter-setter pairs
-        Set<String> pairs = new HashSet<String>(getters.keySet());
+        Set<String> pairs = new HashSet<>(getters.keySet());
         pairs.retainAll(setters.keySet());
         for (String accessor : pairs) {
             Class<?> getterClass = getters.get(accessor).getReturnType();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
index 1dd659c..c6edc4d 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
@@ -59,7 +59,7 @@ public class PrimitiveSearchCondition<T> implements SearchCondition<T> {
     }
     
     public List<T> findAll(Collection<T> pojos) {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         for (T pojo : pojos) {
             if (isMet(pojo)) {
                 result.add(pojo);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
index 0380b00..f729954 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
@@ -143,7 +143,7 @@ public class SearchContextImpl implements SearchContext {
     
     private String convertPlainQueriesToFiqlExp(MultivaluedMap<String, String> params) {
         SearchConditionBuilder builder = SearchConditionBuilder.instance();
-        List<CompleteCondition> list = new ArrayList<CompleteCondition>(params.size());
+        List<CompleteCondition> list = new ArrayList<>(params.size());
         
         for (Map.Entry<String, List<String>> entry : params.entrySet()) {
             list.add(getOrCondition(builder, entry));
@@ -169,7 +169,7 @@ public class SearchContextImpl implements SearchContext {
             ct = ConditionType.EQUALS;
         }
         
-        List<CompleteCondition> list = new ArrayList<CompleteCondition>(entry.getValue().size());
+        List<CompleteCondition> list = new ArrayList<>(entry.getValue().size());
         for (String value : entry.getValue()) {
             list.add(builder.is(key).comparesTo(ct, value));
         }