step 5 : 5단계 - 자동차 경주(리팩토링)

src/main/java/racinggame/RacingGameController.java → src/main/java/racinggame/controller/RacingGameController.java

@@ -1,6 +1,13 @@
-package racinggame;
+package racinggame.controller;
+
+import racinggame.domain.strategy.MoveStrategy;
+import racinggame.domain.race.Race;
+import racinggame.domain.strategy.RandomMoveStrategy;
+import racinggame.view.ConsoleInputView;
+import racinggame.view.ConsoleResultView;
+import racinggame.view.InputView;
+import racinggame.view.ResultView;
 
-import racinggame.racingcar.*;
 import java.util.List;
 
 public class RacingGameController {

src/main/java/racinggame/racingcar/Race.java → src/main/java/racinggame/domain/race/Race.java

@@ -1,4 +1,7 @@
-package racinggame.racingcar;
+package racinggame.domain.race;
+
+import racinggame.domain.racingcar.RacingCars;
+import racinggame.domain.strategy.MoveStrategy;
 
 import java.util.List;
 import java.util.Map;

src/main/java/racinggame/domain/racingcar/CarName.java

@@ -0,0 +1,23 @@
+package racinggame.domain.racingcar;
+
+public class CarName {
+    private static final int MAX_NAME_LENGTH = 5;
+    private static final String ERROR_INVALID_NAME = "자동차 이름은 5자 이하여야 합니다.";
+
+    private final String value;
+
+    public CarName(String value) {
+        validateName(value);
+        this.value = value;
+    }
+
+    private void validateName(String name) {
+        if (name.length() > MAX_NAME_LENGTH) {
+            throw new IllegalArgumentException(ERROR_INVALID_NAME + ": " + name);
+        }
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

src/main/java/racinggame/racingcar/CarPosition.java → src/main/java/racinggame/domain/racingcar/CarPosition.java

@@ -1,4 +1,4 @@
-package racinggame.racingcar;
+package racinggame.domain.racingcar;
 
 public class CarPosition {
     private int value;

src/main/java/racinggame/racingcar/RacingCar.java → src/main/java/racinggame/domain/racingcar/RacingCar.java

@@ -1,4 +1,6 @@
-package racinggame.racingcar;
+package racinggame.domain.racingcar;
+
+import racinggame.domain.strategy.MoveStrategy;
 
 public class RacingCar {
     private final CarName name;

src/main/java/racinggame/racingcar/RacingCars.java → src/main/java/racinggame/domain/racingcar/RacingCars.java

@@ -1,4 +1,6 @@
-package racinggame.racingcar;
+package racinggame.domain.racingcar;
+
+import racinggame.domain.strategy.MoveStrategy;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -11,11 +13,9 @@ private RacingCars(List<RacingCar> cars) {
     }
 
     public static RacingCars create(MoveStrategy moveStrategy, List<String> nameList) {
-        List<RacingCar> cars = nameList.stream()
+        return nameList.stream()
                 .map(name -> RacingCar.create(moveStrategy, name))
-                .collect(Collectors.toList());
-
-        return new RacingCars(cars);
+                .collect(Collectors.collectingAndThen(Collectors.toList(), RacingCars::new));
     }
 
     public int count() {

src/main/java/racinggame/racingcar/MoveStrategy.java → src/main/java/racinggame/domain/strategy/MoveStrategy.java

@@ -1,4 +1,4 @@
-package racinggame.racingcar;
+package racinggame.domain.strategy;
 
 public interface MoveStrategy {
     boolean shouldMove();

src/main/java/racinggame/racingcar/RandomMoveStrategy.java → src/main/java/racinggame/domain/strategy/RandomMoveStrategy.java

@@ -1,4 +1,4 @@
-package racinggame.racingcar;
+package racinggame.domain.strategy;
 
 import java.util.Random;
 

src/main/java/racinggame/ConsoleInputView.java → src/main/java/racinggame/view/ConsoleInputView.java

@@ -1,4 +1,6 @@
-package racinggame;
+package racinggame.view;
+
+import racinggame.domain.racingcar.CarName;
 
 import java.util.List;
 import java.util.Scanner;
@@ -8,14 +10,11 @@
 public class ConsoleInputView implements InputView {
     private static final String QUESTION_NAMES_OF_CARS = "경주할 자동차 이름을 입력하세요(이름은 쉼표(,)를 기준으로 구분).";
     private static final String QUESTION_NUMBER_OF_ROUNDS = "시도할 회수는 몇 회 인가요?";
-
-    private static final String ERROR_INVALID_NAME = "자동차 이름은 5자 이하여야 합니다. 다시 입력해주세요.";
     private static final String ERROR_NOT_POSITIVE = "양수를 입력해주세요: ";
     private static final String ERROR_NOT_NUMBER = "숫자를 입력해주세요: ";
 
     private static final int ZERO = 0;
     private static final String NAME_SEPARATOR = ",";
-    private static final int MAX_NAME_LENGTH = 5;
 
     private final Scanner scanner;
 
@@ -42,8 +41,10 @@ private void printMessage(final String message) {
     private List<String> readValidNames() {
         try {
             List<String> names = splitNames(readInput());
-            validateNames(names);
-            return names;
+            return names.stream()
+                    .map(CarName::new) // CarName 객체 생성, 이름을 검증함
+                    .map(CarName::getValue)
+                    .collect(Collectors.toList());
         } catch (RuntimeException e) {
             System.out.println(e.getMessage());
             return readValidNames();
@@ -56,19 +57,6 @@ private List<String> splitNames(String input) {
                 .collect(Collectors.toList());
     }
 
-    private void validateNames(List<String> names) {
-        names.stream()
-                .filter(name -> !isValidName(name))
-                .findFirst()
-                .ifPresent(invalidName -> {
-                    throw new RuntimeException(ERROR_INVALID_NAME + ": " + invalidName);
-                });
-    }
-
-    private boolean isValidName(String name) {
-        return name.length() <= MAX_NAME_LENGTH;
-    }
-
     private int readPositiveNumber() {
         String input = readInput();
         try {

src/main/java/racinggame/ConsoleResultView.java → src/main/java/racinggame/view/ConsoleResultView.java

@@ -1,8 +1,7 @@
-package racinggame;
+package racinggame.view;
 
 import java.util.List;
 import java.util.Map;
-import java.util.StringJoiner;
 
 public class ConsoleResultView implements ResultView {
     private static final String EXECUTION_ANNOUNCEMENT_MESSAGE = "실행 결과";
@@ -39,11 +38,10 @@ private String formatWinnersMessage(List<String> winners) {
     }
 
     private String joinNames(List<String> names) {
-        StringJoiner joiner = new StringJoiner(", ");
-        names.forEach(joiner::add);
-        return joiner.toString();
+        return String.join(", ", names);
     }
 
+
     private String createPositionMarker(int position) {
         return POSITION_MARKER.repeat(position);
     }

src/main/java/racinggame/InputView.java → src/main/java/racinggame/view/InputView.java

@@ -1,4 +1,4 @@
-package racinggame;
+package racinggame.view;
 
 import java.util.List;
 

src/main/java/racinggame/ResultView.java → src/main/java/racinggame/view/ResultView.java

@@ -1,4 +1,4 @@
-package racinggame;
+package racinggame.view;
 
 import java.util.List;
 import java.util.Map;

src/test/java/racinggame/RaceTest.java → src/test/java/racinggame/domain/race/RaceTest.java

@@ -1,11 +1,10 @@
-package racinggame;
+package racinggame.domain.race;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import racinggame.racingcar.MoveStrategy;
-import racinggame.racingcar.Race;
-import racinggame.racingcar.RandomMoveStrategy;
+import racinggame.domain.strategy.MoveStrategy;
+import racinggame.domain.strategy.RandomMoveStrategy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/racinggame/RacingCarCreationTest.java → src/test/java/racinggame/domain/racingcar/RacingCarsTest.java

@@ -1,17 +1,16 @@
-package racinggame;
+package racinggame.domain.racingcar;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import racinggame.racingcar.MoveStrategy;
-import racinggame.racingcar.RacingCars;
+import racinggame.domain.strategy.MoveStrategy;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class RacingCarCreationTest {
+class RacingCarsTest {
 
     @Test
     @DisplayName("단일 자동차 객체 생성")

src/test/java/racinggame/RacingCarMovementTest.java → src/test/java/racinggame/domain/strategy/StrategyTest.java

@@ -1,18 +1,16 @@
-package racinggame;
+package racinggame.domain.strategy;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import racinggame.racingcar.RacingCars;
-import racinggame.racingcar.RandomMoveStrategy;
-import racinggame.racingcar.MoveStrategy;
+import racinggame.domain.racingcar.RacingCars;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class RacingCarMovementTest {
+class StrategyTest {
     private static final int INIT_POSITION = 0;
     private static final int NUMBER_OF_ROUNDS = 4;
 

src/test/java/racinggame/RacingGameInputViewTest.java → src/test/java/racinggame/view/InputViewTest.java

@@ -1,4 +1,4 @@
-package racinggame;
+package racinggame.view;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-class RacingGameInputViewTest {
+class InputViewTest {
 
     private final InputStream originalSystemIn = System.in;
     private final PrintStream originalSystemOut = System.out;