From 1af5b893812574be9cd67eefb2e382f623bcdb3f Mon Sep 17 00:00:00 2001 From: Rina Roi Date: Mon, 22 Jul 2019 13:03:41 +0300 Subject: Add `X-ONAP-PartnerName` header to all MSO requests Issue-ID: VID-531 Change-Id: Ia6416c9da031cbca5d7a13cd93bb110bfc4bc1a2 Signed-off-by: Rina Roi --- .../org/onap/vid/mso/rest/MsoRestClientNew.java | 2 ++ .../onap/vid/mso/rest/RequestDetailsWrapper.java | 32 ++++++---------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java index c039e0078..06ca7a9d3 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java @@ -62,6 +62,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf * The Constant dateFormat. */ public static final String X_FROM_APP_ID = "X-FromAppId"; + public static final String X_ONAP_PARTNER_NAME = "X-ONAP-PartnerName"; final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS"); private static final String START = " start"; private final SyncRestClient client; @@ -543,6 +544,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf map.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON); map.put(X_FROM_APP_ID, systemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME)); map.put(SystemProperties.ECOMP_REQUEST_ID, Logging.extractOrGenerateRequestId()); + map.put(X_ONAP_PARTNER_NAME, "VID"); return ImmutableMap.copyOf(map); } diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestDetailsWrapper.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestDetailsWrapper.java index d093a5ba2..9d173490b 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestDetailsWrapper.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestDetailsWrapper.java @@ -3,48 +3,32 @@ * VID * ================================================================================ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -/* - * ============LICENSE_START========================================== - * =================================================================== * Modifications Copyright (C) 2018 - 2019 Nokia. All rights reserved. - * =================================================================== + * ================================================================================ * 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 + * 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. * See the License for the specific language governing permissions and * limitations under the License. - * ============LICENSE_END============================================ - * - * + * ============LICENSE_END========================================================= */ package org.onap.vid.mso.rest; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + public final class RequestDetailsWrapper { private final RequestDetails requestDetails; - public RequestDetailsWrapper(RequestDetails requestDetails) { + @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) + public RequestDetailsWrapper(@JsonProperty("requestDetails") RequestDetails requestDetails) { this.requestDetails = requestDetails; } -- cgit 1.2.3-korg