Minor refactoring

Change-Id: Ib2dfbc9ea6ced47ba8455016adc5963d6ced92ef
Issue-ID: SO-4068
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

6 files changed, 52 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5814298
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+target
+**/.settings
+**/.classpath
+**/.project
+**/.buildpath
+**/.factorypath
+**/.springBeans
+**/.project
+**/.classpath
+.idea
+.checkstyle
+.DS_Store
+.*~
+*.iml
+**/logs/
+**/debug-logs/
+*.class
+*.swp
+*.log
+*.tmp
+**/bin/
+/tattletale/
+/.metadata/
+**/.sts4-cache
+**/.java-version
diff --git a/pom.xml b/pom.xml
index 3cd9f15..c7ba3c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,21 +17,6 @@
         <version.java.compiler>11</version.java.compiler>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <version-swagger-codegen>2.3.1</version-swagger-codegen>
-        <gson-fire-version>1.8.2</gson-fire-version>
-        <retrofit-version>2.7.2</retrofit-version>
-        <threetenbp-version>1.3.5</threetenbp-version>
-        <oltu-version>1.0.1</oltu-version>
-        <swagger-core-version>1.5.21</swagger-core-version>
-        <okhttp3-version>3.14.0</okhttp3-version>
-        <okhttp-version>2.7.5</okhttp-version>
-        <okio-version>1.13.0</okio-version>
-        <spring-security-oauth2-version>2.3.6.RELEASE</spring-security-oauth2-version>
-        <jaxb-api>2.3.0</jaxb-api>
-        <snakeyaml-version>0.11</snakeyaml-version>
-        <hamcrest-version>2.2</hamcrest-version>
-        <equalsverifier-version>3.4.1</equalsverifier-version>
-        <so-core-version>1.9.0-SNAPSHOT</so-core-version>
     </properties>
 
     <build>
diff --git a/so-cnf-adapter-application/.gitignore b/so-cnf-adapter-application/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/so-cnf-adapter-application/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/synchrornization/SubscriptionsRecoveryProvider.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/synchrornization/SubscriptionsRecoveryProvider.java
deleted file mode 100644
index 32feb78..0000000
--- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/synchrornization/SubscriptionsRecoveryProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.onap.so.adapters.cnf.service.synchrornization;
-
-import org.onap.so.client.exception.BadResponseException;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.Set;
-
-@Component
-@Primary
-public class SubscriptionsRecoveryProvider {
-
-    public Set<String> getInstanceList() throws BadResponseException {
-        return Collections.emptySet();
-    }
-}
\ No newline at end of file
diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/synchrornization/SubscriptionsRecoveryProviderConfiguration.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/synchrornization/SubscriptionsRecoveryProviderConfiguration.java
new file mode 100644
index 0000000..fe49a27
--- /dev/null
+++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/synchrornization/SubscriptionsRecoveryProviderConfiguration.java
@@ -0,0 +1,24 @@
+package org.onap.so.adapters.cnf.service.synchrornization;
+
+import java.util.Collections;
+import java.util.Set;
+import org.onap.so.client.exception.BadResponseException;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+@Configuration
+public class SubscriptionsRecoveryProviderConfiguration {
+
+    @Bean
+    @Primary
+    public SubscriptionsRecoveryProvider subscriptionsRecoveryProvider() {
+        return new SubscriptionsRecoveryProvider(null) {
+            @Override
+            public Set<String> getInstanceList() throws BadResponseException {
+                return Collections.emptySet();
+            }
+        };
+    }
+
+}
diff --git a/so-cnf-adapter-application/src/test/resources/application.properties b/so-cnf-adapter-application/src/test/resources/application.properties
index 154283c..cbbfef1 100644
--- a/so-cnf-adapter-application/src/test/resources/application.properties
+++ b/so-cnf-adapter-application/src/test/resources/application.properties
@@ -1,4 +1,5 @@
 aai.enabled=true
 aai.endpoint=http://localhost:8443
 aai.auth=5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C
-mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
\ No newline at end of file
+mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file