Refactor for Sonar smells and code coverage
Various code formatting and style fixes (to address Sonar code smells).
Introduce a BabelServiceClientException to replace the use of the base
Exception class.
Make both the BabelServiceClient class and its Factory class use an
interface, to allow for Spring injection (using annotations) and for
simplified mocking.
Refactor the Notification Publishing by making this the responsibility
of the main Service classes and not the deployment manager.
Issue-ID: AAI-1207
Change-Id: I6bf8a504fa7b98e9158c9976fd1d88c6c54027c1
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
diff --git a/pom.xml b/pom.xml
index e7d3470..ae5e7cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
<hamcrest-all.version>1.3</hamcrest-all.version>
<babel.version>1.2.0</babel.version>
<aai.rest.client.version>1.2.1</aai.rest.client.version>
+ <sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
<logback.version>1.2.3</logback.version>
</properties>
@@ -104,28 +105,6 @@
</dependency>
<!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>${hamcrest-all.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
- <version>2.6.2</version>
- <scope>compile</scope>
- </dependency>
<!-- https://mvnrepository.com/artifact/com.mikesamuel/json-sanitizer -->
<dependency>
<groupId>com.mikesamuel</groupId>
@@ -152,7 +131,7 @@
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
- <version>1.3.0</version>
+ <version>${sdc-distribution-client.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -182,6 +161,29 @@
<artifactId>commons-text</artifactId>
<version>${apache.commons-text.version}</version>
</dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest-all.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins and repositories -->