refactor: CalculatorApp 객체에서 Input, Print 필드 제거 및 함수화

Author: wonu606

calculator/src/main/java/com/wonu606/calculator/CalculatorApp.java

@@ -9,15 +9,15 @@
 import com.wonu606.util.Message;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class CalculatorApp implements App {
 
-    private final List<CalculatorStrategy> strategies = new ArrayList<>();
+    private final Map<String, CalculatorStrategy> strategies = new HashMap();
     private final Persistence store = new ResultStore();
-    Input input;
-    Print printer;
 
     public CalculatorApp() {
         initStrategies();
@@ -27,20 +27,31 @@ private void initStrategies() {
         // TODO 조회와 계산 기능을 생성하여 추가해야 함
     }
 
-    public void execute(Input input, Print printer) throws IOException {
-        this.input = input;
-        this.printer = printer;
-        
+    public void execute(Input input, Print printer) {
+
+        while (true) {
+            String selection = inputMenuSelection(input);
+            CalculatorStrategy selectedStrategy = getStrategyOrThrow(selection);
+            performStrategy(input, printer, selectedStrategy);
+        }
+    }
+
+    private void performStrategy(Input input, Print printer, CalculatorStrategy selectedStrategy) {
+        selectedStrategy.execute(input, printer, store);
+    }
+
+    private CalculatorStrategy getStrategyOrThrow(String selection) {
+        return Optional.ofNullable(strategies.get(selection))
+                .orElseThrow(() -> new IllegalArgumentException(Message.INVALID_INPUT));
+    }
+
+    private String inputMenuSelection(Input input) {
         while (true) {
-            int selection = Integer.parseInt(input.getInput());
-
-            Optional<CalculatorStrategy> selectedStrategy =
-                    Optional.ofNullable(strategies.get(selection - 1));
-            selectedStrategy.ifPresentOrElse(
-                    strategy -> strategy.execute(input, printer, store),
-                    () -> {
-                        throw new IllegalArgumentException(Message.INVALID_INPUT);
-                    });
+            try {
+                return input.getInput();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 }