refactor: simplify ParseInteger (TheAlgorithms#4376)

vil02 · web-flow · commit 58c21c57561a · 2023-09-16T21:57:03.000+03:00
diff --git a/src/main/java/com/thealgorithms/maths/ParseInteger.java b/src/main/java/com/thealgorithms/maths/ParseInteger.java
@@ -1,6 +1,28 @@
 package com.thealgorithms.maths;
 
-public class ParseInteger {
+public final class ParseInteger {
+    private ParseInteger() {
+    }
+
+    private static void checkInput(final String s) {
+        if (s == null) {
+            throw new NumberFormatException("Input parameter must not be null!");
+        }
+        if (s.isEmpty()) {
+            throw new NumberFormatException("Input parameter must not be empty!");
+        }
+    }
+
+    private static void checkDigitAt(final String s, final int pos) {
+        if (!Character.isDigit(s.charAt(pos))) {
+            throw new NumberFormatException("Input parameter of incorrect format: " + s);
+        }
+    }
+
+    private static int digitToInt(final char digit) {
+        return digit - '0';
+    }
+
     /**
      * Parse a string to integer
      *
@@ -9,18 +31,15 @@ public class ParseInteger {
      * @throws NumberFormatException if the {@code string} does not contain a
      *                               parsable integer.
      */
-    public static int parseInt(String s) {
-        if (s == null || s.length() == 0) {
-            throw new NumberFormatException("Input parameter must not be null!");
-        }
-        boolean isNegative = s.charAt(0) == '-';
-        boolean isPositive = s.charAt(0) == '+';
+    public static int parseInt(final String s) {
+        checkInput(s);
+
+        final boolean isNegative = s.charAt(0) == '-';
+        final boolean isPositive = s.charAt(0) == '+';
         int number = 0;
-        for (int i = isNegative ? 1 : isPositive ? 1 : 0, length = s.length(); i < length; ++i) {
-            if (!Character.isDigit(s.charAt(i))) {
-                throw new NumberFormatException("Input parameter of incorrect format: " + s);
-            }
-            number = number * 10 + s.charAt(i) - '0';
+        for (int i = isNegative || isPositive ? 1 : 0, length = s.length(); i < length; ++i) {
+            checkDigitAt(s, i);
+            number = number * 10 + digitToInt(s.charAt(i));
         }
         return isNegative ? -number : number;
     }
diff --git a/src/test/java/com/thealgorithms/maths/ParseIntegerTest.java b/src/test/java/com/thealgorithms/maths/ParseIntegerTest.java
@@ -8,6 +8,7 @@
  */
 public class ParseIntegerTest {
     private static final String NULL_PARAMETER_MESSAGE = "Input parameter must not be null!";
+    private static final String EMPTY_PARAMETER_MESSAGE = "Input parameter must not be empty!";
     private static final String INCORRECT_FORMAT_MESSAGE = "Input parameter of incorrect format";
 
     @Test
@@ -16,6 +17,12 @@ public void testNullInput() {
         Assertions.assertEquals(exception.getMessage(), NULL_PARAMETER_MESSAGE);
     }
 
+    @Test
+    public void testEmptyInput() {
+        IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class, () -> ParseInteger.parseInt(""));
+        Assertions.assertEquals(exception.getMessage(), EMPTY_PARAMETER_MESSAGE);
+    }
+
     @Test
     public void testInputOfIncorrectFormat() {
         IllegalArgumentException exception = Assertions.assertThrows(NumberFormatException.class, () -> ParseInteger.parseInt("+0a123"));
