Collection syntax change because of Sonar

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / aaf / cert / AAFListedCertIdentity.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java
index de8ae7d..abd1c40 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java
@@ -56,7 +56,7 @@ import aaf.v2_0.Users.User;
 
 public class AAFListedCertIdentity implements CertIdentity {
        //TODO should 8 hours be configurable? 
-       private static final long EIGHT_HOURS = 1000*60*60*8; 
+       private static final long EIGHT_HOURS = 1000*60*60*8L; 
                        
        private static Map<ByteArrayHolder,String> certs = null;
        
@@ -93,7 +93,7 @@ public class AAFListedCertIdentity implements CertIdentity {
                byte[] fingerprint = X509Taf.getFingerPrint(certBytes);
                String id = certs.get(new ByteArrayHolder(fingerprint));
                if(id!=null) { // Caller is Validated
-                       return new X509Principal(id,cert,certBytes);
+                       return new X509Principal(id,cert,certBytes,null);
                }
                return null;
        }
@@ -118,9 +118,9 @@ public class AAFListedCertIdentity implements CertIdentity {
                @Override
                public void run() {
                        try {
-                               TreeMap<ByteArrayHolder, String> newCertsMap = new TreeMap<ByteArrayHolder,String>();
-                               Map<String,Set<String>> newTrustMap = new TreeMap<String,Set<String>>();
-                               Set<String> userLookup = new HashSet<String>();
+                               TreeMap<ByteArrayHolder, String> newCertsMap = new TreeMap<>();
+                               Map<String,Set<String>> newTrustMap = new TreeMap<>();
+                               Set<String> userLookup = new HashSet<>();
                                for(String s : certIDs) {
                                        userLookup.add(s);
                                }
@@ -132,7 +132,7 @@ public class AAFListedCertIdentity implements CertIdentity {
                                                        aafcon.access.log(Level.WARN, "AAF Lookup-No IDs in Role com.att.aaf.trustForID <> "+authMech);
                                                } else {
                                                        aafcon.access.log(Level.INFO,"Loading Trust Authentication Info for",authMech);
-                                                       Set<String> hsUser = new HashSet<String>();
+                                                       Set<String> hsUser = new HashSet<>();
                                                        for(User u : users) {
                                                                userLookup.add(u.getId());
                                                                hsUser.add(u.getId());