Merge "Replace type spec with diamond op"

2 files changed, 5 insertions, 5 deletions

diff --git a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
index 3bd646fada..d15fbf9322 100644
--- a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
@@ -135,7 +135,7 @@ public class CloudifyClient {
      * @return An object of Class <R>
      */
     public <R> CloudifyRequest<R> get(String path, Class<R> returnType) {
-        return new CloudifyRequest<R>(this, HttpMethod.GET, path, null, returnType);
+        return new CloudifyRequest<>(this, HttpMethod.GET, path, null, returnType);
     }
 
 }
diff --git a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.java
index df63bd18d3..006768f2f1 100644
--- a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.java
@@ -37,7 +37,7 @@ public class CloudifyRequest<R> {
 
     private StringBuilder path = new StringBuilder();
 
-    private Map<String, List<Object>> headers = new HashMap<String, List<Object>>();
+    private Map<String, List<Object>> headers = new HashMap<>();
 
     private Entity<?> entity;
 
@@ -100,7 +100,7 @@ public class CloudifyRequest<R> {
     }
 
     public <T> Entity<T> entity(T entity, String contentType) {
-        return new Entity<T>(entity, contentType);
+        return new Entity<>(entity, contentType);
     }
 
     public Entity<?> entity() {
@@ -160,7 +160,7 @@ public class CloudifyRequest<R> {
                 + headers + ", entity=" + entity + ", returnType=" + returnType + "]";
     }
 
-    private Map<String, List<Object>> queryParams = new LinkedHashMap<String, List<Object>>();
+    private Map<String, List<Object>> queryParams = new LinkedHashMap<>();
 
     public Map<String, List<Object>> queryParams() {
         return queryParams;
@@ -171,7 +171,7 @@ public class CloudifyRequest<R> {
             List<Object> values = queryParams.get(key);
             values.add(value);
         } else {
-            List<Object> values = new ArrayList<Object>();
+            List<Object> values = new ArrayList<>();
             values.add(value);
             queryParams.put(key, values);
         }