From e6c30425575cd76a3955b03ab389150ed74fbb1d Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Sun, 1 Sep 2019 15:02:06 +0300 Subject: handle non OK response from SDC while getting model Issue-ID: VID-378 Signed-off-by: Eylon Malin Change-Id: Idc6e587abb24fbec65ed159db7008e50abee2581 --- .../java/org/onap/vid/model/probes/HttpRequestMetadata.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/model/probes/HttpRequestMetadata.java') 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 984c0d766..0e7e914f1 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 @@ -22,10 +22,9 @@ package org.onap.vid.model.probes; import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; +import static org.onap.vid.client.UnirestPatchKt.extractRawAsString; import com.google.common.base.MoreObjects; -import java.nio.charset.StandardCharsets; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.onap.vid.aai.ExceptionWithRequestInfo; import org.onap.vid.aai.HttpResponseWithRequestInfo; @@ -89,16 +88,10 @@ public class HttpRequestMetadata extends StatusMetadata { this.url = response.getRequestUrl(); this.httpCode = response.getResponse().getStatus(); if (readRawData) { - try { - response.getResponse().getRawBody().reset(); - this.rawData = IOUtils.toString(response.getResponse().getRawBody(), StandardCharsets.UTF_8.name()); - } catch (Exception e) { - //Nothing to do here - } + this.rawData = extractRawAsString(response.getResponse()); } } - public HttpMethod getHttpMethod() { return httpMethod; } -- cgit 1.2.3-korg