Skip to content

Commit e22751a

Browse files
committed
refactor: Strategy 인터페이스 -> CalculatorStrategy 로 이름 변경
1 parent 7b2e12c commit e22751a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.wonu606.app.App;
44
import com.wonu606.calculator.storage.Persistence;
55
import com.wonu606.calculator.storage.ResultStore;
6-
import com.wonu606.calculator.strategy.Strategy;
6+
import com.wonu606.calculator.strategy.CalculatorStrategy;
77
import com.wonu606.io.Input;
88
import com.wonu606.io.Print;
99
import com.wonu606.util.Message;
@@ -14,7 +14,7 @@
1414

1515
public class CalculatorApp implements App {
1616

17-
private final List<Strategy> strategies = new ArrayList<>();
17+
private final List<CalculatorStrategy> strategies = new ArrayList<>();
1818
private final Persistence store = new ResultStore();
1919
Input input;
2020
Print printer;
@@ -30,16 +30,16 @@ private void initStrategies() {
3030
public void execute(Input input, Print printer) throws IOException {
3131
this.input = input;
3232
this.printer = printer;
33-
33+
3434
while (true) {
3535
int selection = Integer.parseInt(input.getInput());
3636

37-
Optional<Strategy> selectedStrategy =
37+
Optional<CalculatorStrategy> selectedStrategy =
3838
Optional.ofNullable(strategies.get(selection - 1));
3939
selectedStrategy.ifPresentOrElse(
4040
strategy -> strategy.execute(input, printer, store),
4141
() -> {
42-
throw new IllegalArgumentException("잘못된 입력입니다.");
42+
throw new IllegalArgumentException(Message.INVALID_INPUT);
4343
});
4444
}
4545
}

calculator/src/main/java/com/wonu606/calculator/strategy/Strategy.java renamed to calculator/src/main/java/com/wonu606/calculator/strategy/CalculatorStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.wonu606.io.Input;
55
import com.wonu606.io.Print;
66

7-
public interface Strategy {
7+
public interface CalculatorStrategy {
88

99
void execute(Input input, Print printer, Persistence store);
1010
}

calculator/src/main/java/com/wonu606/util/Message.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
public abstract class Message {
44
public static final String INVALID_ORDER = "잘못된 순번입니다.";
55
public static final String INVALID_NUMBER = "잘못된 번호입니다.";
6+
public static final String INVALID_INPUT = "잘못된 입력입니다.";
67
}

0 commit comments

Comments
 (0)