From 2c75e7d807622d576635218fb829542443f04007 Mon Sep 17 00:00:00 2001
From: Xavier Fontanet <xavier.fontanet@edreamsodigeo.com>
Date: Fri, 21 Jun 2024 18:16:43 +0200
Subject: [PATCH] Revert "separate UI from business core"

This reverts commit a8e2d506fadfc57464a4dbb86cf88604be1f3d48.
---
 .../codingtests/marsrover/{core => }/Coordinates.java  |  2 +-
 .../codingtests/marsrover/{core => }/Direction.java    |  2 +-
 .../{core => }/MapIncrementalPositionResolver.java     |  2 +-
 .../codingtests/marsrover/{core => }/MarsMap.java      |  2 +-
 .../codingtests/marsrover/{core => }/MarsRover.java    |  2 +-
 .../marsrover/ui/ClientCommandInterface.java           |  2 +-
 .../codingtests/marsrover/ui/DirectionRetriever.java   |  2 +-
 .../marsrover/ui/RoverCommandsPerformer.java           |  2 +-
 .../codingtests/marsrover/ui/RoverInitializer.java     | 10 +++++-----
 .../marsrover/{core => }/MarsRoverTest.java            |  4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename src/main/java/cat/hack3/codingtests/marsrover/{core => }/Coordinates.java (90%)
 rename src/main/java/cat/hack3/codingtests/marsrover/{core => }/Direction.java (94%)
 rename src/main/java/cat/hack3/codingtests/marsrover/{core => }/MapIncrementalPositionResolver.java (94%)
 rename src/main/java/cat/hack3/codingtests/marsrover/{core => }/MarsMap.java (98%)
 rename src/main/java/cat/hack3/codingtests/marsrover/{core => }/MarsRover.java (96%)
 rename src/test/java/cat/hack3/codingtests/marsrover/{core => }/MarsRoverTest.java (97%)

diff --git a/src/main/java/cat/hack3/codingtests/marsrover/core/Coordinates.java b/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java
similarity index 90%
rename from src/main/java/cat/hack3/codingtests/marsrover/core/Coordinates.java
rename to src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java
index 7801d1a..0a56364 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/core/Coordinates.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 public record Coordinates(int latitude, int longitude) {
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/core/Direction.java b/src/main/java/cat/hack3/codingtests/marsrover/Direction.java
similarity index 94%
rename from src/main/java/cat/hack3/codingtests/marsrover/core/Direction.java
rename to src/main/java/cat/hack3/codingtests/marsrover/Direction.java
index 2d18660..d321510 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/core/Direction.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/Direction.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 public enum Direction {
     NORTH, SOUTH, EAST, WEST;
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/core/MapIncrementalPositionResolver.java b/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java
similarity index 94%
rename from src/main/java/cat/hack3/codingtests/marsrover/core/MapIncrementalPositionResolver.java
rename to src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java
index 3bd3c18..710f7d5 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/core/MapIncrementalPositionResolver.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 public class MapIncrementalPositionResolver {
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/core/MarsMap.java b/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java
similarity index 98%
rename from src/main/java/cat/hack3/codingtests/marsrover/core/MarsMap.java
rename to src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java
index 5452c9c..ee8cd20 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/core/MarsMap.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import java.util.logging.Logger;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/core/MarsRover.java b/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java
similarity index 96%
rename from src/main/java/cat/hack3/codingtests/marsrover/core/MarsRover.java
rename to src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java
index 92e8d91..ff2507e 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/core/MarsRover.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import java.util.logging.Logger;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
index d87d33d..90c72e9 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.core.MarsRover;
+import cat.hack3.codingtests.marsrover.MarsRover;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java
index f614c3d..e936d89 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java
@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.core.Direction;
+import cat.hack3.codingtests.marsrover.Direction;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java
index 2314abe..082fc2d 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java
@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.core.MarsRover;
+import cat.hack3.codingtests.marsrover.MarsRover;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java
index 3c49213..9d4ac44 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java
@@ -1,9 +1,9 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.core.Coordinates;
-import cat.hack3.codingtests.marsrover.core.Direction;
-import cat.hack3.codingtests.marsrover.core.MarsMap;
-import cat.hack3.codingtests.marsrover.core.MarsRover;
+import cat.hack3.codingtests.marsrover.Coordinates;
+import cat.hack3.codingtests.marsrover.Direction;
+import cat.hack3.codingtests.marsrover.MarsMap;
+import cat.hack3.codingtests.marsrover.MarsRover;
 
 import java.util.InputMismatchException;
 import java.util.Scanner;
@@ -11,7 +11,7 @@ import java.util.Scanner;
 import static cat.hack3.codingtests.marsrover.ui.UICommons.output;
 
 public class RoverInitializer {
-    private final Scanner reader;
+    private Scanner reader;
     private final DirectionRetriever directionRetriever;
 
 
diff --git a/src/test/java/cat/hack3/codingtests/marsrover/core/MarsRoverTest.java b/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java
similarity index 97%
rename from src/test/java/cat/hack3/codingtests/marsrover/core/MarsRoverTest.java
rename to src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java
index 5d6861b..2e755d8 100644
--- a/src/test/java/cat/hack3/codingtests/marsrover/core/MarsRoverTest.java
+++ b/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java
@@ -1,11 +1,11 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.stream.IntStream;
 
-import static cat.hack3.codingtests.marsrover.core.Direction.*;
+import static cat.hack3.codingtests.marsrover.Direction.*;
 import static org.testng.Assert.assertEquals;
 
 public class MarsRoverTest {