Removing the redundant configuration reader in the distributed datastore.

Having a common configuration reader in the clustering common for use
by both distributed datastore and remote rpc.

Change-Id: Id40295301d76dad40189fb45ffc2917260ba2925
Signed-off-by: kalaiselvik <Kalaiselvi_K@Dell.com>

diff --git a/java/org/opendaylight/controller/cluster/common/actor/DefaultAkkaConfigurationReader.java b/java/org/opendaylight/controller/cluster/common/actor/FileAkkaConfigurationReader.java
similarity index 60%
rename from java/org/opendaylight/controller/cluster/common/actor/DefaultAkkaConfigurationReader.java
rename to java/org/opendaylight/controller/cluster/common/actor/FileAkkaConfigurationReader.java
index 2cdf15ad12f63816387bd23b4e64780e3cdb2e09..384ba81526329748b98e82e3287c7ade905c5ecb 100644 (file)
--- a/java/org/opendaylight/controller/cluster/common/actor/DefaultAkkaConfigurationReader.java
+++ b/java/org/opendaylight/controller/cluster/common/actor/FileAkkaConfigurationReader.java
@@ -11,16 +11,15 @@ package org.opendaylight.controller.cluster.common.actor;
 import com.google.common.base.Preconditions;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-
 import java.io.File;
 
-public class DefaultAkkaConfigurationReader implements AkkaConfigurationReader {
-    public static final String AKKA_CONF_PATH = "./configuration/initial/akka.conf";
+public class FileAkkaConfigurationReader implements AkkaConfigurationReader {
+    private static final String DEFAULT_AKKA_CONF_PATH = "./configuration/initial/akka.conf";
 
     @Override public Config read() {
-        File defaultConfigFile = new File(AKKA_CONF_PATH);
-        Preconditions.checkState(defaultConfigFile.exists(), "akka.conf is missing");
-        return ConfigFactory.parseFile(defaultConfigFile);
+        File configFile = new File(DEFAULT_AKKA_CONF_PATH);
+        Preconditions.checkState(configFile.exists(), "%s is missing", configFile);
+        return ConfigFactory.parseFile(configFile);
 
     }
 }