Extend probe mechanism

Fixes from latest review.
Introduce probe interface.
ResponseWithRequestInfo is not used - it belongs to aai package and requires javax.ws.rs.core.Response.

Fallback in aai client will be removed as soon as sdc provides https support (hopefully in El Alto).

Change-Id: I4527d447a273328d38ff2ef7f9d2a93453cec9f2
Issue-ID: VID-490
Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/AaiClientTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/AaiClientTest.java
index b98e20010..fdeeb0076 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/AaiClientTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/AaiClientTest.java
@@ -146,8 +146,8 @@ public class AaiClientTest {
                 new AaiResponseWithRequestInfo<>(
                         HttpMethod.GET, "url", new AaiResponse<>(subscribers, null, 200),
                         "rawData"));
-        Mockito.when(aaiClientMock.probeAaiGetAllSubscribers()).thenCallRealMethod();
-        ExternalComponentStatus result  = aaiClientMock.probeAaiGetAllSubscribers();
+        Mockito.when(aaiClientMock.probeComponent()).thenCallRealMethod();
+        ExternalComponentStatus result  = aaiClientMock.probeComponent();
         assertThat(statusDataReflected(result),is(statusDataReflected(expectedStatus)));
         assertThat(requestMetadataReflected(result.getMetadata()),is(requestMetadataReflected(expectedStatus.getMetadata())));
     }
@@ -278,8 +278,8 @@ public class AaiClientTest {
     }
 
     private ExternalComponentStatus callProbeAaiGetAllSubscribersAndAssertNotAvailable() {
-        Mockito.when(aaiClientMock.probeAaiGetAllSubscribers()).thenCallRealMethod();
-        ExternalComponentStatus result  = aaiClientMock.probeAaiGetAllSubscribers();
+        Mockito.when(aaiClientMock.probeComponent()).thenCallRealMethod();
+        ExternalComponentStatus result  = aaiClientMock.probeComponent();
         assertFalse(result.isAvailable());
         return result;
     }