Merge "Remove unneeded param type definition"

[so.git] / adapters / mso-adapter-utils / src / main / java / org / openecomp / mso / openstack / utils / MsoTenantUtilsFactory.java

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java
index be49cd9..cc9e869 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java
@@ -20,42 +20,39 @@
 
 package org.openecomp.mso.openstack.utils;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.openecomp.mso.cloud.CloudConfig;
 import org.openecomp.mso.cloud.CloudConfigFactory;
 import org.openecomp.mso.cloud.CloudIdentity;
 import org.openecomp.mso.cloud.CloudSite;
 import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.properties.MsoJavaProperties;
-
-import java.lang.reflect.InvocationTargetException;
+import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
 
 
 public class MsoTenantUtilsFactory {
 
        private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
-
-       private CloudConfigFactory cloudConfigFactory= new CloudConfigFactory();
-       protected CloudConfig cloudConfig;
-       protected MsoJavaProperties msoProps = null;
+       private CloudConfigFactory cloudConfigFactory= new CloudConfigFactory(); 
+       private CloudConfig cloudConfig;
        private String msoPropID;
-
+       
        public MsoTenantUtilsFactory (String msoPropID) {
                this.msoPropID = msoPropID;
        }
 
        //based on Cloud IdentityServerType returns ORM or KEYSTONE Utils
-       public MsoTenantUtils getTenantUtils(String cloudSiteId) {
-
-               // Obtain the cloud site information
+       public MsoTenantUtils getTenantUtils(String cloudSiteId) throws MsoCloudSiteNotFound {
+               // Obtain the cloud site information 
                cloudConfig = cloudConfigFactory.getCloudConfig();
-               CloudSite cloudSite = cloudConfig.getCloudSite (cloudSiteId);
-
+               CloudSite cloudSite = cloudConfig.getCloudSite(cloudSiteId).orElseThrow(
+                               () -> new MsoCloudSiteNotFound(cloudSiteId));
                return getTenantUtilsByServerType(cloudSite.getIdentityService().getIdentityServerType().toString());
        }
 
        public MsoTenantUtils getTenantUtilsByServerType(String serverType) {
 
-               MsoTenantUtils tenantU;
+               MsoTenantUtils tenantU = null;
                if (CloudIdentity.IdentityServerType.KEYSTONE.toString().equals(serverType)) {
                        tenantU = new MsoKeystoneUtils (msoPropID);
                } else {