Refactor: RandomUtil, Controller, DTO 추가 및 책임 분배

Author: seun0123

src/main/java/Application.java

@@ -1,12 +1,14 @@
-import domain.Ladder;
+import controller.LadderController;
+import dto.LadderDto;
 import utils.exception.ExceptionHandler;
 import view.LadderView;
 
 public class Application {
     public static void main(String[] args) {
         try {
-            Ladder ladder = Ladder.of(4, 4);
-            LadderView.printLadder(ladder);
+            LadderController ladderController = new LadderController(4, 4);
+            LadderDto ladderDto = ladderController.getLadderData();
+            LadderView.printLadder(ladderDto);
         } catch (Exception e) {
             ExceptionHandler.handleException(e);
         }

src/main/java/controller/LadderController.java

@@ -0,0 +1,16 @@
+package controller;
+
+import domain.Ladder;
+import dto.LadderDto;
+
+public class LadderController {
+    private final Ladder ladder;
+
+    public LadderController(int width, int height) {
+        this.ladder = Ladder.of(width, height);
+    }
+
+    public LadderDto getLadderData() {
+        return LadderDto.from(ladder);
+    }
+}

src/main/java/dto/LadderDto.java

@@ -0,0 +1,26 @@
+package dto;
+
+import domain.Ladder;
+import domain.Line;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class LadderDto {
+    private final List<List<Boolean>> ladderData;
+
+    public LadderDto(List<List<Boolean>> ladderData) {
+        this.ladderData = ladderData;
+    }
+
+    public static LadderDto from(Ladder ladder) {
+        return new LadderDto(
+                ladder.getLines().getLines().stream()
+                        .map(Line::getPoints)
+                        .collect(Collectors.toList())
+        );
+    }
+
+    public List<List<Boolean>> getLadderData() {
+        return ladderData;
+    }
+}

src/main/java/utils/RandomUtil.java

@@ -0,0 +1,15 @@
+package utils;
+
+import java.util.Random;
+
+public class RandomUtil {
+    public static final Random random = new Random();
+
+    public static boolean nextBoolean() {
+        return random.nextBoolean();
+    }
+
+    public static int nextInt(int bound) {
+        return random.nextInt(bound);
+    }
+}

src/main/java/utils/generator/ReservedPositionGenerator.java

@@ -1,22 +1,20 @@
 package utils.generator;
 
+import utils.RandomUtil;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Random;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 public class ReservedPositionGenerator {
-    private static final Random RANDOM = new Random();
-
     public static List<Set<Integer>> generate(int width, int height) {
         List<Set<Integer>> reserved = IntStream.range(0, height)
                 .mapToObj(i -> new HashSet<Integer>())
                 .collect(Collectors.toList());
 
         IntStream.range(0, width)
-                .forEach(i -> reserved.get(RANDOM.nextInt(height)).add(i));
+                .forEach(i -> reserved.get(RandomUtil.nextInt(height)).add(i));
 
         return reserved;
     }

src/main/java/utils/generator/SingleLineGenerator.java

@@ -1,12 +1,12 @@
 package utils.generator;
 
 import domain.Line;
+import utils.RandomUtil;
+
 import java.util.*;
 import java.util.stream.IntStream;
 
 public class SingleLineGenerator {
-    private static final Random RANDOM = new Random();
-
     public static Line generate(int width, Set<Integer> reserved, Line prev) {
         List<Boolean> points = new ArrayList<>(Collections.nCopies(width, false));
 
@@ -18,7 +18,7 @@ public static Line generate(int width, Set<Integer> reserved, Line prev) {
 
         IntStream.range(0, width).forEach(i -> {
             if (!points.get(i) && isNotOverlap(points, prev, i)) {
-                points.set(i, RANDOM.nextBoolean());
+                points.set(i, RandomUtil.nextBoolean());
             }
         });
 

src/main/java/utils/validator/LadderValidator.java

@@ -1,14 +1,11 @@
 package utils.validator;
 
 import domain.Line;
+import utils.RandomUtil;
 import java.util.List;
-import java.util.Random;
 import java.util.stream.IntStream;
 
-
 public class LadderValidator {
-    private static final Random RANDOM = new Random();
-
     public static void validate(List<Line> lines, int width) {
         IntStream.rangeClosed(0, width)
                 .forEach(i -> validateColumn(lines, i, width));
@@ -17,7 +14,7 @@ public static void validate(List<Line> lines, int width) {
     private static void validateColumn(List<Line> lines, int col, int width) {
         boolean emptyColumn = lines.stream().noneMatch(line -> hasBridgeAt(line, col, width));
         if (emptyColumn) {
-            connect(lines.get(RANDOM.nextInt(lines.size())), col, width);
+            connect(lines.get(RandomUtil.nextInt(lines.size())), col, width);
         }
     }
 

src/main/java/view/LadderView.java

@@ -1,25 +1,21 @@
 package view;
 
-import domain.Ladder;
-import domain.Lines;
-import domain.Line;
+import dto.LadderDto;
+
+import java.util.List;
 
 public class LadderView {
     private static final String BRIDGE = "-----|";
     private static final String SPACE = "     |";
     private static final String BAR = "|";
 
-    public static void printLadder(Ladder ladder) {
-        printLines(ladder.getLines());
-    }
-
-    private static void printLines(Lines lines) {
-        lines.getLines().forEach(LadderView::printLine);
+    public static void printLadder(LadderDto ladderDto) {
+        ladderDto.getLadderData().forEach(LadderView::printLine);
     }
 
-    private static void printLine(Line line) {
+    private static void printLine(List<Boolean> line) {
         System.out.print(BAR);
-        line.getPoints().forEach(LadderView::printPoint);
+        line.forEach(LadderView::printPoint);
         System.out.println();
     }