diff options
3 files changed, 19 insertions, 6 deletions
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties index cc887d8b1..5c78c253f 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -210,3 +210,4 @@ scheduler.server.url=http://BYO.scheduler:8989/scheduler scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/ +scheduler.basic.auth= diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties index 345d041b0..2af6798d2 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties @@ -149,4 +149,4 @@ mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT} mso.dme2.client.read.timeout=${MSO_DME2_CLIENT_READ_TIMEOUT} mso.dme2.server.url=${MSO_DME2_SERVER_URL} mso.dme2.enabled=${MSO_DME2_ENABLED} -scheduler.basic.auth= +scheduler.basic.auth=${SCHEDULER_BASIC_AUTH} diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java index 2c55265b5..562182a3c 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java @@ -8,9 +8,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,12 +21,16 @@ package org.onap.vid.mso; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import io.joshworks.restclient.http.HttpResponse; +import org.apache.commons.lang3.exception.ExceptionUtils; -import java.util.Objects; public class MsoUtil { + final static ObjectMapper objectMapper = new ObjectMapper(); + private MsoUtil() { } @@ -36,11 +40,19 @@ public class MsoUtil { return new MsoResponseWrapper(status, response); } - public static <T> MsoResponseWrapper wrapResponse(HttpResponse<T> httpResponse) { + public static <T> MsoResponseWrapper wrapResponse(HttpResponse<T> httpResponse) { MsoResponseWrapper msoResponseWrapper = new MsoResponseWrapper(); msoResponseWrapper.setStatus(httpResponse.getStatus()); if (httpResponse.getRawBody() != null) { - msoResponseWrapper.setEntity(Objects.toString(httpResponse.getBody())); + try { + T body = httpResponse.getBody(); + String entityStr = body instanceof String ? (String) body : objectMapper.writeValueAsString(httpResponse.getBody()); + msoResponseWrapper.setEntity(entityStr); + } + catch(JsonProcessingException e) + { + ExceptionUtils.rethrow(e); + } } return msoResponseWrapper; } |