merge if statement with enclsoing one

[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 3b97d6f..6d559de 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,6 +28,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.onap.aaf.auth.env.AuthzTrans;
+import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.util.FQI;
 import org.onap.aaf.cadi.util.Split;
 import org.onap.aaf.misc.env.Env;
@@ -35,10 +36,10 @@ import org.onap.aaf.misc.env.impl.BasicEnv;
 
 /**
  * Organization Plugin Mechanism
- * 
- * Define a NameSpace for the company (i.e. com.att), and put in Properties as 
- * "Organization.[your NS" and assign the supporting Class.  
- * 
+ *
+ * Define a NameSpace for the company (i.e. com.att), and put in Properties as
+ * "Organization.[your NS" and assign the supporting Class.
+ *
  * Example:
  * Organization.com.att=org.onap.aaf.auth.org.test.att.ATT
  *
@@ -52,40 +53,51 @@ public class OrganizationFactory {
     public static Organization init(BasicEnv env) throws OrganizationException {
         int idx = ORGANIZATION_DOT.length();
         Organization org,firstOrg = null;
-        
-        for(Entry<Object, Object> es : env.getProperties().entrySet()) {
+
+        for (Entry<Object, Object> es : env.getProperties().entrySet()) {
             String key = es.getKey().toString();
-            if(key.startsWith(ORGANIZATION_DOT)) {
+            if (key.startsWith(ORGANIZATION_DOT)) {
                 org = obtain(env,key.substring(idx));
-                if(firstOrg==null) {
+                if (firstOrg==null) {
                     firstOrg = org;
                 }
             }
         }
-        if(defaultOrg == null) {
+        if(firstOrg==null) { // attempt to load DefaultOrg
+            try {
+                Class<?> cls = Class.forName("org.onap.aaf.org.DefaultOrg");
+                @SuppressWarnings("unchecked")
+                Constructor<Organization> cnst = (Constructor<Organization>)cls.getConstructor(Env.class,String.class);
+                String realm = env.getProperty(Config.AAF_DEFAULT_REALM,"people.osaaf.org");
+                defaultOrg = cnst.newInstance(env,realm);
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException e) {
+                env.init().log("Default Organization Module not linked in",e);
+            }
+        }
+        if (defaultOrg == null) {
             defaultOrg = firstOrg;
         }
         return defaultOrg;
     }
     public static Organization obtain(Env env,final String theNS) throws OrganizationException {
         String orgNS;
-        if(theNS.indexOf('@')>=0) {
+        if (theNS.indexOf('@')>=0) {
             orgNS=FQI.reverseDomain(theNS);
         } else {
             orgNS=theNS;
         }
         Organization org = orgs.get(orgNS);
-        if(org == null) {
-            env.debug().printf("Attempting to instantiate Organization %s\n",orgNS);
+        if (org == null) {
+            env.debug().printf("Attempting to instantiate Organization %s",orgNS);
 
             String orgClass = env.getProperty(ORGANIZATION_DOT+orgNS);
-            if(orgClass == null) {
-                env.warn().log("There is no Organization." + orgNS + " property");
+            if (orgClass == null) {
+                env.warn().printf("There is no Organization.%s property",orgNS);
             } else {
                 try {
                     Class<?> orgCls = Class.forName(orgClass);
-                    for(Organization o : orgs.values()) {
-                        if(o.getClass().isAssignableFrom(orgCls)) {
+                    for (Organization o : orgs.values()) {
+                        if (o.getClass().isAssignableFrom(orgCls)) {
                             org = o;
                         }
                     }
@@ -93,20 +105,20 @@ public class OrganizationFactory {
                     env.error().log(e1, orgClass + " is not on the Classpath.");
                     throw new OrganizationException(e1);
                 }
-                if(org==null) {
+                if (org==null) {
                     try {
                         @SuppressWarnings("unchecked")
                         Class<Organization> cls = (Class<Organization>) Class.forName(orgClass);
                         Constructor<Organization> cnst = cls.getConstructor(Env.class,String.class);
                         org = cnst.newInstance(env,orgNS);
                         String other_realms = env.getProperty(orgNS+".also_supports");
-                        if(other_realms!=null) {
-                            for(String r : Split.splitTrim(',', other_realms)) {
+                        if (other_realms!=null) {
+                            for (String r : Split.splitTrim(',', other_realms)) {
                                 org.addSupportedRealm(r);
                             }
                         }
-                    } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | 
-                            InstantiationException | IllegalAccessException | IllegalArgumentException | 
+                    } catch (ClassNotFoundException | NoSuchMethodException | SecurityException |
+                            InstantiationException | IllegalAccessException | IllegalArgumentException |
                             InvocationTargetException e) {
                         env.error().log(e, "Error on Organization Construction");
                         throw new OrganizationException(e);
@@ -114,26 +126,26 @@ public class OrganizationFactory {
                 }
                 orgs.put(orgNS, org);
                 boolean isDefault;
-                if((isDefault="true".equalsIgnoreCase(env.getProperty(orgNS+".default")))) {
+                if ((isDefault="true".equalsIgnoreCase(env.getProperty(orgNS+".default")))) {
                     defaultOrg = org;
                 }
-                env.init().printf("Instantiated %s with %s%s\n",orgNS,orgClass,(isDefault?" as default":""));
+                env.init().printf("Instantiated %s with %s%s",orgNS,orgClass,(isDefault?" as default":""));
             }
-            if(org==null) {
-                if(defaultOrg!=null) {
+            if ( (org==null) && (defaultOrg!=null)){
+                
                     org=defaultOrg;
                     orgs.put(orgNS, org);
                 }
             }
-        }
         
+
         return org;
     }
 
-    public static Organization get(AuthzTrans trans) throws OrganizationException {
+    public static Organization get(AuthzTrans trans){
         String domain = FQI.reverseDomain(trans.user());
         Organization org = orgs.get(domain);
-        if(org==null) {
+        if (org==null) {
             org = defaultOrg; // can be null, btw, unless set.
         }
         return org;