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

src/main/java/racingcar/RacingCarMain.java

@@ -1,11 +1,10 @@
 package racingcar;
 
-import racingcar.ui.RacingCarInputView;
-import racingcar.ui.RacingCarResultView;
+import racingcar.controller.RacingCarGameController;
 
 public class RacingCarMain {
     public static void main(String[] args) {
-        RacingCarGame racingCarGame = new RacingCarGame();
-        racingCarGame.start();
+        RacingCarGameController racingCarGameController = new RacingCarGameController();
+        racingCarGameController.start();
     }
 }

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

@@ -1,28 +1,31 @@
-package racingcar;
+package racingcar.controller;
 
 import java.util.List;
 
-import racingcar.ui.RacingCarInput;
-import racingcar.ui.RacingCarInputView;
-import racingcar.ui.RacingCarResult;
-import racingcar.ui.RacingCarResultView;
-import utils.RandomUtils;
+import racingcar.domain.DefaultRacingCarGameWinnerStrategy;
+import racingcar.domain.RacingCar;
+import racingcar.domain.RacingCarFactory;
+import racingcar.domain.RacingCarGameWinnerStrategy;
+import racingcar.view.RacingCarInput;
+import racingcar.view.RacingCarInputView;
+import racingcar.view.RacingCarResult;
+import racingcar.view.RacingCarResultView;
 
