From 792caa39a4c9bd9d7aa2ea96d5143d12e5bcfe47 Mon Sep 17 00:00:00 2001 From: Xavier Fontanet Date: Sat, 22 Jun 2024 12:57:37 +0200 Subject: [PATCH] separate into different modules --- mars-station/pom.xml | 19 +++++++++++++ .../codingtests/marsrover/Coordinates.java | 0 .../codingtests/marsrover/Direction.java | 0 .../MapIncrementalPositionResolver.java | 0 .../hack3/codingtests/marsrover/MarsMap.java | 0 .../codingtests/marsrover/MarsRover.java | 0 .../codingtests/marsrover/MarsRoverTest.java | 0 .../marsrover/MarsRoverWithObstaclesTest.java | 0 pom.xml | 8 +++++- user-interface-console/pom.xml | 27 +++++++++++++++++++ .../ui/console}/ClientCommandInterface.java | 4 +-- .../ui/console}/DirectionRetriever.java | 5 ++-- .../ui/console}/PresentationMessage.java | 2 +- .../ui/console}/RoverCommandsPerformer.java | 6 ++--- .../ui/console}/RoverInitializer.java | 4 +-- .../marsrover/ui/console}/UICommons.java | 2 +- 16 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 mars-station/pom.xml rename {src => mars-station/src}/main/java/cat/hack3/codingtests/marsrover/Coordinates.java (100%) rename {src => mars-station/src}/main/java/cat/hack3/codingtests/marsrover/Direction.java (100%) rename {src => mars-station/src}/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java (100%) rename {src => mars-station/src}/main/java/cat/hack3/codingtests/marsrover/MarsMap.java (100%) rename {src => mars-station/src}/main/java/cat/hack3/codingtests/marsrover/MarsRover.java (100%) rename {src => mars-station/src}/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java (100%) rename {src => mars-station/src}/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java (100%) create mode 100644 user-interface-console/pom.xml rename {src/main/java/cat/hack3/codingtests/marsrover/ui => user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console}/ClientCommandInterface.java (88%) rename {src/main/java/cat/hack3/codingtests/marsrover/ui => user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console}/DirectionRetriever.java (90%) rename {src/main/java/cat/hack3/codingtests/marsrover/ui => user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console}/PresentationMessage.java (98%) rename {src/main/java/cat/hack3/codingtests/marsrover/ui => user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console}/RoverCommandsPerformer.java (82%) rename {src/main/java/cat/hack3/codingtests/marsrover/ui => user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console}/RoverInitializer.java (95%) rename {src/main/java/cat/hack3/codingtests/marsrover/ui => user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console}/UICommons.java (88%) diff --git a/mars-station/pom.xml b/mars-station/pom.xml new file mode 100644 index 0000000..6df7410 --- /dev/null +++ b/mars-station/pom.xml @@ -0,0 +1,19 @@ + + + + mars-rover + cat.hack3.codingtests + 1.0-SNAPSHOT + + 4.0.0 + + mars-station + + + 17 + 17 + + + \ No newline at end of file diff --git a/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java similarity index 100% rename from src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java diff --git a/src/main/java/cat/hack3/codingtests/marsrover/Direction.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/Direction.java similarity index 100% rename from src/main/java/cat/hack3/codingtests/marsrover/Direction.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/Direction.java diff --git a/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java similarity index 100% rename from src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java diff --git a/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java similarity index 100% rename from src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java diff --git a/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java similarity index 100% rename from src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java diff --git a/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java b/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java similarity index 100% rename from src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java rename to mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java diff --git a/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java b/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java similarity index 100% rename from src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java rename to mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java diff --git a/pom.xml b/pom.xml index 114f2be..c43654c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,9 +5,15 @@ 4.0.0 cat.hack3.codingtests - wallapop-backend-test + mars-rover + pom 1.0-SNAPSHOT + + mars-station + user-interface-console + + 17 17 diff --git a/user-interface-console/pom.xml b/user-interface-console/pom.xml new file mode 100644 index 0000000..8c593ef --- /dev/null +++ b/user-interface-console/pom.xml @@ -0,0 +1,27 @@ + + + + mars-rover + cat.hack3.codingtests + 1.0-SNAPSHOT + + 4.0.0 + + user-interface-console + + + 17 + 17 + + + + + cat.hack3.codingtests + mars-station + 1.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/ClientCommandInterface.java similarity index 88% rename from src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java rename to user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/ClientCommandInterface.java index 4dd32f1..ec99af1 100644 --- a/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/ClientCommandInterface.java @@ -1,10 +1,10 @@ -package cat.hack3.codingtests.marsrover.ui; +package cat.hack3.codingtests.marsrover.ui.console; import cat.hack3.codingtests.marsrover.MarsRover; import java.util.Scanner; -import static cat.hack3.codingtests.marsrover.ui.UICommons.output; +import static cat.hack3.codingtests.marsrover.ui.console.UICommons.output; public class ClientCommandInterface { diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java similarity index 90% rename from src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java rename to user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java index e936d89..9864011 100644 --- a/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java @@ -1,10 +1,11 @@ -package cat.hack3.codingtests.marsrover.ui; +package cat.hack3.codingtests.marsrover.ui.console; + import cat.hack3.codingtests.marsrover.Direction; import java.util.Scanner; -import static cat.hack3.codingtests.marsrover.ui.UICommons.*; +import static cat.hack3.codingtests.marsrover.ui.console.UICommons.*; public class DirectionRetriever { private final Scanner reader; diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/PresentationMessage.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/PresentationMessage.java similarity index 98% rename from src/main/java/cat/hack3/codingtests/marsrover/ui/PresentationMessage.java rename to user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/PresentationMessage.java index 2de9f42..7e47f21 100644 --- a/src/main/java/cat/hack3/codingtests/marsrover/ui/PresentationMessage.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/PresentationMessage.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover.ui; +package cat.hack3.codingtests.marsrover.ui.console; public interface PresentationMessage { String INTRO = """ diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverCommandsPerformer.java similarity index 82% rename from src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java rename to user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverCommandsPerformer.java index 082fc2d..291643d 100644 --- a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverCommandsPerformer.java @@ -1,11 +1,11 @@ -package cat.hack3.codingtests.marsrover.ui; +package cat.hack3.codingtests.marsrover.ui.console; import cat.hack3.codingtests.marsrover.MarsRover; import java.util.Scanner; -import static cat.hack3.codingtests.marsrover.ui.UICommons.isNotExitSignal; -import static cat.hack3.codingtests.marsrover.ui.UICommons.output; +import static cat.hack3.codingtests.marsrover.ui.console.UICommons.isNotExitSignal; +import static cat.hack3.codingtests.marsrover.ui.console.UICommons.output; public class RoverCommandsPerformer { private final Scanner reader; diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java similarity index 95% rename from src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java rename to user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java index ca4eaf0..d0f1d5d 100644 --- a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover.ui; +package cat.hack3.codingtests.marsrover.ui.console; import cat.hack3.codingtests.marsrover.Coordinates; import cat.hack3.codingtests.marsrover.Direction; @@ -9,7 +9,7 @@ import java.util.InputMismatchException; import java.util.List; import java.util.Scanner; -import static cat.hack3.codingtests.marsrover.ui.UICommons.output; +import static cat.hack3.codingtests.marsrover.ui.console.UICommons.output; public class RoverInitializer { private final Scanner reader; diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/UICommons.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/UICommons.java similarity index 88% rename from src/main/java/cat/hack3/codingtests/marsrover/ui/UICommons.java rename to user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/UICommons.java index 3fe0030..982cb08 100644 --- a/src/main/java/cat/hack3/codingtests/marsrover/ui/UICommons.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/UICommons.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover.ui; +package cat.hack3.codingtests.marsrover.ui.console; public class UICommons {