cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [04/12] cxf git commit: Removing HashMap parameters
Date Thu, 09 Mar 2017 11:40:41 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 278743f..647fb3f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -457,7 +457,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
         wc.accept("application/xhtml+xml").path(666).matrix("name2", 2).query("name", "Action - ");
         XMLSource source = wc.get(XMLSource.class);
         source.setBuffering();
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("xhtml", "http://www.w3.org/1999/xhtml");
         Book2 b = source.getNode("xhtml:html/xhtml:body/xhtml:ul/xhtml:Book", namespaces, Book2.class);
         assertEquals(666, b.getId());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
index f766bd3..8311575 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
@@ -75,7 +75,7 @@ public class JAXRSClientServerStreamingTest extends AbstractBusClientServerTestB
             providers.add(p2);
             sf.setProviders(providers);
             sf.setAddress("http://localhost:" + PORT + "/");
-            Map<String, Object> properties = new HashMap<String, Object>();
+            Map<String, Object> properties = new HashMap<>();
             properties.put("org.apache.cxf.serviceloader-context", "true");
             sf.setProperties(properties);
             sf.create();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
index 7ad8e42..04a74f7 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
@@ -57,7 +57,7 @@ public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase
         client.accept("text/html");
         WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(100000000);
         XMLSource source = client.accept("text/html").get(XMLSource.class);
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("xhtml", "http://www.w3.org/1999/xhtml");
         namespaces.put("books", "http://www.w3.org/books");
         String value = source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);
@@ -101,7 +101,7 @@ public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase
         client.accept("text/html");
         WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(100000000);
         XMLSource source = client.accept("text/html").get(XMLSource.class);
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("xhtml", "http://www.w3.org/1999/xhtml");
         namespaces.put("books", "http://www.w3.org/books");
         String value = source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);
@@ -140,7 +140,7 @@ public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase
         client.accept("text/html");
         WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(100000000);
         XMLSource source = client.accept("text/html").get(XMLSource.class);
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("xhtml", "http://www.w3.org/1999/xhtml");
         namespaces.put("books", "http://www.w3.org/books");
         String value = source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
index a0e32d3..63ba7b8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
@@ -203,7 +203,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
                                      "{http://www.example.org/super-books}*"));
 
         TransformInInterceptor in = new TransformInInterceptor();
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
 
         // If Book2 didn't have {http://www.example.org/books}Book
         // then we'd just do '"*" : "{http://www.example.org/books}*'
@@ -240,7 +240,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         p.setConsumeMediaTypes(Collections.singletonList("application/fastinfoset"));
         bean.setProvider(p);
 
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(FIStaxInInterceptor.FI_GET_SUPPORTED, Boolean.TRUE);
         bean.setProperties(props);
 
@@ -262,7 +262,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         p.setProduceMediaTypes(Collections.singletonList("application/fastinfoset"));
         bean.setProvider(p);
 
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(FIStaxOutInterceptor.FI_ENABLED, Boolean.TRUE);
         bean.setProperties(props);
 
