Shift file configuration loading to its own class

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/Configuration.java

@@ -4,6 +4,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Reader;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -19,7 +20,10 @@
 
 import org.apache.log4j.Logger;
 import org.buddycloud.channelserver.channel.LocalDomainChecker;
+import org.buddycloud.channelserver.utils.configuration.ConfigurationException;
 import org.buddycloud.channelserver.utils.configuration.DatabaseLoader;
+import org.buddycloud.channelserver.utils.configuration.FileLoader;
+import org.buddycloud.channelserver.utils.configuration.Loader;
 import org.xmpp.packet.JID;
 
 public class Configuration extends Properties {
@@ -56,9 +60,7 @@ public class Configuration extends Properties {
 
   public static final String NOTIFICATIONS_SENDTO = "notifications.sendTo";
   public static final String NOTIFICATIONS_CONNECTED = "notifications.connected";
-
-  private static final String CONFIGURATION_FILE = "configuration.properties";
-
+  
   public static final String PURGE_REMOTE_ON_START = "sync.purge-on-start";
 
   public static final String XMPP_PORT = "xmpp.port";
@@ -78,47 +80,44 @@ public class Configuration extends Properties {
 
   private Properties conf;
 
+  private boolean collectionsSetup = false;
+
   private Configuration() {
     try {
       conf = new Properties();
       String databaseConnectionString = System.getenv(DATABASE_ENV);
+      Loader loader = null;
 
       if (null == databaseConnectionString) {
-        loadConfigurationFromFile();
+        loader = new FileLoader(this);
       } else {
-        DatabaseLoader loader = new DatabaseLoader(this, databaseConnectionString);
-        loader.load();
+        loader = new DatabaseLoader(this, databaseConnectionString);
       }
+      loader.load();
 
-    } catch (Exception e) {
-      LOGGER.error("Could not load configuration");
+    } catch (ConfigurationException e) {
+      LOGGER.error(e.getMessage());
       System.exit(1);
     }
     setupCollections();
   }
 
-  private void loadConfigurationFromFile() throws IOException {
-    InputStream confFile = this.getClass().getClassLoader().getResourceAsStream(CONFIGURATION_FILE);
-    if (confFile != null) {
-      load(confFile);
-      LOGGER.info("Loaded " + CONFIGURATION_FILE + " from classpath.");
-    } else {
-      File f = new File(CONFIGURATION_FILE);
-      load(new FileInputStream(f));
-      LOGGER.info("Loaded " + CONFIGURATION_FILE + " from working directory.");
-    }
-  }
-
   private void setupCollections() {
+    if (true == collectionsSetup) {
+      return;
+    }
     adminUsers = getJIDArrayProperty(CONFIGURATION_ADMIN_USERS);
     autosubscribeChannels = getJIDArrayProperty(CONFIGURATION_CHANNELS_AUTOSUBSCRIBE);
+    collectionsSetup = true;
   }
 
   public Collection<JID> getAdminUsers() {
+    setupCollections();
     return adminUsers;
   }
 
   public Collection<JID> getAutosubscribeChannels() {
+    setupCollections();
     return autosubscribeChannels;
   }
 
@@ -154,10 +153,6 @@ public void putProperty(String key, String value) {
     conf.put(key, value);
   }
 
-  public void load(InputStream inputStream) throws IOException {
-    conf.load(inputStream);
-  }
-
   private Collection<String> getStringArrayProperty(String key) {
     String prop = getProperty(key);
 
@@ -277,4 +272,9 @@ public Object setProperty(String key, String value) {
   public void removeKey(String key) {
     conf.remove(key);
   }
+  
+  public void load(InputStream stream) throws IOException {
+    collectionsSetup = false;
+    conf.load(stream);
+  }
 }

src/main/java/org/buddycloud/channelserver/utils/configuration/ConfigurationException.java

@@ -0,0 +1,9 @@
+package org.buddycloud.channelserver.utils.configuration;
+
+public class ConfigurationException extends Exception {
+
+  public ConfigurationException(String message) {
+    super(message);
+  }
+
+}

src/main/java/org/buddycloud/channelserver/utils/configuration/DatabaseLoader.java

@@ -9,7 +9,7 @@
 import org.apache.log4j.Logger;
 import org.buddycloud.channelserver.Configuration;
 
-public class DatabaseLoader {
+public class DatabaseLoader implements Loader {
 
   private static final Logger LOGGER = Logger.getLogger(DatabaseLoader.class);
   private Configuration conf;
@@ -20,7 +20,7 @@ public DatabaseLoader(Configuration conf, String connectionString) {
     this.conf = conf;
   }
 
-  public void load() throws SQLException {
+  public void load() throws ConfigurationException {
 
     Connection connection = null;
     LOGGER.info("Loading configuration from database");
@@ -36,13 +36,15 @@ public void load() throws SQLException {
       this.conf.removeKey(Configuration.JDBC_USER);
       this.conf.removeKey(Configuration.JDBC_PASSWORD);
     } catch (SQLException e) {
-      e.printStackTrace();
-      e.getMessage();
-      LOGGER.error("Could not get configuration from database");
-      System.exit(1);
+      throw new ConfigurationException("Could not get configuration from database");
     } finally {
-      if (null != connection) {
+      if (null == connection) {
+          return;
+      }
+      try {
         connection.close();
+      } catch (SQLException e) {
+        throw new ConfigurationException("Could not get configuration from database");
       }
     }
   }

src/main/java/org/buddycloud/channelserver/utils/configuration/FileLoader.java

@@ -0,0 +1,43 @@
+package org.buddycloud.channelserver.utils.configuration;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
+
+public class FileLoader implements Loader {
+
+  private static final Logger LOGGER = Logger.getLogger(FileLoader.class);
+  
+  private static final String CONFIGURATION_FILE = "configuration.properties";
+  
+  private Configuration conf;
+
+  public FileLoader(Configuration conf) {
+    this.conf = conf;
+  }
+
+  public void load() throws ConfigurationException {
+    InputStream confFile = this.getClass().getClassLoader().getResourceAsStream(CONFIGURATION_FILE);
+    try {
+      if (confFile != null) {
+        readFile(confFile);
+        LOGGER.info("Loaded " + CONFIGURATION_FILE + " from classpath."); 
+      } else {
+        File f = new File(CONFIGURATION_FILE);
+        readFile(new FileInputStream(f));
+        LOGGER.info("Loaded " + CONFIGURATION_FILE + " from working directory.");
+      }
+    } catch (IOException e) {
+      throw new ConfigurationException("Could not load configuraton from file " + CONFIGURATION_FILE);
+    }
+  }
+
+  private void readFile(InputStream inputStream) throws IOException {
+    this.conf.load(inputStream);
+  }
+
+}

src/main/java/org/buddycloud/channelserver/utils/configuration/Loader.java

@@ -0,0 +1,7 @@
+package org.buddycloud.channelserver.utils.configuration;
+
+public interface Loader {
+
+  public void load() throws ConfigurationException;
+  
+}