diff options
| author |   emartin <ephraim.martin@est.tech> | 2019-05-07 10:41:55 +0000 |
|---|---|---|
| committer | emartin <ephraim.martin@est.tech> | 2019-05-07 10:41:55 +0000 |
| commit | 91c6030d8b892c5773085692d7e9abf51e087e1a (patch) | |
| tree | 68d135b70bf38f16aaaf7a3b58c01be21afce4ff | |
| parent | d5f3810292e6c85d123de7aa28fa0c860a21c183 (diff) | |
Fix invocationId usage, trim whitespaces from VES
*Set InvocationId from existing component
*Remove extra whitespaces from output VES
Change-Id: Ib3221ddc0dcf917828bfccfd05bd66de6cb0dac5
Issue-ID: DCAEGEN2-1460
Signed-off-by: emartin <ephraim.martin@est.tech>
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java | 7 | ||||
| -rw-r--r-- | src/main/resources/mapping.ftl | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 8 insertions, 5 deletions
@@ -26,7 +26,7 @@ <groupId>org.onap.dcaegen2.services</groupId> <artifactId>pm-mapper</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <parent> <groupId>org.onap.oparent</groupId> diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java index c8e29f3..ba57387 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java @@ -89,7 +89,8 @@ public class RequestSender { * @throws Exception
*/
public String send(String method, final String urlString, final String body, final String encodedCredentials) throws Exception {
- final UUID invocationID = logger.invoke(ONAPLogConstants.InvocationMode.SYNCHRONOUS);
+ String invocationID = Optional.ofNullable((String)MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID))
+ .orElse(logger.invoke(ONAPLogConstants.InvocationMode.SYNCHRONOUS).toString());
String requestID = Optional.ofNullable((String)MDC.get(ONAPLogConstants.MDCs.REQUEST_ID))
.orElse( UUID.randomUUID().toString());
String result = "";
@@ -134,11 +135,11 @@ public class RequestSender { return result;
}
- private HttpURLConnection getHttpURLConnection(String method, URL url, UUID invocationID, String requestID) throws IOException {
+ private HttpURLConnection getHttpURLConnection(String method, URL url, String invocationID, String requestID) throws IOException {
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setReadTimeout(DEFAULT_READ_TIMEOUT);
connection.setRequestProperty(ONAPLogConstants.Headers.REQUEST_ID, requestID);
- connection.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID, invocationID.toString());
+ connection.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID, invocationID);
connection.setRequestProperty(ONAPLogConstants.Headers.PARTNER_NAME, MapperConfig.CLIENT_NAME);
connection.setRequestMethod(method);
diff --git a/src/main/resources/mapping.ftl b/src/main/resources/mapping.ftl index 6743a5a..ca6fce8 100644 --- a/src/main/resources/mapping.ftl +++ b/src/main/resources/mapping.ftl @@ -18,6 +18,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> +<#compress> <#assign fileHeader = xml.measCollecFile.fileHeader> <#assign fileFooter = xml.measCollecFile.fileFooter> <#assign measData = xml.measCollecFile.measData> @@ -129,3 +130,4 @@ "measDataCollection": <@measDataCollection/> } </#macro> +</#compress>
\ No newline at end of file diff --git a/version.properties b/version.properties index 32acbf9..99f53cd 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1 -minor=0 +minor=1 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} |