Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 59 insertions, 2 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/probes/HttpRequestMetadata.java b/vid-app-common/src/main/java/org/onap/vid/model/probes/HttpRequestMetadata.java
index e80d563bf..08bed397e 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/probes/HttpRequestMetadata.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/probes/HttpRequestMetadata.java
@@ -1,12 +1,20 @@
 package org.onap.vid.model.probes;
 
+import com.google.common.base.MoreObjects;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.vid.aai.ExceptionWithRequestInfo;
+import org.onap.vid.aai.ResponseWithRequestInfo;
+import org.onap.vid.mso.RestObjectWithRequestInfo;
+import org.onap.vid.utils.Logging;
 import org.springframework.http.HttpMethod;
 
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+
 public class HttpRequestMetadata extends StatusMetadata {
     private final HttpMethod httpMethod;
     private final int httpCode;
     private final String url;
-    private final String rawData;
+    private String rawData = "";
 
     public HttpRequestMetadata(HttpMethod httpMethod, int httpCode, String url, String rawData, String description, long duration) {
         super(description, duration);
@@ -16,6 +24,43 @@ public class HttpRequestMetadata extends StatusMetadata {
         this.rawData = rawData;
     }
 
+    public HttpRequestMetadata(ResponseWithRequestInfo response, String description, long duration) {
+        this(response, description, duration, true);
+    }
+
+    public HttpRequestMetadata(RestObjectWithRequestInfo response, String description, long duration) {
+        super(description, duration);
+        this.httpMethod = response.getHttpMethod();
+        this.url = response.getRequestedUrl();
+        this.httpCode = response.getHttpCode();
+        this.rawData = response.getRawData();
+    }
+
+    public HttpRequestMetadata(ResponseWithRequestInfo response, String description, long duration, boolean readRawData) {
+        super(description, duration);
+        this.httpMethod = response.getRequestHttpMethod();
+        this.url = response.getRequestUrl();
+        this.httpCode = response.getResponse().getStatus();
+        if (readRawData) {
+            try {
+                this.rawData = response.getResponse().readEntity(String.class);
+            } catch (Exception e) {
+                //Nothing to do here
+            }
+        }
+    }
+
+    public HttpRequestMetadata(ExceptionWithRequestInfo exception, long duration) {
+        this(exception.getHttpMethod(),
+                defaultIfNull(exception.getHttpCode(), 0),
+                exception.getRequestedUrl(),
+                exception.getRawData(),
+                Logging.exceptionToDescription(exception.getCause()),
+                duration);
+    }
+
+
+
     public HttpMethod getHttpMethod() {
         return httpMethod;
     }
@@ -29,6 +74,18 @@ public class HttpRequestMetadata extends StatusMetadata {
     }
 
     public String getRawData() {
-        return rawData;
+        return StringUtils.substring(rawData, 0, 500);
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("httpMethod", httpMethod)
+                .add("httpCode", httpCode)
+                .add("url", url)
+                .add("duration", duration)
+                .add("description", description)
+                .add("rawData", rawData)
+                .toString();
     }
 }