[2단계 - 자동차 경주 구현] 유콩(김유빈) 미션 제출합니다.

.gitignore

@@ -30,3 +30,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### mac ###
+.DS_Store

src/main/java/calculator/Calculator.java

@@ -1,44 +1,53 @@
 package calculator;
 
+import calculator.view.Output;
+
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class Calculator {
-	private static final int WRONG_VALUE_RESULT = 0;
 	private static final int CUSTOM_DELIMITER_PART = 1;
 	private static final int NUMBER_PART = 2;
+	public static final String EMPTY_VALUE = "0";
+
+	public int splitAndSum(final String text) {
+		String calculatorText = replaceEmpty(text);
+		return sum(getSplitNumbers(calculatorText));
+	}
 
-	public int splitAndSum(String text) {
+	private String replaceEmpty(final String text) {
 		if (isEmpty(text)) {
-			return WRONG_VALUE_RESULT;
+			Output.emptyValueOfSum();
+			return EMPTY_VALUE;
 		}
-		return sum(getSplitNumbers(text));
+		return text;
 	}
 
-	private boolean isEmpty(String text) {
+	private boolean isEmpty(final String text) {
 		return text == null || text.trim().isEmpty();
 	}
 
-	private int[] getSplitNumbers(String text) {
+	private int[] getSplitNumbers(final String text) {
 		String delimiter = ",|:";
+		String splitText = text;
 
 		Matcher m = Pattern.compile("//(.)\n(.*)").matcher(text);
 		if (m.find()) {
 			delimiter += "|" + m.group(CUSTOM_DELIMITER_PART);
-			text = m.group(NUMBER_PART);
+			splitText = m.group(NUMBER_PART);
 		}
-		return stringToIntArray(text.split(delimiter));
+		return stringToIntArray(splitText.split(delimiter));
 	}
 
-	private int[] stringToIntArray(String[] strings) {
+	private int[] stringToIntArray(final String[] strings) {
 		return Arrays.stream(strings)
 				.filter(this::isValidNumber)
 				.map(Integer::parseInt)
 				.mapToInt(Integer::intValue).toArray();
 	}
 
-	private boolean isValidNumber(String string) {
+	private boolean isValidNumber(final String string) {
 		if (isEmpty(string)) {
 			return false;
 		}
@@ -48,11 +57,11 @@ private boolean isValidNumber(String string) {
 		return true;
 	}
 
-	private boolean isNumber(String string) {
+	private boolean isNumber(final String string) {
 		return string.matches("[+-]?\\d*?(\\.\\d+)?");
 	}
 
-	private int sum(int[] numbers) {
+	private int sum(final int[] numbers) {
 		if (numbers.length == 1) {
 			return numbers[0];
 		}
@@ -64,7 +73,7 @@ private int sum(int[] numbers) {
 		return result;
 	}
 
-	private void checkNegative(int number) {
+	private void checkNegative(final int number) {
 		if (number < 0) {
 			throw new RuntimeException("자연수를 입력해주세요.");
 		}

src/main/java/calculator/view/Output.java

@@ -0,0 +1,11 @@
+package calculator.view;
+
+public class Output {
+    private static void info(final String message) {
+        System.out.println("[INFO] " + message);
+    }
+
+    public static void emptyValueOfSum() {
+        info("빈 값은 0으로 바뀌어 계산됩니다.");
+    }
+}

src/main/java/racingcar/Application.java

@@ -1,6 +1,6 @@
 package racingcar;
 
-import racingcar.service.RacingCarGame;
+import racingcar.controller.RacingCarGame;
 
 public class Application {
     public static void main(String[] args) {

src/main/java/racingcar/controller/RacingCarGame.java

@@ -0,0 +1,61 @@
+package racingcar.controller;
+
+import racingcar.domain.Attempt;
+import racingcar.domain.Cars;
+import racingcar.domain.RoundResult;
+import racingcar.view.Input;
+import racingcar.view.Output;
+
+import java.util.List;
+
+public class RacingCarGame {
+	private Cars cars;
+	private Attempt attempt;
+	private final RoundResult roundResult = new RoundResult();
+
+	private final Input input;
+
+	public RacingCarGame() {
+		input = new Input();
+	}
+
+	public void run() {
+		init();
+		round();
+		win();
+	}
+
+	@Override
+	public String toString() {
+		return "- cars\n" + cars + "- " + attempt;
+	}
+
+	private void init() {
+		cars = createCars(input.carName());
+		attempt = createAttempt(input.attempt());
+	}
+
+	private Cars createCars(final String carName) {
+		return new Cars(carName);
+	}
+
+	private Attempt createAttempt(final String attempt) {
+		return new Attempt(attempt);
+	}
+
+	private void round() {
+		Output.resultTitle();
+
+		int nowAttempt = 0;
+		while (!attempt.isSame(nowAttempt++)) {
+			cars.play(roundResult);
+			roundResult.roundEnd();
+		}
+		Output.result(roundResult);
+	}
+
+	private void win() {
+		List<String> winners = cars.findWinners();
+		Output.showResult(winners);
+	}
+}

src/main/java/racingcar/domain/Attempt.java

@@ -3,43 +3,45 @@
 public class Attempt {
     private final int attempt;
 
-    public Attempt(int attempt) {
+    public Attempt(final String attempt) {
+        this(stringToInt(attempt));
+    }
+
+    public Attempt(final int attempt) {
         if (isNegative(attempt)) {
             throw new IllegalArgumentException("시도횟수는 1이상의 수를 입력해주세요.");
         }
         this.attempt = attempt;
     }
-
-    public Attempt(String attempt) {
-        checkValid(attempt);
-        this.attempt = Integer.parseInt(attempt);
-    }
 
-    public boolean isSame(int nowAttempt) {
+    public boolean isSame(final int nowAttempt) {
         return attempt == nowAttempt;
     }
 
-    private void checkValid(String attempt) {
+    @Override
+    public String toString() {
+        return "attempt : " + attempt;
+    }
+
+    private static int stringToInt(final String text) {
+        checkValid(text);
+        return Integer.parseInt(text);
+    }
+
+    private static void checkValid(final String attempt) {
         if (attempt.isBlank()) {
             throw new IllegalArgumentException("반복 횟수는 %s일 수 없습니다.");
         }
         if (!isNumber(attempt)) {
             throw new IllegalArgumentException("시도횟수는 숫자를 입력해주세요.");
         }
-        if (isNegative(attempt)) {
-            throw new IllegalArgumentException("시도횟수는 1이상의 수를 입력해주세요.");
-        }
     }
 
-    private boolean isNumber(String string) {
+    private static boolean isNumber(final String string) {
         return string.matches("[+-]?\\d*(\\.\\d+)?");
     }
 
-    private boolean isNegative(int number) {
+    private static boolean isNegative(final int number) {
         return number <= 0;
     }
-
-    private boolean isNegative(String string) {
-        return Integer.parseInt(string) <= 0;
-    }
 }

src/main/java/racingcar/domain/Car.java

@@ -6,21 +6,17 @@ public class Car implements Comparable<Car> {
 	private final String name;
 	private int position = 0;
 
-	public Car(String name) {
-		checkValid(name);
+	public Car(final String name) {
+		checkValidName(name);
 		this.name = name;
 	}
 
-	public void drive(boolean directing) {
-		if (directing) {
+	public void drive(final Movable movable) {
+		if (movable.isMoving()) {
 			move();
 		}
 	}
 
-	public boolean isSamePosition(Car other) {
-		return this.position == other.position;
-	}
-
 	public String getName() {
 		return name;
 	}
@@ -29,17 +25,26 @@ public int getPosition() {
 		return position;
 	}
 
+	public boolean isSamePosition(final Car other) {
+		return this.position == other.position;
+	}
+
 	@Override
-	public int compareTo(Car car) {
+	public int compareTo(final Car car) {
 		return this.position - car.position;
 	}
 
-	private void checkValid(String names) {
+	@Override
+	public String toString() {
+		return "name : " + name + ", position : " + position;
+	}
+
+	private void checkValidName(final String names) {
 		checkBlank(names);
 		checkNameLength(names);
 	}
 
-	private void checkBlank(String name) {
+	private void checkBlank(final String name) {
 		String text = "자동차 이름은 %s일 수 없습니다.";
 		if (name == null) {
 			throw new NullPointerException(String.format(text, "null"));
@@ -49,7 +54,7 @@ private void checkBlank(String name) {
 		}
 	}
 
-	private void checkNameLength(String name) {
+	private void checkNameLength(final String name) {
 		if (!(name.trim().length() <= CAR_LENGTH_LIMIT)) {
 			throw new IllegalArgumentException("자동차의 이름은 " + CAR_LENGTH_LIMIT + "글자를 초과할 수 없습니다.");
 		}