refactor : indent 규칙에 맞게 리팩토링

woowacourse · Apr 6, 2020 · 6002bdc · 6002bdc
1 parent 6fed1bb
commit 6002bdc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/src/main/java/chess/domain/piece/Bishop.java b/src/main/java/chess/domain/piece/Bishop.java
@@ -45,13 +45,17 @@ protected void validateMovingPolicy(Position target, Map<Position, PieceDto> boa
 
         Position startPathPosition = position.moveByDirection(movingDirection);
         while (!startPathPosition.equals(target)) {
-            if (!Objects.isNull(boardDto.get(startPathPosition))) {
-                throw new ObstacleOnPathException();
-            }
+            checkObstacleOnPath(boardDto, startPathPosition);
             startPathPosition = startPathPosition.moveByDirection(movingDirection);
         }
     }
 
+    private void checkObstacleOnPath(final Map<Position, PieceDto> boardDto, final Position startPathPosition) {
+        if (!Objects.isNull(boardDto.get(startPathPosition))) {
+            throw new ObstacleOnPathException();
+        }
+    }
+
     @Override
     public String getFigure() {
         if (player == Player.BLACK) {

diff --git a/src/main/java/chess/domain/piece/NotMovedPawn.java b/src/main/java/chess/domain/piece/NotMovedPawn.java
@@ -55,6 +55,4 @@ protected PieceState makePieceState() {
         //MovedPawn 리턴
         return MovedPawn.of(position, player);
     }
-
-
 }
diff --git a/src/main/java/chess/domain/piece/Queen.java b/src/main/java/chess/domain/piece/Queen.java
@@ -48,14 +48,18 @@ protected void validateMovingPolicy(Position target, Map<Position, PieceDto> boa
 
         Position startPathPosition = position.moveByDirection(movingDirection);
         while (!startPathPosition.equals(target)) {
-            if (!Objects.isNull(boardDto.get(startPathPosition))) {
-                throw new ObstacleOnPathException();
-            }
+            checkObstacleOnPath(boardDto, startPathPosition);
             startPathPosition = startPathPosition.moveByDirection(movingDirection);
         }
 
     }
 
+    private void checkObstacleOnPath(final Map<Position, PieceDto> boardDto, final Position startPathPosition) {
+        if (!Objects.isNull(boardDto.get(startPathPosition))) {
+            throw new ObstacleOnPathException();
+        }
+    }
+
     @Override
     public String getFigure() {
         if (player == Player.BLACK) {

diff --git a/src/main/java/chess/domain/piece/Rook.java b/src/main/java/chess/domain/piece/Rook.java
@@ -44,13 +44,17 @@ protected void validateMovingPolicy(Position target, Map<Position, PieceDto> boa
 
         Position startPathPosition = position.moveByDirection(movingDirection);
         while (!startPathPosition.equals(target)) {
-            if (!Objects.isNull(boardDto.get(startPathPosition))) {
-                throw new ObstacleOnPathException();
-            }
+            checkObstacleOnPath(boardDto, startPathPosition);
             startPathPosition = startPathPosition.moveByDirection(movingDirection);
         }
     }
 
+    private void checkObstacleOnPath(final Map<Position, PieceDto> boardDto, final Position startPathPosition) {
+        if (!Objects.isNull(boardDto.get(startPathPosition))) {
+            throw new ObstacleOnPathException();
+        }
+    }
+
     @Override
     public String getFigure() {
         if (player == Player.BLACK) {

diff --git a/src/main/java/chess/domain/result/Status.java b/src/main/java/chess/domain/result/Status.java
@@ -20,6 +20,5 @@ public Player getWinner() {
             return Player.WHITE;
         }
         return Player.BLACK;
-
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,4 @@ protected PieceState makePieceState() { @@
             //MovedPawn 리턴
             return MovedPawn.of(position, player);
         }
     }