-public class RacingCarGame {
+public class RacingCarGameController {
 
     private final RacingCarInputView inputView;
     private final RacingCarResultView resultView;
     private final RacingCarGameWinnerStrategy winnerStrategy;
 
-    public RacingCarGame() {
+    public RacingCarGameController() {
         this(RacingCarInputView.getInstance(),
              RacingCarResultView.getInstance(),
              DefaultRacingCarGameWinnerStrategy.getInstance());
     }
 
-    private RacingCarGame(RacingCarInputView inputView,
-                         RacingCarResultView resultView,
-                         RacingCarGameWinnerStrategy winnerStrategy) {
+    private RacingCarGameController(RacingCarInputView inputView,
+                                    RacingCarResultView resultView,
+                                    RacingCarGameWinnerStrategy winnerStrategy) {
         this.inputView = inputView;
         this.resultView = resultView;
         this.winnerStrategy = winnerStrategy;

src/main/java/racingcar/DefaultRacingCarGameWinnerStrategy.java → src/main/java/racingcar/domain/DefaultRacingCarGameWinnerStrategy.java

@@ -1,4 +1,4 @@
-package racingcar;
+package racingcar.domain;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,24 +15,27 @@ public static DefaultRacingCarGameWinnerStrategy getInstance() {
         return INSTANCE;
     }
 
-    private List<RacingCar> sort(List<RacingCar> racingCars) {
-        racingCars = new ArrayList<>(racingCars);
-        Collections.sort(racingCars);
-        return racingCars;
-    }
-
     @Override
     public List<RacingCar> getWinners(List<RacingCar> racingCars) {
         if (racingCars == null || racingCars.isEmpty()) {
             return Collections.emptyList();
         }
 
-        racingCars = sort(racingCars);
-        RacingCar winner = racingCars.get(0);
+        RacingCar firstPlace = getFirstPlace(racingCars);
 
         return racingCars
             .stream()
-            .filter(car -> winner.compareTo(car) == 0)
+            .filter(car -> firstPlace.compareTo(car) == 0)
             .collect(Collectors.toList());
     }
+
+    private RacingCar getFirstPlace(List<RacingCar> racingCars) {
+        return sort(racingCars).get(0);
+    }
+
+    private List<RacingCar> sort(List<RacingCar> racingCars) {
+        racingCars = new ArrayList<>(racingCars);
+        Collections.sort(racingCars);
+        return racingCars;
+    }
 }

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

@@ -1,6 +1,6 @@
-package racingcar;
+package racingcar.domain;
 
-import racingcar.ui.RacingCarResult;
+import racingcar.view.RacingCarResult;
 import utils.RandomUtils;
 
 public class RacingCar implements Comparable<RacingCar> {

src/main/java/racingcar/RacingCarFactory.java → src/main/java/racingcar/domain/RacingCarFactory.java

@@ -1,4 +1,4 @@
-package racingcar;
+package racingcar.domain;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/racingcar/RacingCarGameWinnerStrategy.java → src/main/java/racingcar/domain/RacingCarGameWinnerStrategy.java

@@ -1,4 +1,4 @@
-package racingcar;
+package racingcar.domain;
 
 import java.util.List;
 

src/main/java/racingcar/RacingCarMoveStrategy.java → src/main/java/racingcar/domain/RacingCarMoveStrategy.java

@@ -1,4 +1,4 @@
-package racingcar;
+package racingcar.domain;
 
 @FunctionalInterface
 public interface RacingCarMoveStrategy {

src/main/java/racingcar/RacingCarName.java → src/main/java/racingcar/domain/RacingCarName.java

@@ -1,4 +1,4 @@
-package racingcar;
+package racingcar.domain;
 
 public class RacingCarName {
 

src/main/java/racingcar/RandomRacingCarMoveStrategy.java → src/main/java/racingcar/domain/RandomRacingCarMoveStrategy.java

@@ -1,4 +1,4 @@
-package racingcar;
+package racingcar.domain;
 
 import utils.RandomUtils;
 

src/main/java/racingcar/ui/RacingCarInput.java → src/main/java/racingcar/view/RacingCarInput.java

@@ -1,4 +1,4 @@
-package racingcar.ui;
+package racingcar.view;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/racingcar/ui/RacingCarInputView.java → src/main/java/racingcar/view/RacingCarInputView.java

@@ -1,6 +1,5 @@
-package racingcar.ui;
+package racingcar.view;
 
-import java.util.List;
 import java.util.Scanner;
 
 public class RacingCarInputView {

src/main/java/racingcar/ui/RacingCarResult.java → src/main/java/racingcar/view/RacingCarResult.java

@@ -1,8 +1,8 @@
-package racingcar.ui;
+package racingcar.view;
 
 import java.util.List;
 
-import racingcar.RacingCar;
+import racingcar.domain.RacingCar;
 
 import static java.util.stream.Collectors.toList;
 

src/main/java/racingcar/ui/RacingCarResultView.java → src/main/java/racingcar/view/RacingCarResultView.java

@@ -1,9 +1,7 @@
-package racingcar.ui;
+package racingcar.view;
 
 import java.util.List;
 
-import racingcar.RacingCar;
-
 public class RacingCarResultView {
 
     private final static RacingCarResultView INSTANCE = new RacingCarResultView();

src/test/java/racingcar/DefaultRacingCarGameWinnerStrategyTest.java → src/test/java/racingcar/domain/DefaultRacingCarGameControllerWinnerStrategyTest.java

@@ -1,16 +1,14 @@
-package racingcar;
+package racingcar.domain;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-class DefaultRacingCarGameWinnerStrategyTest {
+class DefaultRacingCarGameControllerWinnerStrategyTest {
 
     @Test
     void 동점이면_모두_winner다() {

src/test/java/racingcar/RacingCarNameTest.java → src/test/java/racingcar/domain/RacingCarNameTest.java

@@ -1,10 +1,9 @@
-package racingcar;
+package racingcar.domain;
 
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static org.junit.jupiter.api.Assertions.*;
 
 class RacingCarNameTest {
 

src/test/java/racingcar/RacingCarTest.java → src/test/java/racingcar/domain/RacingCarTest.java

@@ -1,6 +1,5 @@
-package racingcar;
+package racingcar.domain;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;

src/test/java/racingcar/ui/RacingCarInputTest.java → src/test/java/racingcar/view/RacingCarInputTest.java

@@ -1,10 +1,9 @@
-package racingcar.ui;
+package racingcar.view;
 
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static org.junit.jupiter.api.Assertions.*;
 
 class RacingCarInputTest {