Preparing simulator for INT-607

Change-Id: If959c642cab71694f3a8e49d8d561a870159eacc
Issue-ID: INT-607
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index b71af20..0136a27 100644 (file)
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -111,11 +111,6 @@
       <artifactId>jnc</artifactId>
       <version>1.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.onosproject</groupId>
-      <artifactId>jnc</artifactId>
-      <version>1.0</version>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -141,21 +136,18 @@
       <version>${junit.vintage.version}</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <version>3.9.1</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>
       <version>0.9.0</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java
index c38ac3e..291e9d9 100644 (file)
--- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java
+++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java
@@ -33,10 +33,6 @@ public class HttpClientAdapterImpl implements HttpClientAdapter {
 
     private HttpClient client;
 
-    public HttpClientAdapterImpl(HttpClient client) {
-        this.client = client;
-    }
-
     public HttpClientAdapterImpl() {
         this.client = HttpClientBuilder
             .create()
@@ -55,6 +51,10 @@ public class HttpClientAdapterImpl implements HttpClientAdapter {
         }
     }
 
+    HttpClientAdapterImpl(HttpClient client) {
+        this.client = client;
+    }
+
     private HttpPost createRequest(String content, String url) throws UnsupportedEncodingException {
         HttpPost request = new HttpPost(url);
         StringEntity stringEntity = new StringEntity(content);