refactor: 컨벤션 정리.

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

@@ -12,14 +12,14 @@
 
 public class LadderGameController {
 
-    public static void main(String[] args) {
-        String[] strings = Input.inputPlayers();
-        Players players = Arrays.stream(strings)
-                .map(Player::new)
-                .collect(Collectors.collectingAndThen(Collectors.toList(), Players::new));
+	public static void main(String[] args) {
+		String[] strings = Input.inputPlayers();
+		Players players = Arrays.stream(strings)
+			.map(Player::new)
+			.collect(Collectors.collectingAndThen(Collectors.toList(), Players::new));
 
-        Ladder ladder = new Ladder(Input.inputLadderHeights(), players.number());
+		Ladder ladder = new Ladder(Input.inputLadderHeights(), players.number());
 
-        Output.outputResult(ladder, players);
-    }
+		Output.outputResult(ladder, players);
+	}
 }

src/main/java/nextstep/ladder/model/Ladder.java

@@ -4,22 +4,21 @@
 import java.util.List;
 
 public class Ladder {
-    private final List<Lines> lines;
+	private final List<Lines> lines;
 
-    public Ladder(final int numberOfFloors, final int numberOfPlayers) {
-        List<Lines> result = new ArrayList<>();
-        for (int i = 0; i < numberOfFloors; i++) {
-            result.add(new Lines(numberOfPlayers));
-        }
-        this.lines = result;
-    }
+	public Ladder(final int numberOfFloors, final int numberOfPlayers) {
+		List<Lines> result = new ArrayList<>();
+		for (int i = 0; i < numberOfFloors; i++) {
+			result.add(new Lines(numberOfPlayers));
+		}
+		this.lines = result;
+	}
 
+	public int numberOfFloors() {
+		return lines.size();
+	}
 
-    public int numberOfFloors() {
-        return lines.size();
-    }
-
-    public List<Lines> getLines() {
-        return lines;
-    }
+	public List<Lines> getLines() {
+		return lines;
+	}
 }

src/main/java/nextstep/ladder/model/Line.java

@@ -37,7 +37,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		if(hasLine){
+		if (hasLine) {
 			return "-----|";
 		}
 		return "     |";

src/main/java/nextstep/ladder/model/Lines.java

@@ -16,13 +16,13 @@ public Lines(final int countOfPlayer) {
 	}
 
 	private Line getPrevLine(final List<Line> result, final int i) {
-		if(i == 0){
+		if (i == 0) {
 			return null;
 		}
 		return result.get(i - 1);
 	}
 
-	public int size(){
+	public int size() {
 		return lines.size();
 	}
 

src/main/java/nextstep/ladder/model/Players.java

@@ -4,20 +4,20 @@
 import java.util.stream.Collectors;
 
 public class Players {
-    private List<Player> players;
+	private List<Player> players;
 
-    public Players(List<Player> players) {
-        this.players = players;
-    }
+	public Players(List<Player> players) {
+		this.players = players;
+	}
 
-    public int number() {
-        return players.size();
-    }
+	public int number() {
+		return players.size();
+	}
 
-    @Override
-    public String toString() {
-        return players.stream()
-                .map(Player::toString)
-                .collect(Collectors.joining());
-    }
+	@Override
+	public String toString() {
+		return players.stream()
+			.map(Player::toString)
+			.collect(Collectors.joining());
+	}
 }

src/main/java/nextstep/ladder/view/Input.java

@@ -4,29 +4,28 @@
 import java.util.Scanner;
 
 public class Input {
-    private final static Scanner SCANNER = new Scanner(System.in);
-    private final static String SEPARATOR = ",";
-
-    private Input() {
-    }
-
-    public static String[] inputPlayers(){
-        System.out.println("참여할 사람 이름을 입력하세요. (이름은 쉼표(,)로 구분하세요)");
-        String players = nextLine();
-        System.out.println();
-        return players.split(SEPARATOR);
-    }
-
-    public static int inputLadderHeights(){
-        System.out.println("최대 사다리 높이는 몇 개인가요?");
-        String height = nextLine();
-        System.out.println();
-        return Integer.parseInt(height);
-    }
-
-    private static String nextLine(){
-        return SCANNER.nextLine();
-    }
-
+	private final static Scanner SCANNER = new Scanner(System.in);
+	private final static String SEPARATOR = ",";
+
+	private Input() {
+	}
+
+	public static String[] inputPlayers() {
+		System.out.println("참여할 사람 이름을 입력하세요. (이름은 쉼표(,)로 구분하세요)");
+		String players = nextLine();
+		System.out.println();
+		return players.split(SEPARATOR);
+	}
+
+	public static int inputLadderHeights() {
+		System.out.println("최대 사다리 높이는 몇 개인가요?");
+		String height = nextLine();
+		System.out.println();
+		return Integer.parseInt(height);
+	}
+
+	private static String nextLine() {
+		return SCANNER.nextLine();
+	}
 
 }

src/main/java/nextstep/ladder/view/Output.java

@@ -8,16 +8,16 @@
 import java.util.List;
 
 public class Output {
-    private Output() {
-    }
+	private Output() {
+	}
 
-    public static void outputResult(Ladder ladder, Players players){
-        System.out.println(players);
-        List<Lines> lines = ladder.getLines();
-        for (Lines line : lines) {
-            System.out.print("     |");
-            System.out.print(line);
-            System.out.println();
-        }
-    }
+	public static void outputResult(Ladder ladder, Players players) {
+		System.out.println(players);
+		List<Lines> lines = ladder.getLines();
+		for (Lines line : lines) {
+			System.out.print("     |");
+			System.out.print(line);
+			System.out.println();
+		}
+	}
 }

src/main/java/nextstep/optional/Computer.java

@@ -1,39 +1,39 @@
 package nextstep.optional;
 
 public class Computer {
-    private Soundcard soundcard;
+	private Soundcard soundcard;
 
-    public Computer(Soundcard soundcard) {
-        this.soundcard = soundcard;
-    }
+	public Computer(Soundcard soundcard) {
+		this.soundcard = soundcard;
+	}
 
-    public Soundcard getSoundcard() {
-        return soundcard;
-    }
+	public Soundcard getSoundcard() {
+		return soundcard;
+	}
 
-    public static class Soundcard {
-        private USB usb;
+	public static class Soundcard {
+		private USB usb;
 
-        public Soundcard(USB usb) {
-            super();
-            this.usb = usb;
-        }
+		public Soundcard(USB usb) {
+			super();
+			this.usb = usb;
+		}
 
-        public USB getUsb() {
-            return usb;
-        }
-    }
+		public USB getUsb() {
+			return usb;
+		}
+	}
 
-    public static class USB {
-        private String version;
+	public static class USB {
+		private String version;
 
-        public USB(String version) {
-            super();
-            this.version = version;
-        }
+		public USB(String version) {
+			super();
+			this.version = version;
+		}
 
-        public String getVersion() {
-            return this.version;
-        }
-    }
+		public String getVersion() {
+			return this.version;
+		}
+	}
 }

src/main/java/nextstep/optional/ComputerStore.java

@@ -4,23 +4,23 @@
 import nextstep.optional.Computer.USB;
 
 public class ComputerStore {
-    public static final String UNKNOWN_VERSION = "UNKNOWN";
+	public static final String UNKNOWN_VERSION = "UNKNOWN";
 
-    public static String getVersion(Computer computer) {
-        String version = UNKNOWN_VERSION;
-        if (computer != null) {
-            Soundcard soundcard = computer.getSoundcard();
-            if (soundcard != null) {
-                USB usb = soundcard.getUsb();
-                if (usb != null) {
-                    version = usb.getVersion();
-                }
-            }
-        }
-        return version;
-    }
+	public static String getVersion(Computer computer) {
+		String version = UNKNOWN_VERSION;
+		if (computer != null) {
+			Soundcard soundcard = computer.getSoundcard();
+			if (soundcard != null) {
+				USB usb = soundcard.getUsb();
+				if (usb != null) {
+					version = usb.getVersion();
+				}
+			}
+		}
+		return version;
+	}
 
-    public static String getVersionOptional(Computer computer) {
-        return null;
-    }
+	public static String getVersionOptional(Computer computer) {
+		return null;
+	}
 }

src/main/java/nextstep/optional/Expression.java

@@ -3,22 +3,22 @@
 import java.util.Arrays;
 
 enum Expression {
-    PLUS("+"), MINUS("-"), TIMES("*"), DIVIDE("/");
+	PLUS("+"), MINUS("-"), TIMES("*"), DIVIDE("/");
 
-    private String expression;
+	private String expression;
 
-    Expression(String expression) {
-        this.expression = expression;
-    }
+	Expression(String expression) {
+		this.expression = expression;
+	}
 
-    private static boolean matchExpression(Expression e, String expression) {
-        return expression.equals(e.expression);
-    }
+	private static boolean matchExpression(Expression e, String expression) {
+		return expression.equals(e.expression);
+	}
 
-    static Expression of(String expression) {
-        return Arrays.stream(values())
-            .filter(value -> matchExpression(value, expression))
-            .findAny()
-            .orElseThrow(() -> new IllegalArgumentException(String.format("%s는 사칙연산에 해당하지 않는 표현식입니다.", expression)));
-    }
+	static Expression of(String expression) {
+		return Arrays.stream(values())
+			.filter(value -> matchExpression(value, expression))
+			.findAny()
+			.orElseThrow(() -> new IllegalArgumentException(String.format("%s는 사칙연산에 해당하지 않는 표현식입니다.", expression)));
+	}
 }

src/main/java/nextstep/optional/User.java

@@ -3,72 +3,72 @@
 import java.util.Optional;
 
 public class User {
-    private String name;
-    private Integer age;
+	private String name;
+	private Integer age;
 
-    public User(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
+	public User(String name, Integer age) {
+		this.name = name;
+		this.age = age;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public Integer getAge() {
-        return age;
-    }
+	public Integer getAge() {
+		return age;
+	}
 
-    public boolean matchName(String name) {
-        return this.name.equals(name);
-    }
+	public boolean matchName(String name) {
+		return this.name.equals(name);
+	}
 
-    public static boolean ageIsInRange1(User user) {
-        boolean isInRange = false;
+	public static boolean ageIsInRange1(User user) {
+		boolean isInRange = false;
 
-        if (user != null && user.getAge() != null
-                && (user.getAge() >= 30
-                && user.getAge() <= 45)) {
-            isInRange = true;
-        }
-        return isInRange;
-    }
+		if (user != null && user.getAge() != null
+			&& (user.getAge() >= 30
+			&& user.getAge() <= 45)) {
+			isInRange = true;
+		}
+		return isInRange;
+	}
 
-    public static boolean ageIsInRange2(User user) {
-        return Optional.ofNullable(user)
-            .map(User::getAge)
-            .filter(age -> age >= 30 && age <= 45)
-            .isPresent();
-    }
+	public static boolean ageIsInRange2(User user) {
+		return Optional.ofNullable(user)
+			.map(User::getAge)
+			.filter(age -> age >= 30 && age <= 45)
+			.isPresent();
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((age == null) ? 0 : age.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((age == null) ? 0 : age.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        User other = (User) obj;
-        if (age == null) {
-            if (other.age != null)
-                return false;
-        } else if (!age.equals(other.age))
-            return false;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		User other = (User)obj;
+		if (age == null) {
+			if (other.age != null)
+				return false;
+		} else if (!age.equals(other.age))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		return true;
+	}
 }

src/main/java/nextstep/optional/Users.java

@@ -4,18 +4,19 @@
 import java.util.List;
 
 public class Users {
-    static final User DEFAULT_USER = new User("codesquad", 100);
+	static final User DEFAULT_USER = new User("codesquad", 100);
 
-    List<User> users = Arrays.asList(
-            new User("crong", 35),
-            new User("pobi", 30),
-            new User("jk", 40),
-            new User("honux", 45));
+	List<User> users = Arrays.asList(
+		new User("crong", 35),
+		new User("pobi", 30),
+		new User("jk", 40),
+		new User("honux", 45)
+	);
 
-    User getUser(String name) {
-        return users.stream()
-            .filter(user -> user.matchName(name))
-            .findAny()
-            .orElse(DEFAULT_USER);
-    }
+	User getUser(String name) {
+		return users.stream()
+			.filter(user -> user.matchName(name))
+			.findAny()
+			.orElse(DEFAULT_USER);
+	}
 }

src/test/java/nextstep/ladder/model/LadderTest.java

@@ -8,10 +8,10 @@
 
 class LadderTest {
 
-    @Test
-    void 사용자가_입력한_만큼_사다리의_층을_만든다() {
-        Ladder ladder = new Ladder(5, 4);
-        assertThat(ladder.numberOfFloors()).isEqualTo(5);
-    }
+	@Test
+	void 사용자가_입력한_만큼_사다리의_층을_만든다() {
+		Ladder ladder = new Ladder(5, 4);
+		assertThat(ladder.numberOfFloors()).isEqualTo(5);
+	}
 
-}
+}

src/test/java/nextstep/ladder/model/LineTest.java

@@ -13,9 +13,8 @@
 class LineTest {
 
 	@Test
-	void 이전_라인이_잇을경우_무조건_해당라인은_없다(){
+	void 이전_라인이_잇을경우_무조건_해당라인은_없다() {
 		Assertions.assertThat(Line.create(new Line(true))).isEqualTo(new Line(false));
 	}
 
-
 }

src/test/java/nextstep/ladder/model/LinesTest.java

@@ -9,7 +9,7 @@
 class LinesTest {
 
 	@Test
-	void 라인들은_플레이어의_숫자보다_1작다(){
+	void 라인들은_플레이어의_숫자보다_1작다() {
 		Lines lines = new Lines(4);
 		assertThat(lines.size()).isEqualTo(3);
 	}

src/test/java/nextstep/ladder/PlayerTest.java → src/test/java/nextstep/ladder/model/PlayerTest.java

@@ -1,4 +1,4 @@
-package nextstep.ladder;
+package nextstep.ladder.model;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -10,8 +10,7 @@ class PlayerTest {
 
 	@Test
 	void 사용자의_이름은_5자를_넘길수_없다() {
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> new Player("abcdef"))
+		assertThatIllegalArgumentException().isThrownBy(() -> new Player("abcdef"))
 			.withMessage("사용자의 이름은 5자를 넘을 수 없습니다");
 	}