Fixes in ServiceCatalogV2

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

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV2.java
index 1e7112c..846eca2 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV2.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV2.java
@@ -41,6 +41,9 @@ import com.woorea.openstack.keystone.model.Access.Service.Endpoint;
 import com.woorea.openstack.keystone.model.Authentication;\r
 import com.woorea.openstack.keystone.model.Tenant;\r
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
 import java.util.ArrayList;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
@@ -81,6 +84,8 @@ import java.util.regex.Pattern;
  */\r
 public class ServiceCatalogV2 extends ServiceCatalog {\r
 \r
+    private final static Logger logger = LoggerFactory.getLogger(ServiceCatalogV2.class);\r
+\r
     /**\r
      * The Openstack Access object that manages the authenticated token and access control\r
      */\r
@@ -121,7 +126,7 @@ public class ServiceCatalogV2 extends ServiceCatalog {
             connectorClass = Class.forName(CLIENT_CONNECTOR_CLASS);\r
             connector = (OpenStackClientConnector) connectorClass.newInstance();\r
         } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {\r
-            e.printStackTrace();\r
+            logger.error(e.getMessage());\r
             return;\r
         }\r
         Keystone keystone = new Keystone(identityURL, connector);\r
@@ -294,23 +299,23 @@ public class ServiceCatalogV2 extends ServiceCatalog {
         Lock lock = rwLock.readLock();\r
         lock.lock();\r
         try {\r
-            builder.append(String.format("Service Catalog: tenant %s, id[%s], description[%s]\n", tenant.getName(), //$NON-NLS-1$\r
+            builder.append(String.format("Service Catalog: tenant %s, id[%s], description[%s]%n", tenant.getName(), //$NON-NLS-1$\r
                     tenant.getId(), tenant.getDescription()));\r
             if (regions != null && !regions.isEmpty()) {\r
-                builder.append(String.format("%d regions:\n", regions.size())); //$NON-NLS-1$\r
+                builder.append(String.format("%d regions:%n", regions.size())); //$NON-NLS-1$\r
                 for (String region : regions) {\r
-                    builder.append("\t" + region + "\n"); //$NON-NLS-1$ //$NON-NLS-2$\r
+                    builder.append("\t" + region + "%n"); //$NON-NLS-1$ //$NON-NLS-2$\r
                 }\r
             }\r
-            builder.append(String.format("%d services:\n", serviceEndpoints.size())); //$NON-NLS-1$\r
+            builder.append(String.format("%d services:%n", serviceEndpoints.size())); //$NON-NLS-1$\r
             for (String serviceType : serviceEndpoints.keySet()) {\r
                 List<Service.Endpoint> endpoints = serviceEndpoints.get(serviceType);\r
                 Service service = serviceTypes.get(serviceType);\r
 \r
-                builder.append(String.format("\t%s [%s] - %d endpoints\n", service.getType(), service.getName(), //$NON-NLS-1$\r
+                builder.append(String.format("\t%s [%s] - %d endpoints%n", service.getType(), service.getName(), //$NON-NLS-1$\r
                         endpoints.size()));\r
                 for (Service.Endpoint endpoint : endpoints) {\r
-                    builder.append(String.format("\t\tRegion [%s], public URL [%s]\n", endpoint.getRegion(), //$NON-NLS-1$\r
+                    builder.append(String.format("\t\tRegion [%s], public URL [%s]%n", endpoint.getRegion(), //$NON-NLS-1$\r
                             endpoint.getPublicURL()));\r
                 }\r
             }\r