dcaegen2-services-pm-mapper incorrectly mapping the measResults

onap-gerrit-review: -capitalized-extension

Issue-ID: DCAEGEN2-3190
Signed-off-by: gururajarao79 <gb00566633@techmahindra.com>
Change-Id: I79376b9493bc38e20f6eb778241dc10de3aa920c

5 files changed, 18 insertions, 9 deletions

diff --git a/Changelog.md b/Changelog.md
index cf587f1..15eba2d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.0] - 2023/01/11
+### Changed
+- [DCAEGEN2-3190] Bug fix:
+  - PM-mapper is not able to map the input data from xml file from measType to measTypes.
+  - As it is taking the p value from the input xml, it is no longer sequential.
+
 ## [1.9.0] - 2022/05/13
 ### Changed
 - [DCAEGEN2-3218] Fix vulnerabilities:
diff --git a/pom.xml b/pom.xml
index f5999a5..8751c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,7 @@
    Copyright (C) 2019-2020 Nordix Foundation.
    Copyright (C) 2020-2022 Nokia. All rights reserved.
    Copyright (C) 2021 Samsung Electronics. All rights reserved.
+   Copyright (C) 2023 Deutsche Telekom AG. 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.
@@ -34,7 +35,7 @@
 
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>pm-mapper</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.10.0-SNAPSHOT</version>
 
 
     <name>dcaegen2-services-pm-mapper</name>
diff --git a/src/main/resources/templates/org.3GPP.28.532#measData b/src/main/resources/templates/org.3GPP.28.532#measData
index 8f86a78..cfcbb46 100644
--- a/src/main/resources/templates/org.3GPP.28.532#measData
+++ b/src/main/resources/templates/org.3GPP.28.532#measData
@@ -3,6 +3,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2019-2020 Nordix Foundation.
    Copyright (C) 2021 Samsung Electronics.
+   Copyright (C) 2023 Deutsche Telekom AG. 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.
@@ -56,7 +57,7 @@
 {
     "sMeasTypesList":[
      <#if measInfo.measType?has_content>
-       <#list measInfo.measType as measType>
+       <#list measInfo.measType?sort_by("number(@p)") as measType>
        "${measType}"<#sep>,</#sep>
        </#list>
      <#else>
@@ -77,9 +78,9 @@
         "suspectFlag": "${measValue.suspect[0]! "false"}",
         "measResults": [
         <#if measValue.r?has_content>
-        <#list measValue.r as r>
+        <#list measValue.r?sort_by("number(@p)") as r>
             {
-                "p": ${r.@p},
+                "p": ${r?index+1},
                 "sValue": "${r}"
             }<#sep>,</#sep>
         </#list>
diff --git a/src/main/resources/templates/org.3GPP.32.435#measCollec b/src/main/resources/templates/org.3GPP.32.435#measCollec
index 98fdd80..3ea88df 100644
--- a/src/main/resources/templates/org.3GPP.32.435#measCollec
+++ b/src/main/resources/templates/org.3GPP.32.435#measCollec
@@ -3,6 +3,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2019-2020 Nordix Foundation.
    Copyright (C) 2021 Samsung Electronics.
+   Copyright (C) 2023 Deutsche Telekom AG. 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.
@@ -56,7 +57,7 @@
 {
     "sMeasTypesList":[
      <#if measInfo.measType?has_content>
-       <#list measInfo.measType as measType>
+       <#list measInfo.measType?sort_by("number(@p)") as measType>
        "${measType}"<#sep>,</#sep>
        </#list>
      <#else>
@@ -77,9 +78,9 @@
         "suspectFlag": "${measValue.suspect[0]! "false"}",
         "measResults": [
         <#if measValue.r?has_content>
-        <#list measValue.r as r>
+        <#list measValue.r?sort_by("number(@p)") as r>
             {
-                "p": ${r.@p},
+                "p": ${r?index+1},
                 "sValue": "${r}"
             }<#sep>,</#sep>
         </#list>
@@ -131,4 +132,4 @@
     "measDataCollection": <@measDataCollection/>
 }
 </#macro>
-</#compress>
\ No newline at end of file
+</#compress>
diff --git a/version.properties b/version.properties
index a1653f6..e9e5596 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 major=1
-minor=9
+minor=10
 patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}