Merge 'origin/casablanca' into master

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / onap / so / bpmn / common / scripts / MsoUtils.groovy

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
index f9ddd0d..4f0b530 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
@@ -287,14 +287,6 @@ class MsoUtils {
                        return null
                }
        }
-       def getRelationshipVal(node, name){
-               try{
-                       return node.'**'.find {it.'relationship-key'.text() == name}.'relationship-value'.text()
-               }catch(Exception e){
-                       return null
-               }
-       }
-
        
        def log(logmode,logtxt,isDebugLogEnabled="false"){
                if ("INFO"==logmode) {
@@ -939,7 +931,8 @@ class MsoUtils {
                 if (moduleIndexList == null || moduleIndexList.size() == 0) {                  
                         return "0"
                 }
-                def sortedModuleIndexList = moduleIndexList.sort { a, b -> a.compareTo b }
+                
+                def sortedModuleIndexList = moduleIndexList.sort{ a, b -> a as Integer <=> b as Integer}
                
                 for (i in 0..sortedModuleIndexList.size()-1) {
                         if (Integer.parseInt(sortedModuleIndexList[i]) != i) {