refactor 482

fishercoder1534 · fishercoder1534 · commit dc9bac192928 · 2019-05-09T07:22:27.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_482.java b/src/main/java/com/fishercoder/solutions/_482.java
@@ -1,59 +1,59 @@
 package com.fishercoder.solutions;
 
 /**
- * Now you are given a string S, which represents a software license key which we would like to format. The string S is composed of alphanumerical characters and dashes. The dashes split the alphanumerical characters within the string into groups. (i.e. if there are m dashes, the string is split into m+1 groups). The dashes in the given string are possibly misplaced.
-
- We want each group of characters to be of length K (except for possibly the first group, which could be shorter, but still must contain at least one character). To satisfy this requirement, we will reinsert dashes. Additionally, all the lower case letters in the string must be converted to upper case.
-
- So, you are given a non-empty string S, representing a license key to format, and an integer K. And you need to return the license key formatted according to the description above.
+ * 482. License Key Formatting
+ *
+ * Now you are given a string S, which represents a software license key which we would like to format.
+ * The string S is composed of alphanumerical characters and dashes.
+ * The dashes split the alphanumerical characters within the string into groups.
+ * (i.e. if there are m dashes, the string is split into m+1 groups).
+ * The dashes in the given string are possibly misplaced.
+ * We want each group of characters to be of length K
+ * (except for possibly the first group, which could be shorter, but still must contain at least one character).
+ * To satisfy this requirement, we will reinsert dashes. Additionally, all the lower case letters in the string must be converted to upper case.
+ * So, you are given a non-empty string S, representing a license key to format, and an integer K.
+ * And you need to return the license key formatted according to the description above.
 
  Example 1:
-
  Input: S = "2-4A0r7-4k", K = 4
-
  Output: "24A0-R74K"
-
  Explanation: The string S has been split into two parts, each part has 4 characters.
 
  Example 2:
-
  Input: S = "2-4A0r7-4k", K = 3
-
  Output: "24-A0R-74K"
-
  Explanation: The string S has been split into three parts, each part has 3 characters except the first part as it could be shorter as said above.
 
  Note:
-
  The length of string S will not exceed 12,000, and K is a positive integer.
  String S consists only of alphanumerical characters (a-z and/or A-Z and/or 0-9) and dashes(-).
  String S is non-empty.
-
  */
 public class _482 {
-
-    public String licenseKeyFormatting(String S, int K) {
-        StringBuilder stringBuilder = new StringBuilder();
-        char[] SChars = S.toCharArray();
-        for (int i = S.length() - 1, j = 0; i >= 0; ) {
-            if (j < K) {
-                if (SChars[i] != '-') {
-                    if (SChars[i] >= 'a' && SChars[i] <= 'z') {
-                        stringBuilder.append(Character.toUpperCase(SChars[i]));
-                    } else {
-                        stringBuilder.append(SChars[i]);
+    public static class Solution1 {
+        public String licenseKeyFormatting(String S, int K) {
+            StringBuilder stringBuilder = new StringBuilder();
+            char[] SChars = S.toCharArray();
+            for (int i = S.length() - 1, j = 0; i >= 0; ) {
+                if (j < K) {
+                    if (SChars[i] != '-') {
+                        if (SChars[i] >= 'a' && SChars[i] <= 'z') {
+                            stringBuilder.append(Character.toUpperCase(SChars[i]));
+                        } else {
+                            stringBuilder.append(SChars[i]);
+                        }
+                        j++;
                     }
-                    j++;
+                    i--;
+                } else if (j == K) {
+                    j = 0;
+                    stringBuilder.append('-');
                 }
-                i--;
-            } else if (j == K) {
-                j = 0;
-                stringBuilder.append('-');
             }
+            if (stringBuilder.length() > 1 && stringBuilder.substring(stringBuilder.length() - 1).equals("-")) {
+                return stringBuilder.reverse().substring(1);
+            }
+            return stringBuilder.reverse().toString();
         }
-        if (stringBuilder.length() > 1 && stringBuilder.substring(stringBuilder.length() - 1).equals("-")) {
-            return stringBuilder.reverse().substring(1);
-        }
-        return stringBuilder.reverse().toString();
     }
 }
diff --git a/src/test/java/com/fishercoder/_482Test.java b/src/test/java/com/fishercoder/_482Test.java
@@ -8,15 +8,15 @@
 import static junit.framework.Assert.assertEquals;
 
 public class _482Test {
-    private static _482 test;
+    private static _482.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String S;
     private static int k;
 
     @BeforeClass
     public static void setup() {
-        test = new _482();
+        solution1 = new _482.Solution1();
     }
 
     @Before
@@ -30,7 +30,7 @@ public void test1() {
         S = "2-4A0r7-4k";
         k = 4;
         expected = "24A0-R74K";
-        actual = test.licenseKeyFormatting(S, k);
+        actual = solution1.licenseKeyFormatting(S, k);
         assertEquals(expected, actual);
     }
 
@@ -39,7 +39,7 @@ public void test2() {
         S = "2-4A0r7-4k";
         k = 3;
         expected = "24-A0R-74K";
-        actual = test.licenseKeyFormatting(S, k);
+        actual = solution1.licenseKeyFormatting(S, k);
         assertEquals(expected, actual);
     }
 
@@ -48,7 +48,7 @@ public void test3() {
         S = "--a-a-a-a--";
         k = 2;
         expected = "AA-AA";
-        actual = test.licenseKeyFormatting(S, k);
+        actual = solution1.licenseKeyFormatting(S, k);
         assertEquals(expected, actual);
     }
 
@@ -57,7 +57,7 @@ public void test4() {
         S = "---";
         k = 3;
         expected = "";
-        actual = test.licenseKeyFormatting(S, k);
+        actual = solution1.licenseKeyFormatting(S, k);
         assertEquals(expected, actual);
     }
 }
