probe sdc by retrieving service model if uuid configured

If system.properties has value for probe.sdc.model.uuid then usd
this value for retrieving service model
otherwise probe only sdc connectivity with sdc2/rest/healthCheck

Issue-ID: VID-378
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: Icd1c31217e56a8c0cfa5c2f2bc5f11e0c8dd7ff8
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>

1 files changed, 9 insertions, 24 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/ResponseWithRequestInfo.java b/vid-app-common/src/main/java/org/onap/vid/aai/ResponseWithRequestInfo.kt
index 567099c81..aaa41c2d3 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/ResponseWithRequestInfo.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/ResponseWithRequestInfo.kt
@@ -18,32 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.vid.aai;
+package org.onap.vid.aai
 
-import org.springframework.http.HttpMethod;
+import io.joshworks.restclient.http.HttpResponse
+import org.springframework.http.HttpMethod
 
-import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response
 
-public class ResponseWithRequestInfo {
-    private String requestUrl;
-    private HttpMethod requestHttpMethod;
-    private Response response;
+open class BaseResponseWithRequestInfo(val requestUrl: String?, val requestHttpMethod: HttpMethod)
 
-    public ResponseWithRequestInfo(Response response, String requestUrl, HttpMethod requestHttpMethod) {
-        this.response = response;
-        this.requestUrl = requestUrl;
-        this.requestHttpMethod = requestHttpMethod;
-    }
+class HttpResponseWithRequestInfo<T>(val response: HttpResponse<T>?, requestUrl: String?, requestHttpMethod: HttpMethod) :
+        BaseResponseWithRequestInfo(requestUrl, requestHttpMethod)
 
-    public String getRequestUrl() {
-        return requestUrl;
-    }
-
-    public HttpMethod getRequestHttpMethod() {
-        return requestHttpMethod;
-    }
-
-    public Response getResponse() {
-        return response;
-    }
-}
+class ResponseWithRequestInfo(val response: Response?, requestUrl: String?, requestHttpMethod: HttpMethod) :
+        BaseResponseWithRequestInfo(requestUrl, requestHttpMethod)