Avoid powermock/powermock#958

dockstore · Apr 2, 2019 · d83004b · d83004b
1 parent b614ca9
commit d83004b
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/dockstore-client/src/main/java/io/dockstore/client/cli/nested/ToolClient.java b/dockstore-client/src/main/java/io/dockstore/client/cli/nested/ToolClient.java
@@ -19,7 +19,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -125,7 +124,7 @@ public boolean processEntrySpecificCommands(List<String> args, String activeComm
     }
 
     private static void printToolList(List<DockstoreTool> containers) {
-        containers.sort(new ToolComparator());
+        containers.sort((c1, c2) -> c1.getPath().compareToIgnoreCase(c2.getPath()));
 
         int[] maxWidths = columnWidthsTool(containers);
 
@@ -160,7 +159,7 @@ private static void printToolList(List<DockstoreTool> containers) {
     }
 
     private static void printPublishedList(List<DockstoreTool> containers) {
-        containers.sort(new ToolComparator());
+        containers.sort((c1, c2) -> c1.getPath().compareToIgnoreCase(c2.getPath()));
 
         int[] maxWidths = columnWidthsTool(containers);
 
@@ -1272,16 +1271,6 @@ private static void printRegistriesAvailable() {
             }
         }
     }
-
-    private static class ToolComparator implements Comparator<DockstoreTool> {
-        @Override
-        public int compare(DockstoreTool c1, DockstoreTool c2) {
-            String path1 = c1.getPath();
-            String path2 = c2.getPath();
-
-            return path1.compareToIgnoreCase(path2);
-        }
-    }
 }