Swap Collection.sort with list.sort

Change-Id: Id56bcc3ad3696b5068b9465e9951f211ac467cb3
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index e0f338e..591db35 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -419,30 +419,30 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
                                 toscaResourceStruct.getSdcCsarHelper().getVfModulesByVf(vfCustomizationUUID);\r
                         logger.debug("vfGroups:" + vfGroups.toString());\r
 \r
-                        Collections.sort(vfGroups, new Comparator<org.openecomp.sdc.toscaparser.api.Group>() {\r
+                        vfGroups.sort(new Comparator<Group>() {\r
 \r
                             @Override\r
-                            public int compare(org.openecomp.sdc.toscaparser.api.Group group1,\r
-                                    org.openecomp.sdc.toscaparser.api.Group group2) {\r
+                            public int compare(Group group1,\r
+                                Group group2) {\r
 \r
                                 // Field name1Field = group1.class.getDeclaredField("name");\r
                                 // name1Field.setAccessible(true);\r
                                 String thisName = group1.getName(); // (String)\r
-                                                                    // name1Field.get(group1);\r
+                                // name1Field.get(group1);\r
                                 String thatName = group2.getName(); // (String)\r
-                                                                    // name1Field.get(group2);\r
+                                // name1Field.get(group2);\r
 \r
                                 Matcher m = lastDigit.matcher(thisName);\r
                                 Matcher m2 = lastDigit.matcher(thatName);\r
 \r
                                 String thisDigit = "0";\r
                                 String thatDigit = "0";\r
-                                if(m.find()) {\r
+                                if (m.find()) {\r
                                     thisDigit = m.group();\r
                                 } else {\r
                                     return -1;\r
                                 }\r
-                                if(m2.find()) {\r
+                                if (m2.find()) {\r
                                     thatDigit = m2.group();\r
                                 } else {\r
                                     return 1;\r

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index c556dda..97e1443 100644 (file)
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -1195,7 +1195,7 @@ public class CatalogDatabase implements Closeable {
             return null;
         }
 
-        Collections.sort(resultList, new MavenLikeVersioningComparator());
+        resultList.sort(new MavenLikeVersioningComparator());
         Collections.reverse(resultList);
 
         LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getVnfRecipe", null);
@@ -4576,7 +4576,7 @@ public class CatalogDatabase implements Closeable {
                 return null;
             }
 
-            Collections.sort (resultList, new MavenLikeVersioningComparator ());
+            resultList.sort(new MavenLikeVersioningComparator());
             Collections.reverse (resultList);
 
             return resultList.get (0);
@@ -5161,7 +5161,7 @@ public class CatalogDatabase implements Closeable {
                 return null;
             }
 
-            Collections.sort (resultList, new MavenLikeVersioningComparator ());
+            resultList.sort(new MavenLikeVersioningComparator());
             Collections.reverse (resultList);
 
             return resultList.get (0);

diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java
index 3dddb17..c99a714 100644 (file)
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java
+++ b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java
@@ -167,7 +167,7 @@ public class MavenVersioningTest {
                list.add(test11);
                list.add(test12);
                
-               Collections.sort(list,new MavenLikeVersioningComparator());
+               list.sort(new MavenLikeVersioningComparator());
                //Collections.reverse(list);
                assertTrue(list.get(0).getVersion().equals("0.02"));
                assertTrue(list.get(1).getVersion().equals("1.1"));