Collection syntax change because of Sonar

Issue-ID: AAF-386
Change-Id: I8ba8d8561d03e680ddc90a81b8db0339814c65fa
Signed-off-by: Instrumental <jonathan.gathman@att.com>

4 files changed, 21 insertions, 21 deletions

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java
index f3207798..668d482c 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java
@@ -568,8 +568,8 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 		if(urd.notOKorIsEmpty()) {
 			return Result.err(urd);
 		}
-		Map<String, Namespace> lm = new HashMap<String,Namespace>();
-		Map<String, Namespace> other = full || endsWith==null?null:new TreeMap<String,Namespace>();
+		Map<String, Namespace> lm = new HashMap<>();
+		Map<String, Namespace> other = full || endsWith==null?null:new TreeMap<>();
 		for(UserRoleDAO.Data urdd : urd.value) {
 			if(full) {
 				if(endsWith==null || urdd.role.endsWith(endsWith)) {
@@ -604,8 +604,8 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 							}
 							if(namespace==null) {
 								namespace = new Namespace(nsd.value);
-								namespace.admin=new ArrayList<String>();
-								namespace.owner=new ArrayList<String>();
+								namespace.admin=new ArrayList<>();
+								namespace.owner=new ArrayList<>();
 							}
 							if(endsWith==null || urdd.role.endsWith(endsWith)) {
 								lm.put(namespace.name,namespace);
@@ -679,7 +679,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			return Result.err(rnd); 
 		}
 
-		Set<Namespace> lm = new HashSet<Namespace>();
+		Set<Namespace> lm = new HashSet<>();
 		Result<List<NsDAO.Data>> rlnd = ques.nsDAO.dao().getChildren(trans, parent);
 		if(rlnd.isOK()) {
 			if(rlnd.isEmpty()) {
@@ -1301,7 +1301,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 		}
 		
 		// Create a set of Update Roles, which are in Internal Format
-		Set<String> updtRoles = new HashSet<String>();
+		Set<String> updtRoles = new HashSet<>();
 		Result<NsSplit> nss;
 		for(String role : updt.value.roles(false)) {
 			nss = ques.deriveNsSplit(trans, role);
@@ -3114,7 +3114,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 	//			filter = false;
 			
 			// Get list of roles per user, then add to Roles as we go
-			HashSet<UserRoleDAO.Data> userSet = new HashSet<UserRoleDAO.Data>();
+			HashSet<UserRoleDAO.Data> userSet = new HashSet<>();
 			Result<List<UserRoleDAO.Data>> rlurd = ques.userRoleDAO.readByRole(trans, role);
 			if(rlurd.isOK()) {
 				for(UserRoleDAO.Data data : rlurd.value) {
@@ -3186,7 +3186,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			
 			List<UserRoleDAO.Data> content;
 			if(mustFilter) {
-				content = new ArrayList<UserRoleDAO.Data>(rlurd.value.size()); // avoid multi-memory redos
+				content = new ArrayList<>(rlurd.value.size()); // avoid multi-memory redos
 				
 				for(UserRoleDAO.Data data : rlurd.value) {
 					ndd.name=data.ns;
@@ -3231,7 +3231,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			return Result.err(Status.ERR_BadData,v.errs());
 		}
 
-		Set<String> currRoles = new HashSet<String>();
+		Set<String> currRoles = new HashSet<>();
 		Result<List<UserRoleDAO.Data>> rlurd = ques.userRoleDAO.readByUser(trans, rurdd.value.user);
 		if(rlurd.isOK()) {
 			for(UserRoleDAO.Data data : rlurd.value) {
@@ -3325,7 +3325,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			return Result.err(nsr);	
 		}
 
-		Set<String> currUsers = new HashSet<String>();
+		Set<String> currUsers = new HashSet<>();
 		Result<List<UserRoleDAO.Data>> rlurd = ques.userRoleDAO.readByRole(trans, rurdd.value.role);
 		if(rlurd.isOK()) { 
 			for(UserRoleDAO.Data data : rlurd.value) {
@@ -3541,7 +3541,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			return Result.err(rnd); 
 		}
 		
-		HashSet<UserRoleDAO.Data> userSet = new HashSet<UserRoleDAO.Data>();
+		HashSet<UserRoleDAO.Data> userSet = new HashSet<>();
 		Result<List<UserRoleDAO.Data>> rlurd = ques.userRoleDAO.readUserInRole(trans, user, role);
 		if(rlurd.isOK()) {
 			for(UserRoleDAO.Data data : rlurd.value) {
@@ -3593,7 +3593,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			}
 		}
 		
-		HashSet<UserRoleDAO.Data> userSet = new HashSet<UserRoleDAO.Data>();
+		HashSet<UserRoleDAO.Data> userSet = new HashSet<>();
 		Result<List<UserRoleDAO.Data>> rlurd = ques.userRoleDAO.readByRole(trans, role);
 		if(rlurd.isOK()) { 
 			for(UserRoleDAO.Data data : rlurd.value) {
@@ -3657,8 +3657,8 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 		// Get list of roles per Permission, 
 		// Then loop through Roles to get Users
 		// Note: Use Sets to avoid processing or responding with Duplicates
-		Set<String> roleUsed = new HashSet<String>();
-		Set<UserRoleDAO.Data> userSet = new HashSet<UserRoleDAO.Data>();
+		Set<String> roleUsed = new HashSet<>();
+		Set<UserRoleDAO.Data> userSet = new HashSet<>();
 		
 		if(!nss.isEmpty()) {
 			Result<List<PermDAO.Data>> rlp = ques.permDAO.readByType(trans, nss.value.ns, nss.value.name);
@@ -4025,8 +4025,8 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			}
 
 			if(curr.isOKhasData()) {
-		    	Map<String, Result<List<DelegateDAO.Data>>> delegateCache = new HashMap<String, Result<List<DelegateDAO.Data>>>();
-		    	Map<UUID, FutureDAO.Data> futureCache = new HashMap<UUID, FutureDAO.Data>();
+		    	Map<String, Result<List<DelegateDAO.Data>>> delegateCache = new HashMap<>();
+		    	Map<UUID, FutureDAO.Data> futureCache = new HashMap<>();
 		    	FutureDAO.Data hasDeleted = new FutureDAO.Data();
 		    	
 			    for(ApprovalDAO.Data cd : curr.value) {
@@ -4177,7 +4177,7 @@ public class AuthzCassServiceImpl	<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS
 			return Result.err(Status.ERR_BadData,v.errs());
 		}
 		
-		List<ApprovalDAO.Data> listRapds = new ArrayList<ApprovalDAO.Data>();
+		List<ApprovalDAO.Data> listRapds = new ArrayList<>();
 		
 		Result<List<ApprovalDAO.Data>> myRapd = ques.approvalDAO.readByApprover(trans, approver);
 		if(myRapd.notOK()) {
diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_History.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_History.java
index 8c55e7dc..9044e177 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_History.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_History.java
@@ -185,7 +185,7 @@ public class API_History {
 		// Sonar says threading issues.
 		SimpleDateFormat FMT = new SimpleDateFormat("yyyyMM");
 		String yyyymm = req.getParameter("yyyymm");
-		ArrayList<Integer> ai= new ArrayList<Integer>();
+		ArrayList<Integer> ai= new ArrayList<>();
 		if(yyyymm==null) {
 			GregorianCalendar gc = new GregorianCalendar();
 			// three months is the default
diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java
index 0fa58972..06278f92 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java
@@ -292,7 +292,7 @@ public class Mapper_2_0 implements Mapper<Nss, Perms, Pkey, Roles, Users, UserRo
 
 	@Override
 	public Result<List<PermDAO.Data>> perms(AuthzTrans trans, Perms perms) {
-		List<PermDAO.Data> lpd = new ArrayList<PermDAO.Data>();
+		List<PermDAO.Data> lpd = new ArrayList<>();
 		for (Perm p : perms.getPerm()) {
 			Result<NsSplit> nss = q.deriveNsSplit(trans, p.getType());
 			PermDAO.Data pd = new PermDAO.Data();
@@ -790,7 +790,7 @@ public class Mapper_2_0 implements Mapper<Nss, Perms, Pkey, Roles, Users, UserRo
 	
 	@Override
 	public Result<List<ApprovalDAO.Data>> approvals(Approvals apprs) {
-		List<ApprovalDAO.Data>  lappr = new ArrayList<ApprovalDAO.Data>();
+		List<ApprovalDAO.Data>  lappr = new ArrayList<>();
 		for(Approval a : apprs.getApprovals()) {
 			ApprovalDAO.Data ad = new ApprovalDAO.Data();
 			String str = a.getId();
diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java
index f304fccd..872161a0 100644
--- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java
+++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java
@@ -91,7 +91,7 @@ public class JU_ServiceValidator {
 		to.ns = "namespace";
 		to.name = "name";
 		to.description = "description";
-		Set<String> permissions = new HashSet<String>();
+		Set<String> permissions = new HashSet<>();
 		permissions.add("perm1");
 		to.perms = permissions;