Remove unused Neo4jErrorsConfiguration

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ib9aa060057718144766c6061823bbae076647fca
Issue-ID: SDC-4532

5 files changed, 14 insertions, 137 deletions

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 7241decd62..4ff8da7760 100644
--- 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
@@ -58,7 +58,6 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura
     private void loadConfigurationFiles() {
         loadConfigurationClass(Configuration.class);
         loadConfigurationClass(ErrorConfiguration.class);
-        loadConfigurationClass(Neo4jErrorsConfiguration.class);
         loadConfigurationClass(EcompErrorConfiguration.class);
         loadConfigurationClass(DistributionEngineConfiguration.class);
     }
@@ -78,8 +77,8 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura
         configurations.put(getKey(clazz), object);
     }
 
-    private <T> String getKey(Class<T> class1) {
-        return class1.getSimpleName();
+    private <T> String getKey(Class<T> clazz) {
+        return clazz.getSimpleName();
     }
 
     public Configuration getConfiguration() {
@@ -98,10 +97,6 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura
         configurations.put(getKey(ErrorConfiguration.class), configuration);
     }
 
-    public Neo4jErrorsConfiguration getNeo4jErrorsConfiguration() {
-        return (Neo4jErrorsConfiguration) configurations.get(getKey(Neo4jErrorsConfiguration.class));
-    }
-
     @Override
     public EcompErrorConfiguration getEcompErrorConfiguration() {
         return (EcompErrorConfiguration) configurations.get(getKey(EcompErrorConfiguration.class));
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Neo4jErrorsConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Neo4jErrorsConfiguration.java
deleted file mode 100644
index 835621fcf2..0000000000
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Neo4jErrorsConfiguration.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.sdc.be.config;
-
-import java.util.Map;
-import org.openecomp.sdc.common.api.BasicConfiguration;
-
-public class Neo4jErrorsConfiguration extends BasicConfiguration {
-
-    private Map<String, String> errors;
-
-    public Map<String, String> getErrors() {
-        return errors;
-    }
-
-    public void setErrors(Map<String, String> errors) {
-        this.errors = errors;
-    }
-
-    public String getErrorMessage(String key) {
-        return errors.get(key);
-    }
-
-    @Override
-    public String toString() {
-        return "Neo4jErrorsConfiguration [errors=" + errors + "]";
-    }
-}
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/impl/FSConfigurationSource.java b/common-app-api/src/main/java/org/openecomp/sdc/common/impl/FSConfigurationSource.java
index cbb2de7dbc..0d1df424b7 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/impl/FSConfigurationSource.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/impl/FSConfigurationSource.java
@@ -23,6 +23,7 @@ package org.openecomp.sdc.common.impl;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
 import org.openecomp.sdc.common.api.ConfigurationListener;
 import org.openecomp.sdc.common.api.ConfigurationSource;
 import org.openecomp.sdc.common.api.Constants;
@@ -35,18 +36,12 @@ import org.openecomp.sdc.exception.YamlConversionException;
  *
  * @author esofer
  */
+@AllArgsConstructor
 public class FSConfigurationSource implements ConfigurationSource {
 
-    private final YamlToObjectConverter yamlToObjectConverter = new YamlToObjectConverter();
     private final ConfigFileChangeListener changeListener;
     private final String appConfigDir;
 
-    public FSConfigurationSource(ConfigFileChangeListener changeListener, String appConfigDir) {
-        super();
-        this.changeListener = changeListener;
-        this.appConfigDir = appConfigDir;
-    }
-
     /**
      * convert camel case string to list of words separated by "-" where each word is in lower case format. For example, MyClass will be calculated to
      * be my-class.yaml .
@@ -71,7 +66,7 @@ public class FSConfigurationSource implements ConfigurationSource {
         final String configFileName = calculateFileName(className);
         T object;
         try {
-            object = yamlToObjectConverter.convert(this.appConfigDir, className, configFileName);
+            object = (new YamlToObjectConverter()).convert(this.appConfigDir, className, configFileName);
         } catch (final YamlConversionException e) {
             final String errorMsg = String.format("Could not load '%s' in '%s' for class '%s'", configFileName, appConfigDir, className);
             throw new LoadConfigurationException(errorMsg, e);
@@ -83,9 +78,8 @@ public class FSConfigurationSource implements ConfigurationSource {
     }
 
     public <T> void addWatchConfiguration(Class<T> className, ConfigurationListener configurationListener) {
-        String configFileName = calculateFileName(className);
-        if (configurationListener != null) {
-            changeListener.register(configFileName, configurationListener);
+        if (configurationListener != null && changeListener != null) {
+            changeListener.register(calculateFileName(className), configurationListener);
         }
     }
 }
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java
deleted file mode 100644
index 3ecc802fdb..0000000000
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nokia.
- * ================================================================================
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.config;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.Test;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanToString;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-
-
-public class Neo4jErrorsConfigurationTest {
-	@Test
-	public void validateBean() {
-		assertThat(Neo4jErrorsConfiguration.class, allOf(
-				hasValidBeanConstructor(),
-				hasValidGettersAndSettersExcluding(),
-				hasValidBeanToString()
-		));
-	}
-	@Test
-	public void testGetErrorMessage() {
-		final String testKey = "key";
-		final String testValue = "value";
-		Neo4jErrorsConfiguration neo4jErrorsConfiguration = new Neo4jErrorsConfiguration();
-		neo4jErrorsConfiguration.setErrors(Collections.singletonMap(testKey,testValue));
-
-		assertEquals(
-				neo4jErrorsConfiguration.getErrorMessage(testKey),
-				testValue
-		);
-	}
-}
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java
index b9116bb34d..78a4f8911a 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java
@@ -20,17 +20,17 @@
 
 package org.openecomp.sdc.common.impl;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ErrorConfiguration;
-import org.openecomp.sdc.be.config.Neo4jErrorsConfiguration;
 import org.openecomp.sdc.common.api.Constants;
 
-public class FSConfigurationSourceTest {
+class FSConfigurationSourceTest {
+
     @Test
-    public void calculateFileNameWhenSplitRequired() {
+    void calculateFileNameWhenSplitRequired() {
         Class<ErrorConfiguration> clazz = ErrorConfiguration.class;
 
         String expected = "error-configuration" + Constants.YAML_SUFFIX;
@@ -40,7 +40,7 @@ public class FSConfigurationSourceTest {
     }
 
     @Test
-    public void calculateFileNameWhenNoSplitRequired() {
+    void calculateFileNameWhenNoSplitRequired() {
         Class<Configuration> clazz = Configuration.class;
 
         String expected = "configuration" + Constants.YAML_SUFFIX;
@@ -49,13 +49,4 @@ public class FSConfigurationSourceTest {
         assertEquals(expected, actual);
     }
 
-    @Test
-    public void calculateFileNameWithCamelCaseAndDigits() {
-        Class<Neo4jErrorsConfiguration> clazz = Neo4jErrorsConfiguration.class;
-
-        String expected = "neo4j-errors-configuration" + Constants.YAML_SUFFIX;
-        String actual = FSConfigurationSource.calculateFileName(clazz);
-
-        assertEquals(expected, actual);
-    }
-}
\ No newline at end of file
+}