Merge "Mapper_2_0 Junits"

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / org / OrganizationFactory.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
index 57d37d0..ffc7916 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
@@ -48,7 +48,7 @@ import org.onap.aaf.misc.env.impl.BasicEnv;
 public class OrganizationFactory {
        private static final String ORGANIZATION_DOT = "Organization.";
        private static Organization defaultOrg = null;
-       private static Map<String,Organization> orgs = new ConcurrentHashMap<String,Organization>();
+       private static Map<String,Organization> orgs = new ConcurrentHashMap<>();
        public static Organization init(BasicEnv env) throws OrganizationException {
                int idx = ORGANIZATION_DOT.length();
                Organization org,firstOrg = null;
@@ -105,7 +105,6 @@ public class OrganizationFactory {
                                                                org.addSupportedRealm(r);
                                                        }
                                                }
-                                               
                                        } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | 
                                                        InstantiationException | IllegalAccessException | IllegalArgumentException | 
                                                        InvocationTargetException e) {