[Engine-patches] Change in ovirt-engine[master]: engine: simplify AppConfig

[lhornyak]

Laszlo Hornyak has uploaded a new change for review.

Change subject: engine: simplify AppConfig
......................................................................

engine: simplify AppConfig

Since AppConfig does not have any subclasses, it's type parameter can be
removed.

Change-Id: If47b802876ec0b6021f2c3fdb73ba147749f3993
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
M 
backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java
M 
backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
2 files changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/15720/1

diff --git 
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java
 
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java
index 4902e9b..a4b9db4 100644
--- 
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java
+++ 
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java
@@ -6,13 +6,10 @@
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
-public class AppConfig<T extends PropertiesConfiguration> extends 
ConfigFile<T> {
+public class AppConfig extends ConfigFile<PropertiesConfiguration> {
 
     private static final String CONFIG_CONF = "engine-config.conf";
     private PropertiesConfiguration configFile;
-    private final String[] defaultFileLocations = new String[] {
-        new File(EngineConfig.DEFAULT_CONFIG_PATH, 
CONFIG_CONF).getAbsolutePath()
-    };
 
     public AppConfig(String optionalConfigDir) throws FileNotFoundException, 
ConfigurationException {
         File file = locate(optionalConfigDir);
@@ -20,8 +17,8 @@
     }
 
     @Override
-    public T getFile() {
-        return (T) configFile;
+    public PropertiesConfiguration getFile() {
+        return configFile;
     }
 
     @Override
diff --git 
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
 
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
index 8385ae8..34ff7b6 100644
--- 
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
+++ 
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
@@ -14,7 +14,6 @@
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.SubnodeConfiguration;
 import org.apache.commons.configuration.tree.ConfigurationNode;
 import org.apache.commons.lang.StringUtils;
@@ -58,7 +57,7 @@
      */
     private void init() throws Exception {
         log.debug("init: beginning initiation of EngineConfigLogic");
-        appConfig = new 
AppConfig<PropertiesConfiguration>(parser.getAlternateConfigFile()).getFile();
+        appConfig = new AppConfig(parser.getAlternateConfigFile()).getFile();
         keysConfig = new 
KeysConfig<HierarchicalConfiguration>(parser.getAlternatePropertiesFile()).getFile();
         populateAlternateKeyMap(keysConfig);
         ConfigKeyFactory.init(keysConfig, alternateKeysMap, parser);


-- 
To view, visit http://gerrit.ovirt.org/15720
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If47b802876ec0b6021f2c3fdb73ba147749f3993
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches