[2단계 - 사다리 게임 실행] 허브(방대의) 미션 제출합니다.

src/main/java/ladder/Application.java

@@ -2,7 +2,7 @@
 
 import java.util.Scanner;
 import ladder.controller.LadderGameController;
-import ladder.domain.ladder.RandomBooleanGenerator;
+import ladder.util.RandomBooleanGenerator;
 import ladder.view.InputView;
 import ladder.view.OutputView;
 

src/main/java/ladder/controller/LadderGameController.java

@@ -1,15 +1,12 @@
 package ladder.controller;
 
-import java.util.List;
-import java.util.Map;
 import java.util.function.Supplier;
-import ladder.domain.item.Items;
-import ladder.domain.ladder.BooleanGenerator;
-import ladder.domain.ladder.Height;
-import ladder.domain.ladder.LadderGame;
-import ladder.domain.ladder.LadderGameResult;
-import ladder.domain.ladder.Line;
-import ladder.domain.player.Players;
+import ladder.domain.Height;
+import ladder.domain.Items;
+import ladder.domain.LadderGame;
+import ladder.domain.LadderGameResult;
+import ladder.domain.Players;
+import ladder.util.BooleanGenerator;
 import ladder.view.InputView;
 import ladder.view.OutputView;
 
@@ -31,14 +28,14 @@ public LadderGameController(
 
  public void run() {
  final LadderGame ladderGame = initialize();
- printLadderResult(ladderGame);
+ outputView.printLadderResult(ladderGame);
  final LadderGameResult ladderGameResult = ladderGame.play();
  printLadderGameResult(ladderGameResult);
  }
 
  private LadderGame initialize() {
  final Players players = repeatUntilGetValidInput(() -> Players.from(inputView.readPlayerNames()));
- final Items items = repeatUntilGetValidInput(() -> Items.from(inputView.readItemNames(), players.count()));
+ final Items items = repeatUntilGetValidInput(() -> Items.of(inputView.readItemNames(), players.count()));
  final Height height = repeatUntilGetValidInput(() -> new Height(inputView.readLadderHeight()));
 
  return LadderGame.initialize(players, booleanGenerator, height, items);
@@ -53,39 +50,32 @@ private <T> T repeatUntilGetValidInput(final Supplier<T> inputReader) {
  }
  }
 
- private void printLadderResult(final LadderGame ladderGame) {
- final List<String> players = ladderGame.getPlayers();
- final List<Line> ladder = ladderGame.getLadder();
- final List<String> items = ladderGame.getItems();
-
- outputView.printLadderResult(players, ladder, items);
- }
-
  private void printLadderGameResult(final LadderGameResult ladderGameResult) {
  LadderGameCommand command = LadderGameCommand.SINGLE;
  while (command.isContinued()) {
- final Map<String, String> result = repeatUntilGetValidInput(() -> getLadderGameResult(ladderGameResult));
- command = LadderGameCommand.from(result.size());
- outputView.printLadderGameResult(result);
+ final String name = repeatUntilGetValidInput(() -> getValidPlayerName(ladderGameResult));
+ command = LadderGameCommand.from(name);
+ outputView.printLadderGameResult(ladderGameResult, name);
  }
  }
 
- private Map<String, String> getLadderGameResult(final LadderGameResult ladderGameResult) {
+ private String getValidPlayerName(final LadderGameResult ladderGameResult) {
  final String name = inputView.readPlayerName();
- return ladderGameResult.get(name);
+ ladderGameResult.validatePlayerName(name);
+ return name;
  }
 
- enum LadderGameCommand {
- ALL,
+ private enum LadderGameCommand {
+ MULTIPLE,
  SINGLE;
 
- private static final int SINGLE_RESULT_SIZE = 1;
+ private static final String MULTIPLE_RESULT_RESERVED_NAME = "all";
 
- public static LadderGameCommand from(final int size) {
- if (size == SINGLE_RESULT_SIZE) {
- return SINGLE;
+ public static LadderGameCommand from(final String name) {
+ if (MULTIPLE_RESULT_RESERVED_NAME.equals(name)) {
+ return MULTIPLE;
  }
- return ALL;
+ return SINGLE;
  }
 
  public boolean isContinued() {

src/main/java/ladder/domain/ladder/Height.java → src/main/java/ladder/domain/Height.java

@@ -1,9 +1,9 @@
-package ladder.domain.ladder;
+package ladder.domain;
 
 public class Height {
  private static final int HEIGHT_LOWER_BOUND = 1;
  private static final int HEIGHT_UPPER_BOUND = 100;
- private static final String INVALID_HEIGHT_MESSAGE =
+ static final String INVALID_HEIGHT_MESSAGE =
  "높이는 " + HEIGHT_LOWER_BOUND + "이상, " + HEIGHT_UPPER_BOUND + "이하의 값이어야 합니다.";
 
  private final int value;

src/main/java/ladder/domain/item/Item.java → src/main/java/ladder/domain/Item.java

@@ -1,16 +1,18 @@
-package ladder.domain.item;
-
-import ladder.domain.ladder.Position;
+package ladder.domain;
 
 public class Item {
  private final ItemName name;
  private final Position position;
 
- public Item(final String name, final Position position) {
- this.name = new ItemName(name);
+ private Item(final ItemName name, final Position position) {
+ this.name = name;
  this.position = position;
  }
 
+ public static Item of(final String name, final int index) {
+ return new Item(new ItemName(name), Position.valueOf(index));
+ }
+
  public boolean isSamePosition(final Position position) {
  return this.position == position;
  }

src/main/java/ladder/domain/item/ItemName.java → src/main/java/ladder/domain/ItemName.java

@@ -1,10 +1,10 @@
-package ladder.domain.item;
+package ladder.domain;
 
 public class ItemName {
  private static final int NAME_LENGTH_UPPER_BOUND = 5;
- private static final String INVALID_NAME_LENGTH_MESSAGE =
+ static final String INVALID_NAME_LENGTH_MESSAGE =
  "실행 결과명은 1자 이상, " + NAME_LENGTH_UPPER_BOUND + "자 이하여야 합니다.";
-
+ 
  private final String value;
 
  public ItemName(final String name) {

src/main/java/ladder/domain/item/Items.java → src/main/java/ladder/domain/Items.java

@@ -1,26 +1,25 @@
-package ladder.domain.item;
+package ladder.domain;
 
 import static java.util.stream.Collectors.toUnmodifiableList;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import ladder.domain.ladder.Position;
 
 public class Items {
- private static final String INVALID_ITEM_COUNT_MESSAGE = "참가인원과 동일한 개수의 실행결과를 입력해야 합니다.";
- private static final String INVALID_ITEM_MESSAGE = "해당 위치에 있는 아이템이 존재하지 않습니다.";
+ static final String INVALID_ITEM_COUNT_MESSAGE = "참가인원과 동일한 개수의 실행결과를 입력해야 합니다.";
+ static final String INVALID_ITEM_MESSAGE = "해당 위치에 있는 아이템이 존재하지 않습니다.";
 
  private final List<Item> items;
 
  private Items(final List<Item> items) {
  this.items = items;
  }
 
- public static Items from(final List<String> names, int playerCount) {
+ public static Items of(final List<String> names, int playerCount) {
  validateItemCount(names, playerCount);
  return IntStream.range(0, names.size())
- .mapToObj(index -> new Item(names.get(index), Position.valueOf(index)))
+ .mapToObj(index -> Item.of(names.get(index), index))
  .collect(Collectors.collectingAndThen(Collectors.toList(), Items::new));
  }
 

src/main/java/ladder/domain/ladder/Ladder.java → src/main/java/ladder/domain/Ladder.java

@@ -1,11 +1,12 @@
-package ladder.domain.ladder;
+package ladder.domain;
 
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.toList;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
+import ladder.util.BooleanGenerator;
 
 public class Ladder {
 

src/main/java/ladder/domain/ladder/LadderGame.java → src/main/java/ladder/domain/LadderGame.java

@@ -1,12 +1,9 @@
-package ladder.domain.ladder;
+package ladder.domain;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import ladder.domain.item.Item;
-import ladder.domain.item.Items;
-import ladder.domain.player.Player;
-import ladder.domain.player.Players;
+import ladder.util.BooleanGenerator;
 
 public class LadderGame {
  private static final int SUBTRACT_LADDER_WIDTH_VALUE = 1;

src/main/java/ladder/domain/ladder/LadderGameResult.java → src/main/java/ladder/domain/LadderGameResult.java

@@ -1,13 +1,11 @@
-package ladder.domain.ladder;
+package ladder.domain;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import ladder.domain.item.Item;
-import ladder.domain.player.Player;
 
 public class LadderGameResult {
+ static final String INVALID_PLAYER_MESSAGE = "사다리 게임에 참가한 사람의 이름을 입력해야합니다.";
  private static final String MULTIPLE_RESULT_RESERVED_NAME = "all";
- private static final String INVALID_PLAYER_MESSAGE = "사다리 게임에 참가한 사람의 이름을 입력해야합니다.";
 
  private final Map<Player, Item> result;
 
@@ -42,8 +40,23 @@ private Map<String, String> getSingleResult(final String name) {
 
  private Player findPlayer(final String name) {
  return result.keySet().stream()
- .filter(player -> player.getName().equals(name))
+ .filter(player -> player.isSameName(name))
  .findFirst()
  .orElseThrow(() -> new IllegalArgumentException(INVALID_PLAYER_MESSAGE));
  }
+
+ public void validatePlayerName(final String name) {
+ if (isNotReservedName(name) && isInvalidPlayerName(name)) {
+ throw new IllegalArgumentException(INVALID_PLAYER_MESSAGE);
+ }
+ }
+
+ private boolean isNotReservedName(final String name) {
+ return !MULTIPLE_RESULT_RESERVED_NAME.equals(name);
+ }
+
+ private boolean isInvalidPlayerName(final String name) {
+ return this.result.keySet().stream()
+ .noneMatch(player -> player.isSameName(name));
+ }
 }

src/main/java/ladder/domain/ladder/Line.java → src/main/java/ladder/domain/Line.java

@@ -1,9 +1,10 @@
-package ladder.domain.ladder;
+package ladder.domain;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import ladder.util.BooleanGenerator;
 
 public class Line {
 

src/main/java/ladder/domain/ladder/LineStatus.java → src/main/java/ladder/domain/LineStatus.java

@@ -1,4 +1,4 @@
-package ladder.domain.ladder;
+package ladder.domain;
 
 public enum LineStatus {
  CONNECTED,

src/main/java/ladder/domain/player/Player.java → src/main/java/ladder/domain/Player.java

@@ -1,21 +1,26 @@
-package ladder.domain.player;
-
-import ladder.domain.ladder.Ladder;
-import ladder.domain.ladder.Position;
+package ladder.domain;
 
 public class Player {
  private final PlayerName name;
  private final Position position;
 
- public Player(final String name, final Position position) {
- this.name = new PlayerName(name);
+ private Player(final PlayerName name, final Position position) {
+ this.name = name;
  this.position = position;
  }
 
+ public static Player of(final String name, final int index) {
+ return new Player(new PlayerName(name), Position.valueOf(index));
+ }
+
  public Position play(final Ladder ladder) {
  return ladder.play(position);
  }
 
+ public boolean isSameName(final String name) {
+ return this.name.isSameAs(name);
+ }
+
  public boolean isSamePosition(final Position position) {
  return this.position == position;
  }

src/main/java/ladder/domain/player/PlayerName.java → src/main/java/ladder/domain/PlayerName.java

@@ -1,11 +1,10 @@
-package ladder.domain.player;
+package ladder.domain;
 
 public class PlayerName {
+ static final String RESERVED_NAME_MESSAGE = "all은 사용할 수 없는 이름입니다.";
  private static final int NAME_LENGTH_UPPER_BOUND = 5;
- private static final String INVALID_NAME_LENGTH_MESSAGE =
- "이름은 1자 이상, " + NAME_LENGTH_UPPER_BOUND + "자 이하여야 합니다.";
+ static final String INVALID_NAME_LENGTH_MESSAGE = "이름은 1자 이상, " + NAME_LENGTH_UPPER_BOUND + "자 이하여야 합니다.";
  private static final String RESERVED_NAME = "all";
- private static final String RESERVED_NAME_MESSAGE = "all은 사용할 수 없는 이름입니다.";
 
  private final String value;
 
@@ -35,6 +34,10 @@ private void validateReservedName(final String name) {
  }
  }
 
+ public boolean isSameAs(final String name) {
+ return value.equals(name);
+ }
+
  private boolean isReservedName(final String name) {
  return RESERVED_NAME.equals(name);
  }

src/main/java/ladder/domain/player/Players.java → src/main/java/ladder/domain/Players.java

@@ -1,4 +1,4 @@
-package ladder.domain.player;
+package ladder.domain;
 
 import static java.util.stream.Collectors.toUnmodifiableList;
 
@@ -9,17 +9,15 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import ladder.domain.ladder.Ladder;
-import ladder.domain.ladder.Position;
 
 public class Players {
+ static final String DUPLICATE_NAMES_MESSAGE = "참가자의 이름은 중복되지 않아야 합니다.";
+ static final String INVALID_PLAYER_MESSAGE = "해당 위치에 있는 참가자가 존재하지 않습니다.";
  private static final int PLAYERS_SIZE_LOWER_BOUND = 2;
  private static final int PLAYERS_SIZE_UPPER_BOUND = 20;
- private static final String INVALID_PLAYERS_SIZE_MESSAGE =
+ static final String INVALID_PLAYERS_SIZE_MESSAGE =
  "참가자는 최소 " + PLAYERS_SIZE_LOWER_BOUND + "명, 최대 " + PLAYERS_SIZE_UPPER_BOUND + "명이어야 합니다.";
- private static final String DUPLICATE_NAMES_MESSAGE = "참가자의 이름은 중복되지 않아야 합니다.";
- private static final String INVALID_PLAYER_MESSAGE = "해당 위치에 있는 참가자가 존재하지 않습니다.";
-
+
  private final List<Player> players;
 
  private Players(final List<Player> players) {
@@ -29,7 +27,7 @@ private Players(final List<Player> players) {
  public static Players from(final List<String> names) {
  validate(names);
  return IntStream.range(0, names.size())
- .mapToObj(index -> new Player(names.get(index), Position.valueOf(index)))
+ .mapToObj(index -> Player.of(names.get(index), index))
  .collect(Collectors.collectingAndThen(Collectors.toList(), Players::new));
  }