1 files changed, 8 insertions, 8 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java
index c934f8d4..354d72bc 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java
@@ -107,7 +107,7 @@ public class RaptorAdapter extends FusionAdapter {
 
     /** Obtains user name by ID */
     public static String getUserName(String userId) {
-        Map<String, Long> params = new HashMap<String, Long>();
+        Map<String, Long> params = new HashMap<>();
         params.put(USER_ID, new Long(userId));
 
         List list = getDataAccessService().executeNamedQuery("getUserNameById", params, null);
@@ -130,7 +130,7 @@ public class RaptorAdapter extends FusionAdapter {
     }
     
     public static String getUserEmail(String userId) {
-        Map<String, Long> params = new HashMap<String, Long>();
+        Map<String, Long> params = new HashMap<>();
         params.put(USER_ID, new Long(userId));
         List list = getDataAccessService().executeNamedQuery("getUserEmail", params, null);
         String email = "";
@@ -205,7 +205,7 @@ public class RaptorAdapter extends FusionAdapter {
 
     /** Obtains role name by ID */
     public static String getRoleName(String roleId) {
-        Map<String, Long> params = new HashMap<String, Long>();
+        Map<String, Long> params = new HashMap<>();
         params.put("role_id", new Long(roleId));
 
         List list = getDataAccessService().executeNamedQuery("getRoleNameById", params, null);
@@ -225,7 +225,7 @@ public class RaptorAdapter extends FusionAdapter {
     public static Map<Long, String> getAllRolesUsingCustomizedQuery(String customizedQuery, String param, boolean isAdmin) {
         List roles = null;
 
-    	Map<Long, String> map = new LinkedHashMap<Long, String>();
+    	Map<Long, String> map = new LinkedHashMap<>();
 
     	if(customizedQuery.length()>0  && !isAdmin) {
 
@@ -308,7 +308,7 @@ public class RaptorAdapter extends FusionAdapter {
 	public static Set<Long> getActiveUsersRoleIds(Long userId) {
 		Set<Role> allActiveUserRoles = getActiveUserRoles(userId);
 		Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
-		Set<Long> allActiveUserRoleIds = new TreeSet<Long>();
+		Set<Long> allActiveUserRoleIds = new TreeSet<>();
 		while(allActiveUserRolesIterator.hasNext()){
 			Role role = allActiveUserRolesIterator.next();
 			allActiveUserRoleIds.add(role.getId());
@@ -320,7 +320,7 @@ public class RaptorAdapter extends FusionAdapter {
 	public static Set<Long> getActiveUserRoleIds(Long userId) {
 		Set<Role> allActiveUserRoles = getActiveUserRoles(userId);
 		Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
-		Set<Long> allActiveUserRoleIds = new TreeSet<Long>();
+		Set<Long> allActiveUserRoleIds = new TreeSet<>();
 		while(allActiveUserRolesIterator.hasNext()){
 			Role role = allActiveUserRolesIterator.next();
 			allActiveUserRoleIds.add(role.getId());
@@ -332,7 +332,7 @@ public class RaptorAdapter extends FusionAdapter {
 	public static Set<RoleFunction> getActiveRoleFunctions(Long userId) {
 		Set<Role> allActiveUserRoles = getActiveUserRoles(userId);
 		Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
-		Set<RoleFunction> allActiveRoleFunctions = new TreeSet<RoleFunction>();
+		Set<RoleFunction> allActiveRoleFunctions = new TreeSet<>();
 		while(allActiveUserRolesIterator.hasNext()){
 			Role role = allActiveUserRolesIterator.next();
 			allActiveRoleFunctions.addAll(role.getRoleFunctions());
@@ -343,7 +343,7 @@ public class RaptorAdapter extends FusionAdapter {
 
 	public static Set<Role> getActiveUserRoles(Long userId) {
 		User user = (User)getDataAccessService().getDomainObject(User.class,userId,null);
-		Set<Role> allActiveUserRoles = new TreeSet<Role>();
+		Set<Role> allActiveUserRoles = new TreeSet<>();
 		allActiveUserRoles.addAll(user.getRoles());
 		Iterator<Role> userRolesIterator = user.getRoles().iterator();
 		while(userRolesIterator.hasNext()){