Unit test cases for iaas impl package

[appc.git] / appc-adapters / appc-iaas-adapter / appc-iaas-adapter-bundle / src / main / java / org / onap / appc / adapter / iaas / impl / ServiceCatalogFactory.java

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogFactory.java
index a4be233..74d8757 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogFactory.java
@@ -51,18 +51,12 @@ public class ServiceCatalogFactory {
                return null;\r
        }\r
         String version = idUrl.getVersion();\r
-        if(version == null){\r
-               logger.error("Invalid Identity URL check configuration");\r
-               return null;\r
-        }\r
         String prefix = version.split("\\.")[0];\r
-        if (prefix != null) {\r
-            switch (prefix) {\r
-                case "v2":\r
-                    return new ServiceCatalogV2(url, projectIdentifier, principal, credential, properties);\r
-                case "v3":\r
-                    return new ServiceCatalogV3(url, projectIdentifier, principal, credential, domain, properties);\r
-            }\r
+        if("v2".equals(prefix)){\r
+               return new ServiceCatalogV2(url, projectIdentifier, principal, credential, properties);\r
+        }\r
+        else if("v3".equals(prefix)){\r
+               return new ServiceCatalogV3(url, projectIdentifier, principal, credential, domain, properties);\r
         }\r
         return null;\r
     }\r