kth/계산기 1차 코드 리뷰

src/main/java/calculator/Calculator.java

@@ -9,19 +9,16 @@
 import output.ConsoleOutput;
 import output.Output;
 import repository.Repository;
-import validation.ExpressionInputValidation;
-import validation.SelectValidation;
+import util.PatternValidator;
 
 
 public class Calculator {
 
   private final int CHECK = 1;
   private final int CALCULATE = 2;
-  private SelectValidation selectValidation = new SelectValidation();
 
   private InputView inputView = new ConsoleInputView();
 
-  private ExpressionInputValidation expressionInputValidation = new ExpressionInputValidation();
 
   private Output output = new ConsoleOutput();
 
@@ -30,9 +27,7 @@ public void run() {
     while (true) {
       inputView.displayOptions();
       String selectInput = input.selectInput();
-      if (!selectValidation.checkSelectValue(selectInput)) {
-        continue;
-      }
+      PatternValidator.checkSelectValue(selectInput);
       int select = Integer.parseInt(selectInput);
       switch (select) {
         case CHECK:
@@ -48,9 +43,7 @@ public void run() {
   }
 
   private void compute(String expression) {
-    if (!expressionInputValidation.checkExpressionValue(expression)) {
-      return;
-    }
+    PatternValidator.checkExpressionValue(expression);
     InfixToPostfixConverter infixToPostfixConverter = new InfixToPostfixConverter();
     String postFixExpression = infixToPostfixConverter.changeToPostFix(expression);
     Accumulator calculator = new PostFixAccumulator();

src/main/java/util/PatternValidator.java

@@ -0,0 +1,39 @@
+package util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PatternValidator {
+
+  private static final Pattern EXPRESSIONREGEX = Pattern.compile("^\\d+(?: \\+ \\d+| - \\d+| \\* \\d+| \\/ \\d+)*$");
+
+  private static final Pattern OPTIONREGEX = Pattern.compile("^[12]+$");
+
+  private static final Pattern OPERATORREGEX = Pattern.compile("[\\+\\-\\*/]");
+
+  public static boolean checkExpressionValue(String expression) {
+    Matcher matcher = EXPRESSIONREGEX.matcher(expression);
+    if (!matcher.matches()) {
+      throw  new IllegalArgumentException("잘못된 식 입력입니다.");
+    }
+    return true;
+  }
+
+
+  public static boolean checkSelectValue(String select) {
+    Matcher matcher = OPTIONREGEX.matcher(select);
+    if (!matcher.matches()) {
+      throw  new IllegalArgumentException("잘못된 옵션 선택입니다");
+    }
+    return true;
+  }
+
+  public static boolean checkOperatorValue(String operator){
+    Matcher matcher = OPERATORREGEX.matcher(operator);
+    if (!matcher.matches()) {
+      return  false;
+    }
+    return true;
+  }
+
+}