From d5b677557843404744d89d5073fdef7c6200d73e Mon Sep 17 00:00:00 2001 From: Xavier Fontanet Date: Sat, 22 Jun 2024 13:05:49 +0200 Subject: [PATCH] separate cartography related to a different package --- .../java/cat/hack3/codingtests/marsrover/MarsRover.java | 4 ++++ .../marsrover/{ => cartography}/Coordinates.java | 2 +- .../codingtests/marsrover/{ => cartography}/Direction.java | 2 +- .../{ => cartography}/MapIncrementalPositionResolver.java | 2 +- .../codingtests/marsrover/{ => cartography}/MarsMap.java | 2 +- .../java/cat/hack3/codingtests/marsrover/MarsRoverTest.java | 5 ++++- .../codingtests/marsrover/MarsRoverWithObstaclesTest.java | 5 ++++- .../marsrover/ui/console/DirectionRetriever.java | 2 +- .../codingtests/marsrover/ui/console/RoverInitializer.java | 6 +++--- 9 files changed, 20 insertions(+), 10 deletions(-) rename mars-station/src/main/java/cat/hack3/codingtests/marsrover/{ => cartography}/Coordinates.java (89%) rename mars-station/src/main/java/cat/hack3/codingtests/marsrover/{ => cartography}/Direction.java (93%) rename mars-station/src/main/java/cat/hack3/codingtests/marsrover/{ => cartography}/MapIncrementalPositionResolver.java (93%) rename mars-station/src/main/java/cat/hack3/codingtests/marsrover/{ => cartography}/MarsMap.java (98%) diff --git a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java index ff2507e..26b32bf 100644 --- a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java +++ b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java @@ -1,5 +1,9 @@ package cat.hack3.codingtests.marsrover; +import cat.hack3.codingtests.marsrover.cartography.Coordinates; +import cat.hack3.codingtests.marsrover.cartography.Direction; +import cat.hack3.codingtests.marsrover.cartography.MarsMap; + import java.util.logging.Logger; public class MarsRover { diff --git a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/Coordinates.java similarity index 89% rename from mars-station/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/Coordinates.java index 0a56364..92dac99 100644 --- a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java +++ b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/Coordinates.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover; +package cat.hack3.codingtests.marsrover.cartography; public record Coordinates(int latitude, int longitude) { diff --git a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/Direction.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/Direction.java similarity index 93% rename from mars-station/src/main/java/cat/hack3/codingtests/marsrover/Direction.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/Direction.java index d321510..fc3fbe3 100644 --- a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/Direction.java +++ b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/Direction.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover; +package cat.hack3.codingtests.marsrover.cartography; public enum Direction { NORTH, SOUTH, EAST, WEST; diff --git a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/MapIncrementalPositionResolver.java similarity index 93% rename from mars-station/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/MapIncrementalPositionResolver.java index 710f7d5..589a5e3 100644 --- a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java +++ b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/MapIncrementalPositionResolver.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover; +package cat.hack3.codingtests.marsrover.cartography; public class MapIncrementalPositionResolver { diff --git a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/MarsMap.java similarity index 98% rename from mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java rename to mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/MarsMap.java index 425d5b6..5551ed7 100644 --- a/mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java +++ b/mars-station/src/main/java/cat/hack3/codingtests/marsrover/cartography/MarsMap.java @@ -1,4 +1,4 @@ -package cat.hack3.codingtests.marsrover; +package cat.hack3.codingtests.marsrover.cartography; import java.util.List; import java.util.logging.Logger; diff --git a/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java b/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java index 2e755d8..376c320 100644 --- a/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java +++ b/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java @@ -1,11 +1,14 @@ package cat.hack3.codingtests.marsrover; +import cat.hack3.codingtests.marsrover.cartography.Coordinates; +import cat.hack3.codingtests.marsrover.cartography.Direction; +import cat.hack3.codingtests.marsrover.cartography.MarsMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.util.stream.IntStream; -import static cat.hack3.codingtests.marsrover.Direction.*; +import static cat.hack3.codingtests.marsrover.cartography.Direction.*; import static org.testng.Assert.assertEquals; public class MarsRoverTest { diff --git a/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java b/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java index 0d01cd0..669c005 100644 --- a/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java +++ b/mars-station/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java @@ -1,11 +1,14 @@ package cat.hack3.codingtests.marsrover; +import cat.hack3.codingtests.marsrover.cartography.Coordinates; +import cat.hack3.codingtests.marsrover.cartography.Direction; +import cat.hack3.codingtests.marsrover.cartography.MarsMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.util.List; -import static cat.hack3.codingtests.marsrover.Direction.SOUTH; +import static cat.hack3.codingtests.marsrover.cartography.Direction.SOUTH; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; diff --git a/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java index 9864011..2d6d16e 100644 --- a/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/DirectionRetriever.java @@ -1,7 +1,7 @@ package cat.hack3.codingtests.marsrover.ui.console; -import cat.hack3.codingtests.marsrover.Direction; +import cat.hack3.codingtests.marsrover.cartography.Direction; import java.util.Scanner; diff --git a/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java index d0f1d5d..41f006e 100644 --- a/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java +++ b/user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java @@ -1,9 +1,9 @@ package cat.hack3.codingtests.marsrover.ui.console; -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 cat.hack3.codingtests.marsrover.cartography.Coordinates; +import cat.hack3.codingtests.marsrover.cartography.Direction; +import cat.hack3.codingtests.marsrover.cartography.MarsMap; import java.util.InputMismatchException; import java.util.List;