@@ -468,7 +468,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
     public void testNoBook357WebClient() throws Exception {
 
         JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("org.apache.cxf.http.throw_io_exceptions", Boolean.TRUE);
         bean.setProperties(properties);
         bean.setAddress("http://localhost:" + PORT + "/test/services/rest/bookstore/356");
@@ -794,7 +794,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         BookStoreJaxrsJaxws store = service.getBookPort();
 
         TransformOutInterceptor out = new TransformOutInterceptor();
-        Map<String, String> mapOut = new HashMap<String, String>();
+        Map<String, String> mapOut = new HashMap<>();
         // Book content (id, name) is unqualified, thus the following works
         // because JAXB will report
         // - {http://jaxws.jaxrs.systest.cxf.apache.org/}Book
@@ -806,7 +806,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
         out.setOutTransformElements(mapOut);
 
         TransformInInterceptor in = new TransformInInterceptor();
-        Map<String, String> mapIn = new HashMap<String, String>();
+        Map<String, String> mapIn = new HashMap<>();
         // mapIn.put("*", "{http://jaxws.jaxrs.systest.cxf.apache.org/}*");
         // won't work for a case where a totally unqualified getBookResponse needs to be
         // qualified such that only the top-level getBookResponse is processed because of '*'.

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JMSBookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JMSBookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JMSBookStore.java
index 147c4a0..29dad3e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JMSBookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JMSBookStore.java
@@ -57,7 +57,7 @@ public class JMSBookStore {
     @javax.ws.rs.core.Context
     private ProtocolHeaders headers;
 
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartServer.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartServer.java
index fa14ea0..b3b923e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartServer.java
@@ -37,7 +37,7 @@ public class MultipartServer extends AbstractBusTestServerBase {
         JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
         sf.setResourceClasses(MultipartStore.class);
 
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(AttachmentDeserializer.ATTACHMENT_MAX_SIZE, String.valueOf(1024 * 10));
         props.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD, String.valueOf(1024 * 5));
         sf.setProperties(props);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
index 56f08b9..429737f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
@@ -128,7 +128,7 @@ public class BookCatalog {
     }
 
     private static LuceneQueryVisitor< SearchBean > createVisitor() {
-        final Map< String, Class< ? > > fieldTypes = new HashMap< String, Class< ? > >();
+        final Map< String, Class< ? > > fieldTypes = new HashMap<>();
         fieldTypes.put("modified", Date.class);
 
         LuceneQueryVisitor<SearchBean> visitor = new LuceneQueryVisitor<SearchBean>("ct", "contents");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
index 23bc581..8fa233a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
@@ -56,7 +56,7 @@ public class JAXRSClientServerTikaTest extends AbstractBusClientServerTestBase {
         protected void run() {
             JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
 
-            final Map< String, Object > properties = new HashMap< String, Object >();
+            final Map< String, Object > properties = new HashMap<>();
             properties.put("search.query.parameter.name", "$filter");
             properties.put("search.parser", new FiqlParser< SearchBean >(SearchBean.class));
             properties.put(SearchUtils.DATE_FORMAT_PROPERTY, "yyyy/MM/dd");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
index fd06eb3..bb0100c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
@@ -369,7 +369,7 @@ public abstract class AbstractFailoverTest extends AbstractBusClientServerTestBa
 
     private static class CustomRetryStrategy extends RetryStrategy {
         private int totalCount;
-        private Map<String, Integer> map = new HashMap<String, Integer>();
+        private Map<String, Integer> map = new HashMap<>();
         @Override
         protected <T> T getNextAlternate(List<T> alternates) {
             totalCount++;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java
index 06d8ad4..4b959d9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java
@@ -46,7 +46,7 @@ import org.apache.http.HttpStatus;
 @SchemaValidation
 public class BookStoreSoapRestImpl implements BookStoreJaxrsJaxws {
 
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
     private boolean ignoreJaxrsClient;
     @Context
     private MessageContext jaxrsContext;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
index 61ede4a..96d2898 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
@@ -64,7 +64,7 @@ public class JAXRSJmsTest extends AbstractBusClientServerTestBase {
             return;
         }
         AbstractResourceInfo.clearAllMaps();
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         if (System.getProperty("org.apache.activemq.default.directory.prefix") != null) {
             props.put("org.apache.activemq.default.directory.prefix",
                       System.getProperty("org.apache.activemq.default.directory.prefix"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/Book.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/Book.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/Book.java
index 011e571..fcc074b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/Book.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/Book.java
@@ -26,7 +26,7 @@ import java.util.Map;
 public class Book {
     private String name;
     private long id;
-    private Map<Long, BookChapter> chapters = new HashMap<Long, BookChapter>();
+    private Map<Long, BookChapter> chapters = new HashMap<>();
 
     public Book() {
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/BookJsonStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/BookJsonStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/BookJsonStore.java
index 3a9ff54..122bc78 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/BookJsonStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/BookJsonStore.java
@@ -41,7 +41,7 @@ import javax.ws.rs.core.UriInfo;
 
 @Path("/bookstore/")
 public class BookJsonStore {
-    private Map< Long, Book > books = new HashMap< Long, Book >();
+    private Map< Long, Book > books = new HashMap<>();
 
     @GET
     @Path("/books/{bookId}")

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java
index 360ae77..8ea15de 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java
@@ -80,7 +80,7 @@ public class BookLoginModule implements LoginModule {
     public void initialize(Subject subject, CallbackHandler handler,
                            Map<String, ? extends Object> sharedState, Map<String, ? extends Object> options) {
 
-        Map<String, String> customOptions = new HashMap<String, String>();
+        Map<String, String> customOptions = new HashMap<>();
         customOptions.put("file", fileResource);
 
         module.initialize(subject, handler, sharedState, customOptions);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java
index 101240e..5e849ab 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java
@@ -33,7 +33,7 @@ import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
 
 @Path("/bookstorestorage/")
 public class SecureBookStore extends AbstractSecureBookStore implements SecureBookInterface {
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
     private SecureBookInterface subresource;
     private UriInfo uriInfo;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreGenerics.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreGenerics.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreGenerics.java
index 61401cb..7a2a520 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreGenerics.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreGenerics.java
@@ -28,7 +28,7 @@ import org.apache.cxf.systest.jaxrs.Book;
 
 @Path("/bookstoregenerics/")
 public class SecureBookStoreGenerics implements SecureBookInterfaceGenerics<Long> {
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
 
     public SecureBookStoreGenerics() {
         Book book = new Book();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java
index 9eadc3b..d1517e1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java
@@ -30,7 +30,7 @@ import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
 
 @Path("/bookstorestorage/")
 public class SecureBookStoreNoAnnotations implements BookInterface {
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
 
     public SecureBookStoreNoAnnotations() {
         Book book = new Book();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
index c2599f5..326f294 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
@@ -41,7 +41,7 @@ import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
 
 @Path("/bookstorestorage/")
 public class SecureBookStoreNoInterface {
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
 
     public SecureBookStoreNoInterface() {
         Book book = new Book();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidation.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidation.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidation.java
index 28d9aae..f06527c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidation.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidation.java
@@ -41,7 +41,7 @@ import javax.ws.rs.core.UriInfo;
 
 @Path("/bookstore/")
 public class BookStoreWithValidation extends AbstractBookStoreWithValidation implements  BookStoreValidatable {
-    private Map< String, BookWithValidation > books = new HashMap< String, BookWithValidation >();
+    private Map< String, BookWithValidation > books = new HashMap<>();
 
     public BookStoreWithValidation() {
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidationPerRequest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidationPerRequest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidationPerRequest.java
index 5edc0cc..ca71e2a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidationPerRequest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/BookStoreWithValidationPerRequest.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;
 
 @Path("/bookstore/")
 public class BookStoreWithValidationPerRequest  {
-    private Map<String, BookWithValidation> books = new HashMap<String, BookWithValidation>();
+    private Map<String, BookWithValidation> books = new HashMap<>();
     @NotNull private String id;
 
     public BookStoreWithValidationPerRequest() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
index 7771b5a..0ee9a0e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
@@ -48,7 +48,7 @@ import org.apache.cxf.transport.websocket.WebSocketConstants;
 @Path("/web/bookstore")
 public class BookStoreWebSocket {
     private static ExecutorService executor = Executors.newSingleThreadExecutor();
-    private Map<String, OutputStream> eventsStreams = new HashMap<String, OutputStream>();
+    private Map<String, OutputStream> eventsStreams = new HashMap<>();
 
     @GET
     @Path("/booknames")

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
index 0422631..900c5fe 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
@@ -111,8 +111,8 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
                 + TestUtil.getPortNumber(DispatchClientServerTest.class)
                 + "/SOAPDispatchService/SoapDispatchPort";
             ep = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, implementor);
-            Map<String, Object> properties = new HashMap<String, Object>();
-            Map<String, String> nsMap = new HashMap<String, String>();
+            Map<String, Object> properties = new HashMap<>();
+            Map<String, String> nsMap = new HashMap<>();
             nsMap.put("gmns", "http://apache.org/hello_world_soap_http/types");
             properties.put("soap.env.ns.map", nsMap);
             properties.put("disable.outputstream.optimization", "true");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
index 9f194fb..7129a13 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
@@ -223,7 +223,7 @@ public class TestHandler<T extends LogicalMessageContext>
             DOMSource source = (DOMSource)ctx.getMessage().getPayload();
             Node node = source.getNode();
 
-            Map<String, String> ns = new HashMap<String, String>();
+            Map<String, String> ns = new HashMap<>();
             ns.put("s", Soap11.SOAP_NAMESPACE);
             XPathUtils xu = new XPathUtils(ns);
             String exceptionText = (String)xu.getValue("//s:Fault/faultstring/text()", node,

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
index 227fec8..930bd3c 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
@@ -47,7 +47,7 @@ public abstract class TestHandlerBase {
     private int invokeOrderOfHandleFault;
     private int invokeOrderOfClose;
 
-    private Map<String, Integer> methodCallCount = new HashMap<String, Integer>();
+    private Map<String, Integer> methodCallCount = new HashMap<>();
     private final int id;
     private final boolean isServerSideHandler;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
index 016557b..de526f6 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
@@ -47,7 +47,7 @@ public class ClientServerGreeterNoWsdlTest extends AbstractBusClientServerTestBa
     public void testWSDLImports() throws Exception {
         URL url = new URL("http://localhost:" + PORT + "/SoapContext/GreeterPort?wsdl");
         Document doc = StaxUtils.read(url.openStream());
-        Map<String, String> ns = new HashMap<String, String>();
+        Map<String, String> ns = new HashMap<>();
         ns.put("xsd", "http://www.w3.org/2001/XMLSchema");
         Node nd = new XPathUtils(ns)
             .getValueNode("//xsd:import[@namespace='http://cxf.apache.org/greeter_control/types']",

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
index 359c041..4ec4b0e 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
@@ -97,7 +97,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
 
     @Test
     public void testWSDLDocs() throws Exception {
-        Map<String, String> ns = new HashMap<String, String>();
+        Map<String, String> ns = new HashMap<>();
         ns.put("wsdl", WSDLConstants.NS_WSDL11);
         XPathUtils xpu = new XPathUtils(ns);
         Document wsdl = StaxUtils.read(this.getHttpConnection(ServerMisc.DOCLIT_CODEFIRST_URL + "?wsdl")
@@ -866,7 +866,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
         assertNotNull(doc);
 
 
-        Map<String, String> ns = new HashMap<String, String>();
+        Map<String, String> ns = new HashMap<>();
         ns.put("soap", Soap11.SOAP_NAMESPACE);
         ns.put("tns", "http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService");
         ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
index 2a3860b..e6e472d 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
@@ -221,7 +221,7 @@ public class ClientServerRPCLitTest extends AbstractBusClientServerTestBase {
         assertNotNull(doc);
 
 
-        Map<String, String> ns = new HashMap<String, String>();
+        Map<String, String> ns = new HashMap<>();
         ns.put("soap", Soap11.SOAP_NAMESPACE);
         ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         ns.put("xs", "http://www.w3.org/2001/XMLSchema");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
index ef10abb..5003b15 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
@@ -916,7 +916,7 @@ public class ClientServerTest extends AbstractBusClientServerTestBase {
         //TODO: the following isn't a real test. We need to test against a service
         // that would actually notice the difference. At least it ensures that
         // specifying the property does not explode.
-        Map<String, Object> jaxbContextProperties = new HashMap<String, Object>();
+        Map<String, Object> jaxbContextProperties = new HashMap<>();
         if (JAXBContext.newInstance(String.class).getClass().getName().contains("internal")) {
             jaxbContextProperties.put("com.sun.xml.internal.bind.defaultNamespaceRemap", "uri:ultima:thule");
         } else {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
index d18b3e9..04d04f7 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
@@ -55,7 +55,7 @@ public class SchemaValidationClientServerTest extends AbstractBusClientServerTes
             Object implementor = new ServicePortTypeImpl();
             address = "http://localhost:" + PORT + "/schemavalidation";
             Endpoint ep = Endpoint.create(implementor);
-            Map<String, Object> map = new HashMap<String, Object>();
+            Map<String, Object> map = new HashMap<>();
             map.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE);
             ep.setProperties(map);
             ((EndpointImpl)ep).setWsdlLocation("wsdl_systest_jaxws/schemaValidation.wsdl");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
index bb731ed..778ddc9 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
@@ -35,7 +35,7 @@ public class ServerGreeterNoWsdl extends AbstractBusTestServerBase {
         Object implementor = new GreeterImplNoWsdl();
         String address = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
         Endpoint ep = Endpoint.create(implementor);
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(WSDLGetUtils.WSDL_CREATE_IMPORTS, Boolean.TRUE);
         ep.setProperties(props);
         ep.publish(address);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
index 661d54c..b2bfd96 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
@@ -86,7 +86,7 @@ public class JavaFirstSchemaValidationTest extends Assert {
     }
 
     private static SchemaValidationFeature createSchemaValidationFeature() {
-        Map<String, SchemaValidationType> operationMap = new HashMap<String, SchemaValidationType>();
+        Map<String, SchemaValidationType> operationMap = new HashMap<>();
         operationMap.put("saveInheritEndpoint", SchemaValidationType.BOTH);
         operationMap.put("saveNoValidation", SchemaValidationType.NONE);
         operationMap.put("saveValidateIn", SchemaValidationType.IN);
@@ -399,7 +399,7 @@ public class JavaFirstSchemaValidationTest extends Assert {
         }
 
         if (type != null) {
-            Map<String, Object> properties = new HashMap<String, Object>();
+            Map<String, Object> properties = new HashMap<>();
             properties.put(Message.SCHEMA_VALIDATION_ENABLED, type);
             svrFactory.setProperties(properties);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
index c4bd2ae..4c21cf3 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
@@ -98,7 +98,7 @@ public class AttachmentStreamSourceXMLProvider implements Provider<StreamSource>
             Map<String, List<String>> respHeaders = CastUtils
                 .cast((Map<?, ?>)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
             if (respHeaders == null) {
-                respHeaders = new HashMap<String, List<String>>();
+                respHeaders = new HashMap<>();
                 mc.put(MessageContext.HTTP_RESPONSE_HEADERS, respHeaders);
             }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
index 0748dd3..94213b5 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
@@ -50,7 +50,7 @@ public class ProviderClientServerTest extends AbstractBusClientServerTestBase {
         protected void run() {
             Object implementor = new HWSoapMessageDocProvider();
             Endpoint ep = Endpoint.create(implementor);
-            Map<String, Object> map = new HashMap<String, Object>();
+            Map<String, Object> map = new HashMap<>();
             map.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE);
             ep.setProperties(map);
             ((EndpointImpl)ep).getInInterceptors().add(new LoggingInInterceptor());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java
index ee91fe9..d2f2dc8 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java
@@ -37,7 +37,7 @@ public class Server extends AbstractBusTestServerBase {
         Endpoint ep = Endpoint.create(implementor);
         ep.publish(address);
 
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put(SourceDataBinding.PREFERRED_FORMAT, "dom");
         address = "http://localhost:" + PORT + "/SOAPServiceProviderRPCLit/SoapPortProviderRPCLit8-dom";
         ep = Endpoint.create(implementor);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/XMLServer.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/XMLServer.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/XMLServer.java
index bfb47ba..aabab93 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/XMLServer.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/XMLServer.java
@@ -36,7 +36,7 @@ public class XMLServer extends AbstractBusTestServerBase {
     protected void run() {
         Object implementor = new HWDOMSourcePayloadXMLBindingProvider();
         Endpoint ep = Endpoint.create(implementor);
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE);
         ep.setProperties(map);
         ep.publish(ADDRESS);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Book.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Book.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Book.java
index 477da8a..784f9e8 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Book.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Book.java
@@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 public class Book {
     private String name;
     private long id;
-    private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>();
+    private Map<Long, Chapter> chapters = new HashMap<>();
 
     public Book() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/BookStoreImpl.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/BookStoreImpl.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/BookStoreImpl.java
index 3628a27..f830d62 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/BookStoreImpl.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/BookStoreImpl.java
@@ -28,7 +28,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.UriInfo;
 
 public class BookStoreImpl implements BookStore {
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
     private long bookId = 123;
 
     private String defaultName;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
index d000477..56c75ab 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
@@ -109,7 +109,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase {
                                                new JweWriterInterceptor(),
                                                new JweClientResponseFilter());
         String jwkStoreProperty = "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties";
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(JoseConstants.RSSEC_SIGNATURE_PROPS, jwkStoreProperty);
         props.put(JoseConstants.RSSEC_ENCRYPTION_PROPS, jwkStoreProperty);
         BookStore bs = createBookStore(address,
@@ -126,7 +126,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase {
         List<String> properties = new ArrayList<>();
         properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.properties");
         properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties");
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put(JoseConstants.RSSEC_SIGNATURE_OUT_PROPS, properties);
         map.put(JoseConstants.RSSEC_SIGNATURE_IN_PROPS,
                 "org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties");
@@ -141,7 +141,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase {
         String address = "https://localhost:" + PORT + "/jwsjsonhmac2";
         List<String> properties = new ArrayList<>();
         properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac2.properties");
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put(JoseConstants.RSSEC_SIGNATURE_OUT_PROPS, properties);
         map.put(JoseConstants.RSSEC_SIGNATURE_IN_PROPS,
                 "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
index efa9230..709f3b0 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java
@@ -80,7 +80,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.encryption.properties",
                        "org/apache/cxf/systest/jaxrs/security/bob.jwk.properties");
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -107,7 +107,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -137,7 +137,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -163,7 +163,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -193,7 +193,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -219,7 +219,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "AliceCert");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -245,7 +245,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "smallkey");
         properties.put("rs.security.keystore.password", "security");
@@ -277,7 +277,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.properties",
                        "org/apache/cxf/systest/jaxrs/security/alice.jwk.properties");
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -304,7 +304,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -334,7 +334,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -360,7 +360,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -387,7 +387,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.password", "password");
         properties.put("rs.security.key.password", "password");
@@ -414,7 +414,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "ECKey");
         properties.put("rs.security.keystore.file",
@@ -443,7 +443,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         WebClient.getConfig(client).getRequestContext().putAll(properties);
 
         String header = "eyJhbGciOiJSUzI1NiIsImN0eSI6Impzb24ifQ";
@@ -491,7 +491,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "smallkey");
         properties.put("rs.security.keystore.password", "security");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
index e40ed80..13da0bf 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java
@@ -81,7 +81,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -108,7 +108,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "bob");
         properties.put("rs.security.keystore.password", "password");
@@ -145,7 +145,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "alice");
         properties.put("rs.security.keystore.password", "password");
@@ -175,7 +175,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "bob");
         properties.put("rs.security.keystore.password", "password");
@@ -212,7 +212,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "alice");
         properties.put("rs.security.keystore.password", "password");
@@ -246,7 +246,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "alice");
         properties.put("rs.security.keystore.password", "password");
@@ -281,7 +281,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "morpit");
         properties.put("rs.security.keystore.password", "password");
@@ -309,7 +309,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "alice");
         properties.put("rs.security.keystore.password", "password");
@@ -345,7 +345,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase {
             WebClient.create(address, providers, busFile.toString());
         client.type("application/json").accept("application/json");
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "morpit");
         properties.put("rs.security.keystore.password", "password");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
index f3add14..bca5529 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java
@@ -97,7 +97,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.encryption.properties",
             "org/apache/cxf/systest/jaxrs/security/bob.jwk.properties");
         properties.put(JwtConstants.JWT_TOKEN, token);
@@ -137,7 +137,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -180,7 +180,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -222,7 +222,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -265,7 +265,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "AliceCert");
         properties.put("rs.security.keystore.file", "org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt");
@@ -305,7 +305,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.properties",
                        "org/apache/cxf/systest/jaxrs/security/alice.jwk.properties");
         properties.put(JwtConstants.JWT_TOKEN, token);
@@ -342,7 +342,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -382,7 +382,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -418,7 +418,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.password", "password");
         properties.put("rs.security.key.password", "password");
@@ -455,7 +455,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "ECKey");
         properties.put("rs.security.keystore.file",
@@ -496,7 +496,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.alias", "smallkey");
         properties.put("rs.security.keystore.password", "security");
@@ -534,7 +534,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -570,7 +570,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -605,7 +605,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.properties",
                        "org/apache/cxf/systest/jaxrs/security/alice.jwk.properties");
         properties.put("rs.security.encryption.properties",
@@ -645,7 +645,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.password", "password");
         properties.put("rs.security.key.password", "password");
@@ -687,7 +687,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "HMAC512Key");
         properties.put("rs.security.keystore.file",
@@ -726,7 +726,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "HMACKey");
         properties.put("rs.security.keystore.file",

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
index 7b08a62..cdf303a 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
@@ -90,7 +90,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -130,7 +130,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jks");
         properties.put("rs.security.keystore.password", "password");
         properties.put("rs.security.key.password", "password");
@@ -169,7 +169,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -209,7 +209,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",
@@ -246,7 +246,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.keystore.type", "jwk");
         properties.put("rs.security.keystore.alias", "2011-04-29");
         properties.put("rs.security.keystore.file",

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
index 8fd58a5..b5ff6b6 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
@@ -95,7 +95,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -131,7 +131,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -167,7 +167,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -203,7 +203,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -240,7 +240,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -277,7 +277,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
 
         JwtToken token = new JwtToken(claims);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_TOKEN, token);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -307,7 +307,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
         claims.setIssuedAt(new Date().getTime() / 1000L);
         claims.setAudiences(toList(address));
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_CLAIMS, claims);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -338,7 +338,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
         String badAddress = "https://localhost:" + PORT + "/badunsignedjwt/bookstore/books";
         claims.setAudiences(toList(badAddress));
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_CLAIMS, claims);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -367,7 +367,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
         claims.setIssuer("DoubleItSTSIssuer");
         claims.setIssuedAt(new Date().getTime() / 1000L);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_CLAIMS, claims);
         WebClient.getConfig(client).getRequestContext().putAll(properties);
@@ -402,7 +402,7 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
         audiences.add(badAddress);
         claims.setAudiences(audiences);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("rs.security.signature.algorithm", "none");
         properties.put(JwtConstants.JWT_CLAIMS, claims);
         WebClient.getConfig(client).getRequestContext().putAll(properties);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
index 07b18de..1fd5c2f 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
@@ -47,7 +47,7 @@ public class TemporaryCredentialServiceTest extends AbstractBusClientServerTestB
 
     @Test
     public void testGetTemporaryCredentialsURIQuery() throws Exception {
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
 
         parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, "HMAC-SHA1");
         parameters.put(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());


Mime
View raw message