update 1769

Author: Steve Sun

src/main/java/com/fishercoder/solutions/secondthousand/_1768.java

@@ -5,36 +5,14 @@ public static class Solution1 {
         public String mergeAlternately(String word1, String word2) {
             StringBuilder sb = new StringBuilder();
             int i = 0;
-            int j = 0;
-            for (; i < word1.length() && j < word2.length(); ) {
-                sb.append(word1.charAt(i++));
-                sb.append(word2.charAt(j++));
-            }
-            while (i < word1.length()) {
-                sb.append(word1.charAt(i++));
-            }
-            while (j < word2.length()) {
-                sb.append(word2.charAt(j++));
-            }
-            return sb.toString();
-        }
-    }
-
-    public static class Solution2 {
-        public String mergeAlternately(String word1, String word2) {
-            int len1 = word1.length();
-            int len2 = word2.length();
-            StringBuilder sb = new StringBuilder();
-            int diffLen = Math.min(len1, len2);
-            int i;
-            for (i = 0; i < diffLen; i++) {
+            for (; i < word1.length() && i < word2.length(); i++) {
                 sb.append(word1.charAt(i));
                 sb.append(word2.charAt(i));
             }
-            if (i >= len1) {
-                sb.append(word2.substring(i));
-            } else {
+            if (i < word1.length()) {
                 sb.append(word1.substring(i));
+            } else if (i < word2.length()) {
+                sb.append(word2.substring(i));
             }
             return sb.toString();
         }

src/test/java/com/fishercoder/secondthousand/_1768Test.java

@@ -7,7 +7,6 @@
 
 public class _1768Test {
     private _1768.Solution1 solution1;
-    private _1768.Solution2 solution2;
     private static String word1;
     private static String word2;
     private static String expected;
@@ -16,7 +15,6 @@ public class _1768Test {
     @BeforeEach
     public void setup() {
         solution1 = new _1768.Solution1();
-        solution2 = new _1768.Solution2();
     }
 
     @Test
@@ -26,7 +24,5 @@ public void test1() {
         expected = "apbqcr";
         actual = solution1.mergeAlternately(word1, word2);
         Assertions.assertEquals(actual, expected);
-        actual = solution2.mergeAlternately(word1, word2);
-        Assertions.assertEquals(actual, expected);
     }
 }