refactor 451

fishercoder1534 · fishercoder1534 · commit 7a249edd478c · 2019-04-13T08:34:20.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_451.java b/src/main/java/com/fishercoder/solutions/_451.java
@@ -50,19 +50,21 @@
  */
 public class _451 {
 
-    public String frequencySort(String s) {
-        Map<Character, Integer> map = new HashMap();
-        for (char c : s.toCharArray()) {
-            map.put(c, map.getOrDefault(c, 0) + 1);
-        }
-        List<Map.Entry<Character, Integer>> list = new ArrayList<>(map.entrySet());
-        Collections.sort(list, (o1, o2) -> (o2.getValue() - o1.getValue()));
-        StringBuilder stringBuilder = new StringBuilder();
-        for (Map.Entry<Character, Integer> entry : list) {
-            for (int i = 0; i < entry.getValue(); i++) {
-                stringBuilder.append(entry.getKey());
+    public static class Solution1 {
+        public String frequencySort(String s) {
+            Map<Character, Integer> map = new HashMap();
+            for (char c : s.toCharArray()) {
+                map.put(c, map.getOrDefault(c, 0) + 1);
+            }
+            List<Map.Entry<Character, Integer>> list = new ArrayList<>(map.entrySet());
+            Collections.sort(list, (o1, o2) -> (o2.getValue() - o1.getValue()));
+            StringBuilder stringBuilder = new StringBuilder();
+            for (Map.Entry<Character, Integer> entry : list) {
+                for (int i = 0; i < entry.getValue(); i++) {
+                    stringBuilder.append(entry.getKey());
+                }
             }
+            return stringBuilder.toString();
         }
-        return stringBuilder.toString();
     }
 }
diff --git a/src/test/java/com/fishercoder/_451Test.java b/src/test/java/com/fishercoder/_451Test.java
@@ -11,14 +11,14 @@
  * Created by fishercoder on 1/15/17.
  */
 public class _451Test {
-    private static _451 test;
+    private static _451.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String input;
 
     @BeforeClass
     public static void setup() {
-        test = new _451();
+        solution1 = new _451.Solution1();
     }
 
     @Before
@@ -31,23 +31,23 @@ public void setupForEachTest() {
     public void test1() {
         input = "tree";
         expected = "eert";
-        actual = test.frequencySort(input);
+        actual = solution1.frequencySort(input);
         assertEquals(expected, actual);
     }
 
     @Test
     public void test2() {
         input = "cccaaa";
         expected = "aaaccc";
-        actual = test.frequencySort(input);
+        actual = solution1.frequencySort(input);
         assertEquals(expected, actual);
     }
 
     @Test
     public void test3() {
         input = "Aabb";
         expected = "bbAa";
-        actual = test.frequencySort(input);
+        actual = solution1.frequencySort(input);
         assertEquals(expected, actual);
     }
 }
