Catalog alignment

[sdc.git] / common-app-api / src / main / java / org / openecomp / sdc / be / config / ConfigurationManager.java

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java
index 9920b59..0e9fd24 100644 (file)
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,121 +33,113 @@ import java.util.Map;
 
 public class ConfigurationManager implements FileChangeCallback, IEcompConfigurationManager {
 
+
+       ConfigurationSource configurationSource = null;
+       private static ConfigurationManager instance;
+
     @VisibleForTesting
     public ConfigurationManager() {
         super();
         instance = this;
     }
 
-    private ConfigurationSource configurationSource = null;
-    private static ConfigurationManager instance;
-
-    public Map<String, Object> getConfigurations() {
-        return configurations;
-    }
-
-    public void setConfigurations(Map<String, Object> configurations) {
-        this.configurations = configurations;
-    }
-
-    private Map<String, Object> configurations = new HashMap<>();
-
-    public ConfigurationManager(ConfigurationSource configurationSource) {
-        super();
-        this.configurationSource = configurationSource;
-        loadConfigurationFiles();
-        instance = this;
-    }
+    Map<String, Object> configurations = new HashMap<>();
+       public ConfigurationManager(ConfigurationSource configurationSource) {
+               super();
+               this.configurationSource = configurationSource;
+               loadConfigurationFiles();
+               instance = this;
+       }
 
-    private void loadConfigurationFiles() {
+       private void loadConfigurationFiles() {
 
-        loadConfigurationClass(Configuration.class);
-        loadConfigurationClass(ErrorConfiguration.class);
-        loadConfigurationClass(Neo4jErrorsConfiguration.class);
-        loadConfigurationClass(EcompErrorConfiguration.class);
-        loadConfigurationClass(DistributionEngineConfiguration.class);
-    }
+               loadConfigurationClass(Configuration.class);
+               loadConfigurationClass(ErrorConfiguration.class);
+               loadConfigurationClass(Neo4jErrorsConfiguration.class);
+               loadConfigurationClass(EcompErrorConfiguration.class);
+               loadConfigurationClass(DistributionEngineConfiguration.class);
+       }
 
-    private <T extends BasicConfiguration> void loadConfigurationClass(Class<T> clazz) {
-        ConfigurationListener configurationListener = new ConfigurationListener(clazz, this);
+       private <T extends BasicConfiguration> void loadConfigurationClass(Class<T> clazz) {
+               ConfigurationListener configurationListener = new ConfigurationListener(clazz, this);
 
-        T object = configurationSource.getAndWatchConfiguration(clazz, configurationListener);
+               T object = configurationSource.getAndWatchConfiguration(clazz, configurationListener);
 
-        configurations.put(getKey(clazz), object);
-    }
+               configurations.put(getKey(clazz), object);
+       }
 
-    private <T> String getKey(Class<T> class1) {
+       private <T> String getKey(Class<T> class1) {
 
-        return class1.getSimpleName();
+               return class1.getSimpleName();
 
-    }
+       }
 
-    public Configuration getConfiguration() {
+       public Configuration getConfiguration() {
 
-        return (Configuration) configurations.get(getKey(Configuration.class));
+               return (Configuration) configurations.get(getKey(Configuration.class));
 
-    }
+       }
 
-    public void setConfiguration(Configuration configuration) {
+       public void setConfiguration(Configuration configuration) {
 
-        configurations.put(getKey(Configuration.class), configuration);
+               configurations.put(getKey(Configuration.class), configuration);
 
-    }
+       }
 
-    public void setErrorConfiguration(ErrorConfiguration configuration) {
+       public void setErrorConfiguration(ErrorConfiguration configuration) {
 
-        configurations.put(getKey(ErrorConfiguration.class), configuration);
+               configurations.put(getKey(ErrorConfiguration.class), configuration);
 
-    }
+       }
 
-    public ErrorConfiguration getErrorConfiguration() {
+       public ErrorConfiguration getErrorConfiguration() {
 
-        return (ErrorConfiguration) configurations.get(getKey(ErrorConfiguration.class));
+               return (ErrorConfiguration) configurations.get(getKey(ErrorConfiguration.class));
 
-    }
+       }
 
-    public Neo4jErrorsConfiguration getNeo4jErrorsConfiguration() {
-        return (Neo4jErrorsConfiguration) configurations.get(getKey(Neo4jErrorsConfiguration.class));
-    }
+       public Neo4jErrorsConfiguration getNeo4jErrorsConfiguration() {
+               return (Neo4jErrorsConfiguration) configurations.get(getKey(Neo4jErrorsConfiguration.class));
+       }
 
-    @Override
-    public EcompErrorConfiguration getEcompErrorConfiguration() {
+       @Override
+       public EcompErrorConfiguration getEcompErrorConfiguration() {
 
-        return (EcompErrorConfiguration) configurations.get(getKey(EcompErrorConfiguration.class));
+               return (EcompErrorConfiguration) configurations.get(getKey(EcompErrorConfiguration.class));
 
-    }
+       }
 
-    public Configuration getConfigurationAndWatch(ConfigurationListener configurationListener) {
+       public Configuration getConfigurationAndWatch(ConfigurationListener configurationListener) {
 
-        if (configurationListener != null) {
+               if (configurationListener != null) {
 
-            configurationSource.addWatchConfiguration(Configuration.class, configurationListener);
+                       configurationSource.addWatchConfiguration(Configuration.class, configurationListener);
 
-        }
-        return (Configuration) configurations.get(getKey(Configuration.class));
+               }
+               return (Configuration) configurations.get(getKey(Configuration.class));
 
-    }
+       }
 
-    public static ConfigurationManager getConfigurationManager() {
-        return instance;
-    }
+       public static ConfigurationManager getConfigurationManager() {
+               return instance;
+       }
 
     public void reconfigure(BasicConfiguration obj) { }
 
-    /**
-     * FOR TEST ONLY
-     *
-     * @param ecompErrorConfiguration
-     */
-    public void setEcompErrorConfiguration(EcompErrorConfiguration ecompErrorConfiguration) {
+       /**
+        * FOR TEST ONLY
+        * 
+        * @param ecompErrorConfiguration
+        */
+       public void setEcompErrorConfiguration(EcompErrorConfiguration ecompErrorConfiguration) {
 
-        configurations.put(getKey(EcompErrorConfiguration.class), ecompErrorConfiguration);
+               configurations.put(getKey(EcompErrorConfiguration.class), ecompErrorConfiguration);
 
-    }
+       }
 
-    public DistributionEngineConfiguration getDistributionEngineConfiguration() {
+       public DistributionEngineConfiguration getDistributionEngineConfiguration() {
 
-        return (DistributionEngineConfiguration) configurations.get(getKey(DistributionEngineConfiguration.class));
+               return (DistributionEngineConfiguration) configurations.get(getKey(DistributionEngineConfiguration.class));
 
-    }
+       }
 }