Fix sonar violations

Issue-ID: AAI-1190

Change-Id: I72894665b288416069d3c2eb84185fcc303976f7
Signed-off-by: Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com>

3 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java
index fed12fd..a5b52bd 100644
--- a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java
@@ -22,9 +22,9 @@ package org.onap.crud.service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response.Status;
@@ -89,7 +89,7 @@ public abstract class AbstractGraphDataService {
         version));
   }
 
-  public ImmutablePair<EntityTag, String> getVertices(String version, String type, Map<String, String> filter, HashSet<String> properties) throws CrudException {
+  public ImmutablePair<EntityTag, String> getVertices(String version, String type, Map<String, String> filter, Set<String> properties) throws CrudException {
     type = OxmModelValidator.resolveCollectionType(version, type);
     OperationResult operationResult = daoForGet.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter), properties, version);
     List<Vertex> vertices = Vertex.collectionFromJson(operationResult.getResult(), version);
diff --git a/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java b/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java
index 26f7427..aa70a66 100644
--- a/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java
@@ -230,7 +230,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService {
         }
         String responsePayload = responseHandler.handleVertexResponse(version, event, response);
 
-        return new ImmutablePair<EntityTag, String>(entityTag, responsePayload);
+        return new ImmutablePair<>(entityTag, responsePayload);
     }
 
     @Override
@@ -252,7 +252,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService {
         }
         String responsePayload = responseHandler.handleEdgeResponse(version, event, response);
 
-        return new ImmutablePair<EntityTag, String>(entityTag, responsePayload);
+        return new ImmutablePair<>(entityTag, responsePayload);
     }
 
     @Override
@@ -272,7 +272,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService {
         }
         String responsePayload = responseHandler.handleVertexResponse(version, event, response);
 
-        return new ImmutablePair<EntityTag, String>(entityTag, responsePayload);
+        return new ImmutablePair<>(entityTag, responsePayload);
     }
 
     @Override
@@ -296,7 +296,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService {
         }
         String responsePayload = responseHandler.handleVertexResponse(version, event, response);
 
-        return new ImmutablePair<EntityTag, String>(entityTag, responsePayload);
+        return new ImmutablePair<>(entityTag, responsePayload);
     }
 
     @Override
@@ -339,7 +339,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService {
         }
         String responsePayload = responseHandler.handleEdgeResponse(version, event, response);
 
-        return new ImmutablePair<EntityTag, String>(entityTag, responsePayload);
+        return new ImmutablePair<>(entityTag, responsePayload);
     }
 
     @Override
@@ -361,7 +361,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService {
         }
         String responsePayload = responseHandler.handleEdgeResponse(version, event, response);
 
-        return new ImmutablePair<EntityTag, String>(entityTag, responsePayload);
+        return new ImmutablePair<>(entityTag, responsePayload);
     }
 
     @PreDestroy
diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
index 2888ace..9ff48c7 100644
--- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
@@ -68,7 +68,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = CrudResponseBuilder
         .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, addedVertex), version);
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   @Override
@@ -95,7 +95,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = CrudResponseBuilder
       .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version);
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   @Override
@@ -110,7 +110,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = getUpdatedVertexPayload(version, updatedVertexResult);
     EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedVertexResult.getHeaders());
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   private String getUpdatedVertexPayload(String version, OperationResult updatedVertexResult) throws CrudException {
@@ -169,7 +169,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = getUpdatedEdgePayload(version, updatedEdgeResult);
     EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedEdgeResult.getHeaders());
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   private String getUpdatedEdgePayload(String version, OperationResult updatedEdgeResult) throws CrudException {