X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdao%2Fcass%2FNsDAO.java;h=0789054460d2059866ba8b52b0a4b30a519c24c0;hp=567246d821cffb7923182393de785ff2eb253e24;hb=f85f0889b3b0e5e9694afab4dd01a4a97a155188;hpb=8efa968683ef2c4ab0ae7f4c0d2ccb0fcaa8af7b

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/NsDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/NsDAO.java
index 567246d8..07890544 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/NsDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/NsDAO.java
@@ -110,9 +110,9 @@ public class NsDAO extends CassDAOImpl<AuthzTrans,NsDAO.Data> {
 //        // Getters
 		public Map<String,String> attrib(boolean mutable) {
 			if (attrib == null) {
-				attrib = new HashMap<String,String>();
+				attrib = new HashMap<>();
 			} else if (mutable && !(attrib instanceof HashMap)) {
-				attrib = new HashMap<String,String>(attrib);
+				attrib = new HashMap<>(attrib);
 			}
 			return attrib;
 		}
@@ -255,7 +255,7 @@ public class NsDAO extends CassDAOImpl<AuthzTrans,NsDAO.Data> {
 //// TEST CODE for Exception				
 //			boolean force = true; 
 //			if(force) {
-//				throw new com.datastax.driver.core.exceptions.NoHostAvailableException(new HashMap<InetSocketAddress,Throwable>());
+//				throw new com.datastax.driver.core.exceptions.NoHostAvailableException(new HashMap<>());
 ////				throw new com.datastax.driver.core.exceptions.AuthenticationException(new InetSocketAddress(9999),"Sample Message");
 //			}
 ////END TEST CODE
@@ -376,7 +376,7 @@ public class NsDAO extends CassDAOImpl<AuthzTrans,NsDAO.Data> {
 	}
     
 	public Result<Map<String,String>> readAttribByNS(AuthzTrans trans, String ns) {
-		Map<String,String> map = new HashMap<String,String>();
+		Map<String,String> map = new HashMap<>();
 		TimeTaken tt = trans.start("readAttribByNS " + ns, Env.REMOTE);
 		try {
 			ResultSet rs = getSession(trans).execute("SELECT key,value FROM " 
@@ -399,7 +399,7 @@ public class NsDAO extends CassDAOImpl<AuthzTrans,NsDAO.Data> {
 	}
 
 	public Result<Set<String>> readNsByAttrib(AuthzTrans trans, String key) {
-		Set<String> set = new HashSet<String>();
+		Set<String> set = new HashSet<>();
 		TimeTaken tt = trans.start("readNsBykey " + key, Env.REMOTE);
 		try {
 			ResultSet rs = getSession(trans).execute("SELECT ns FROM "