Updates to config adaptor bundle

[appc.git] / appc-config / appc-config-adaptor / provider / src / main / java / org / onap / appc / ccadaptor / CCAActivator.java

diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
index 9f94bfa..0b022c8 100644 (file)
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
@@ -35,59 +35,86 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-public class CCAActivator implements BundleActivator {
+public class CCAActivator implements BundleActivator
+{
 
-    private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES";
-    private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR";
-    //private static final Logger log = LoggerFactory.getLogger(CCAActivator.class);
-    private static final EELFLogger log = EELFManager.getInstance().getLogger(CCAActivator.class);
-    @SuppressWarnings("rawtypes")
-    private ServiceRegistration registration = null;
+  private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES";
+  private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR";
 
-    @Override
-    public void start(BundleContext ctx) throws Exception {
-        // Read properties
-        Properties props = new Properties();
+  @SuppressWarnings("rawtypes")
+  private ServiceRegistration registration = null;
 
-        // Read properties from appc-config-adaptor.properties
-        String propFileName = System.getenv(CCA_PROP_FILE_VAR);
-        if (propFileName == null) {
-            String propDir = System.getenv(SDNC_CONFIG_DIR_VAR);
-            if (propDir == null) {
-                throw new ConfigurationException(
-                    "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + SDNC_CONFIG_DIR_VAR + " unset");
-            }
+  //private static final Logger log = LoggerFactory.getLogger(CCAActivator.class);
+  private static final EELFLogger log = EELFManager.getInstance().getLogger(CCAActivator.class);
 
-            propFileName = propDir + "/appc-config-adaptor.properties";
-            log.warn("Environment variable " + CCA_PROP_FILE_VAR + " unset - defaulting to " + propFileName);
-        }
+  @Override
+  public void start(BundleContext ctx) throws Exception
+  {
+    // Read properties
+    Properties props = new Properties();
 
-        File propFile = new File(propFileName);
-        if (!propFile.exists()) {
-            throw new ConfigurationException("Missing configuration properties file: " + propFile);
-        }
+    // Read properties from appc-config-adaptor.properties
+    String propFileName = System.getenv(CCA_PROP_FILE_VAR);
+    if (propFileName == null)
+    {
+      String propDir = System.getenv(SDNC_CONFIG_DIR_VAR);
+      if (propDir == null)
+        throw new ConfigurationException(
+          "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + SDNC_CONFIG_DIR_VAR + " unset");
 
-        try (InputStream in = new FileInputStream(propFile)) {
-            props.load(in);
-            log.info("Loaded properties: ");
-        } catch (Exception e) {
-            throw new ConfigurationException("Could not load properties file " + propFileName, e);
-        }
+      propFileName = propDir + "/appc-config-adaptor.properties";
+      log.warn("Environment variable " + CCA_PROP_FILE_VAR + " unset - defaulting to " + propFileName);
+    }
 
-        // Advertise adaptor
-        ConfigComponentAdaptor adaptor = new ConfigComponentAdaptor(props);
-        if (registration == null) {
-            log.info("Registering service " + ConfigComponentAdaptor.class.getName());
-            registration = ctx.registerService(ConfigComponentAdaptor.class.getName(), adaptor, null);
-        }
+    File propFile = new File(propFileName);
+    if (!propFile.exists())
+      throw new ConfigurationException("Missing configuration properties file: " + propFile);
 
+    InputStream in = new FileInputStream(propFile);
+    try
+    {
+      props.load(in);
+    }
+    catch (Exception e)
+    {
+      throw new ConfigurationException("Could not load properties file " + propFileName, e);
     }
+    finally
+    {
+      try
+      {
+        in.close();
+      }
+      catch (Exception e)
+      {
+        log.warn("Could not close FileInputStream", e);
+      }
+    }
+
+    log.info("Loaded properties: ");
+    /*for (Object key : props.keySet())
+    {
+      Object value = props.get(key);
+      log.info("    " + key + "=" + value);
+    }*/
+
+    // Advertise adaptor
+    ConfigComponentAdaptor adaptor = new ConfigComponentAdaptor(props);
+    if (registration == null)
+    {
+      log.info("Registering service " + ConfigComponentAdaptor.class.getName());
+      registration = ctx.registerService(ConfigComponentAdaptor.class.getName(), adaptor, null);
+    }
+
+  }
 
-    @Override
-    public void stop(BundleContext ctx) throws Exception {
-        if (registration != null) {
-            registration.unregister();
-            registration = null;
-        }
+  @Override
+  public void stop(BundleContext ctx) throws Exception
+  {
+    if (registration != null)
+    {
+      registration.unregister();
+      registration = null;
     }
-}
+  }
+}
\ No newline at end of file