another interface that goes to api module (command factory)

mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java

@@ -1,9 +1,9 @@
 package cat.hack3.codingtests.marsrover;
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMap;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMap;
 
 public class MarsRover implements RotableRiderRover {
 

mars-station/src/main/java/cat/hack3/codingtests/marsrover/MarsRoverDeployer.java

@@ -2,8 +2,8 @@ package cat.hack3.codingtests.marsrover;
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
 import cat.hack3.codingtests.marsrover.api.RoverDeployer;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMap;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMap;
 
 public class MarsRoverDeployer implements RoverDeployer {
     @Override

mars-station/src/main/java/cat/hack3/codingtests/marsrover/RoverActionReporter.java

@@ -1,8 +1,8 @@
 package cat.hack3.codingtests.marsrover;
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover.Rotation;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
 
 import java.util.logging.Logger;
 

mars-station/src/main/java/cat/hack3/codingtests/marsrover/gps/MapIncrementalPositionResolver.java

@@ -1,7 +1,7 @@
 package cat.hack3.codingtests.marsrover.gps;
 
-import cat.hack3.codingtests.marsrover.cartography.Coordinates.Latitude;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates.Latitude;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates.Longitude;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates.Longitude;
 
 public class MapIncrementalPositionResolver {
 

mars-station/src/main/java/cat/hack3/codingtests/marsrover/gps/MarsMap.java

@@ -1,10 +1,10 @@
 package cat.hack3.codingtests.marsrover.gps;
 
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates.Latitude;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates.Latitude;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates.Longitude;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates.Longitude;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMap;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMap;
 
 import java.util.List;
 

mars-station/src/main/java/cat/hack3/codingtests/marsrover/gps/MarsMapInitializer.java

@@ -1,8 +1,8 @@
 package cat.hack3.codingtests.marsrover.gps;
 
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMap;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMap;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMapInitializer;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMapInitializer;
 
 import java.util.List;
 

mars-station/src/main/java/module-info.java

@@ -1,8 +1,10 @@
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMapInitializer;
+
 module mars.station {
     requires rover.api;
     requires java.logging;
 
-    provides cat.hack3.codingtests.marsrover.cartography.PlanetMapInitializer
+    provides PlanetMapInitializer
             with cat.hack3.codingtests.marsrover.gps.MarsMapInitializer;
 
     provides cat.hack3.codingtests.marsrover.api.RoverDeployer

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/RotableRiderRover.java

@@ -1,7 +1,7 @@
 package cat.hack3.codingtests.marsrover.api;
 
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
 
 public interface RotableRiderRover {
     enum Rotation {LEFT, RIGHT}

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/RoverDeployer.java

@@ -1,7 +1,7 @@
 package cat.hack3.codingtests.marsrover.api;
 
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMap;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMap;
 
 public interface RoverDeployer {
     RotableRiderRover deploy(PlanetMap map, Direction startingDirection);

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/cartography/Coordinates.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.cartography;
+package cat.hack3.codingtests.marsrover.api.cartography;
 
 public record Coordinates(Latitude latitude, Longitude longitude) {
 

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/cartography/Direction.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.cartography;
+package cat.hack3.codingtests.marsrover.api.cartography;
 
 public enum Direction {
     NORTH, SOUTH, EAST, WEST;

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/cartography/PlanetMap.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.cartography;
+package cat.hack3.codingtests.marsrover.api.cartography;
 
 public interface PlanetMap {
     Coordinates getNextPositionTowards(Direction direction);

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/cartography/PlanetMapInitializer.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.cartography;
+package cat.hack3.codingtests.marsrover.api.cartography;
 
 import java.util.List;
 

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/commands/CommandFactory.java

@@ -0,0 +1,5 @@
+package cat.hack3.codingtests.marsrover.api.commands;
+
+public interface CommandFactory {
+    RoverCommand createCommand(RoverCommand.Type type);
+}

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/commands/CommandFactoryInitializer.java

@@ -0,0 +1,7 @@
+package cat.hack3.codingtests.marsrover.api.commands;
+
+import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
+
+public interface CommandFactoryInitializer {
+    CommandFactory initFor(RotableRiderRover rover);
+}

rover-api/src/main/java/cat/hack3/codingtests/marsrover/api/commands/RoverCommand.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.commands.api;
+package cat.hack3.codingtests.marsrover.api.commands;
 
 public interface RoverCommand {
     enum Type {MOVE_FORWARD, MOVE_BACKWARDS, TURN_LEFT, TURN_RIGHT}

rover-api/src/main/java/module-info.java

@@ -1,4 +1,5 @@
 module rover.api {
     exports cat.hack3.codingtests.marsrover.api;
-    exports cat.hack3.codingtests.marsrover.cartography;
+    exports cat.hack3.codingtests.marsrover.api.cartography;
+    exports cat.hack3.codingtests.marsrover.api.commands;
 }

rover-commands/src/main/java/cat/hack3/codingtests/marsrover/commands/MoveBackwardsCommand.java

@@ -2,7 +2,7 @@ package cat.hack3.codingtests.marsrover.commands;
 
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.commands.api.RoverCommand;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
 
 public class MoveBackwardsCommand implements RoverCommand {
     private final RotableRiderRover rover;

rover-commands/src/main/java/cat/hack3/codingtests/marsrover/commands/MoveForwardCommand.java

@@ -2,7 +2,7 @@ package cat.hack3.codingtests.marsrover.commands;
 
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.commands.api.RoverCommand;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
 
 public class MoveForwardCommand implements RoverCommand {
     private final RotableRiderRover rover;

rover-commands/src/main/java/cat/hack3/codingtests/marsrover/commands/RoverCommandFactory.java

@@ -1,19 +1,18 @@
-package cat.hack3.codingtests.marsrover.commands.api;
+package cat.hack3.codingtests.marsrover.commands;
 
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.commands.MoveBackwardsCommand;
+import cat.hack3.codingtests.marsrover.api.commands.CommandFactory;
-import cat.hack3.codingtests.marsrover.commands.MoveForwardCommand;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
-import cat.hack3.codingtests.marsrover.commands.TurnLeftCommand;
-import cat.hack3.codingtests.marsrover.commands.TurnRightCommand;
 
-public class CommandFactory {
+public class RoverCommandFactory implements CommandFactory {
     private final RotableRiderRover rover;
 
-    public CommandFactory(RotableRiderRover rover) {
+    public RoverCommandFactory(RotableRiderRover rover) {
         this.rover = rover;
     }
 
+    @Override
     public RoverCommand createCommand(RoverCommand.Type type) {
         return switch (type) {
             case MOVE_FORWARD -> new MoveForwardCommand(rover);

rover-commands/src/main/java/cat/hack3/codingtests/marsrover/commands/RoverCommandFactoryInitializer.java

@@ -0,0 +1,12 @@
+package cat.hack3.codingtests.marsrover.commands;
+
+import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
+import cat.hack3.codingtests.marsrover.api.commands.CommandFactory;
+import cat.hack3.codingtests.marsrover.api.commands.CommandFactoryInitializer;
+
+public class RoverCommandFactoryInitializer implements CommandFactoryInitializer {
+    @Override
+    public CommandFactory initFor(RotableRiderRover rover) {
+        return new RoverCommandFactory(rover);
+    }
+}

rover-commands/src/main/java/cat/hack3/codingtests/marsrover/commands/TurnLeftCommand.java

@@ -2,7 +2,7 @@ package cat.hack3.codingtests.marsrover.commands;
 
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.commands.api.RoverCommand;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
 
 import static cat.hack3.codingtests.marsrover.api.RotableRiderRover.Rotation.LEFT;
 

rover-commands/src/main/java/cat/hack3/codingtests/marsrover/commands/TurnRightCommand.java

@@ -2,7 +2,7 @@ package cat.hack3.codingtests.marsrover.commands;
 
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.commands.api.RoverCommand;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
 
 import static cat.hack3.codingtests.marsrover.api.RotableRiderRover.Rotation.RIGHT;
 

rover-commands/src/main/java/module-info.java

@@ -1,5 +1,9 @@
+import cat.hack3.codingtests.marsrover.api.commands.CommandFactoryInitializer;
+import cat.hack3.codingtests.marsrover.commands.RoverCommandFactoryInitializer;
+
 module rover.commands {
     requires rover.api;
 
-    exports cat.hack3.codingtests.marsrover.commands.api;
+    provides CommandFactoryInitializer
+            with RoverCommandFactoryInitializer;
 }

station-plugin/src/main/java/cat/hack3/codingtests/marsrover/plugin/station/CommandFactoryInitializerProvider.java

@@ -0,0 +1,14 @@
+package cat.hack3.codingtests.marsrover.plugin.station;
+
+import cat.hack3.codingtests.marsrover.api.commands.CommandFactoryInitializer;
+
+import java.util.ServiceLoader;
+
+public class CommandFactoryInitializerProvider {
+    public CommandFactoryInitializer getNextAvailable() {
+        return ServiceLoader
+                .load(CommandFactoryInitializer.class)
+                .findFirst()
+                .orElseThrow();
+    }
+}

station-plugin/src/main/java/cat/hack3/codingtests/marsrover/plugin/station/PlanetMapInitializerProvider.java

@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.plugin.station;
 
-import cat.hack3.codingtests.marsrover.cartography.PlanetMapInitializer;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMapInitializer;
 
 import java.util.ServiceLoader;
 

station-plugin/src/main/java/module-info.java

@@ -1,8 +1,9 @@
 module station.plugin {
     requires rover.api;
 
-    uses cat.hack3.codingtests.marsrover.cartography.PlanetMapInitializer;
+    uses cat.hack3.codingtests.marsrover.api.cartography.PlanetMapInitializer;
     uses cat.hack3.codingtests.marsrover.api.RoverDeployer;
+    uses cat.hack3.codingtests.marsrover.api.commands.CommandFactoryInitializer;
 
     exports cat.hack3.codingtests.marsrover.plugin.station;
 }

tests-suite/src/test/java/cat/hack3/codingtests/marsrover/test/CommonTests.java

@@ -1,19 +1,20 @@
 package cat.hack3.codingtests.marsrover.test;
 
 import cat.hack3.codingtests.marsrover.api.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
-import cat.hack3.codingtests.marsrover.cartography.PlanetMap;
+import cat.hack3.codingtests.marsrover.api.cartography.PlanetMap;
-import cat.hack3.codingtests.marsrover.commands.api.CommandFactory;
+import cat.hack3.codingtests.marsrover.api.commands.CommandFactory;
-import cat.hack3.codingtests.marsrover.commands.api.RoverCommand;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
+import cat.hack3.codingtests.marsrover.plugin.station.CommandFactoryInitializerProvider;
 import cat.hack3.codingtests.marsrover.plugin.station.PlanetMapInitializerProvider;
 import cat.hack3.codingtests.marsrover.plugin.station.RoverDeployerProvider;
 
 import java.util.List;
 import java.util.stream.IntStream;
 
-import static cat.hack3.codingtests.marsrover.cartography.Direction.SOUTH;
+import static cat.hack3.codingtests.marsrover.api.cartography.Direction.SOUTH;
-import static cat.hack3.codingtests.marsrover.commands.api.RoverCommand.Type.*;
+import static cat.hack3.codingtests.marsrover.api.commands.RoverCommand.Type.*;
 
 public class CommonTests {
 
@@ -27,10 +28,12 @@ public class CommonTests {
 
     private PlanetMapInitializerProvider gpsProvider;
     private RoverDeployerProvider roverProvider;
+    private CommandFactoryInitializerProvider commandFactoryProvider;
 
     protected void setup() {
         gpsProvider = new PlanetMapInitializerProvider();
         roverProvider = new RoverDeployerProvider();
+        commandFactoryProvider = new CommandFactoryInitializerProvider();
 
         int mapWidth = 10;
         int mapHeight = 10;
@@ -41,13 +44,19 @@ public class CommonTests {
         var marsMap = getMap(mapHeight, mapWidth, startingCoordinates);
         rover = getRover(marsMap);
 
-        var commandFactory = new CommandFactory(this.rover);
+        var commandFactory = getCommandFactory(rover);
+
         moveForwardCommand = commandFactory.createCommand(MOVE_FORWARD);
         moveBackwardsCommand = commandFactory.createCommand(MOVE_BACKWARDS);
         turnLeftCommand = commandFactory.createCommand(TURN_LEFT);
         turnRightCommand = commandFactory.createCommand(TURN_RIGHT);
     }
 
+    private CommandFactory getCommandFactory(RotableRiderRover rover) {
+        var commandFactoryInitializer = commandFactoryProvider.getNextAvailable();
+        return commandFactoryInitializer.initFor(rover);
+    }
+
     private PlanetMap getMap(int mapHeight, int mapWidth, Coordinates startingCoordinates) {
         var planetInitializer = gpsProvider.getNextAvailable();
         return planetInitializer.setupNewMap(mapHeight, mapWidth, startingCoordinates, getObstacles());

tests-suite/src/test/java/cat/hack3/codingtests/marsrover/test/MarsRoverTest.java

@@ -1,11 +1,11 @@
 package cat.hack3.codingtests.marsrover.test;
 
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static cat.hack3.codingtests.marsrover.cartography.Direction.*;
+import static cat.hack3.codingtests.marsrover.api.cartography.Direction.*;
 import static org.testng.Assert.assertEquals;
 
 public class MarsRoverTest extends CommonTests {

tests-suite/src/test/java/cat/hack3/codingtests/marsrover/test/MarsRoverWithObstaclesTest.java

@@ -1,7 +1,7 @@
 package cat.hack3.codingtests.marsrover.test;
 
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

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.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
 
 import java.util.Scanner;
 

user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverCommandsPerformer.java

@@ -1,19 +1,19 @@
 package cat.hack3.codingtests.marsrover.ui.console;
 
 import cat.hack3.codingtests.marsrover.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.commands.api.CommandFactory;
+import cat.hack3.codingtests.marsrover.api.commands.RoverCommand;
-import cat.hack3.codingtests.marsrover.commands.api.RoverCommand;
+import cat.hack3.codingtests.marsrover.commands.api.RoverCommandFactory;
 
 import java.util.Scanner;
 
-import static cat.hack3.codingtests.marsrover.commands.api.RoverCommand.Type.*;
+import static cat.hack3.codingtests.marsrover.api.commands.RoverCommand.Type.*;
 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;
 
-    CommandFactory commandFactory;
+    RoverCommandFactory roverCommandFactory;
     private final RoverCommand moveForwardCommand;
     private final RoverCommand moveBackwardsCommand;
     private final RoverCommand turnLeftCommand;
@@ -21,11 +21,11 @@ public class RoverCommandsPerformer {
 
     public RoverCommandsPerformer(Scanner reader, RotableRiderRover rover) {
         this.reader = reader;
-        commandFactory = new CommandFactory(rover);
+        roverCommandFactory = new RoverCommandFactory(rover);
-        moveForwardCommand = commandFactory.createCommand(MOVE_FORWARD);
+        moveForwardCommand = roverCommandFactory.createCommand(MOVE_FORWARD);
-        moveBackwardsCommand = commandFactory.createCommand(MOVE_BACKWARDS);
+        moveBackwardsCommand = roverCommandFactory.createCommand(MOVE_BACKWARDS);
-        turnLeftCommand = commandFactory.createCommand(TURN_LEFT);
+        turnLeftCommand = roverCommandFactory.createCommand(TURN_LEFT);
-        turnRightCommand = commandFactory.createCommand(TURN_RIGHT);
+        turnRightCommand = roverCommandFactory.createCommand(TURN_RIGHT);
     }
 
     public void acceptCommandsUntilExitSignal() {

user-interface-console/src/main/java/cat/hack3/codingtests/marsrover/ui/console/RoverInitializer.java

@@ -2,8 +2,8 @@ package cat.hack3.codingtests.marsrover.ui.console;
 
 import cat.hack3.codingtests.marsrover.MarsRover;
 import cat.hack3.codingtests.marsrover.RotableRiderRover;
-import cat.hack3.codingtests.marsrover.cartography.Coordinates;
+import cat.hack3.codingtests.marsrover.api.cartography.Coordinates;
-import cat.hack3.codingtests.marsrover.cartography.Direction;
+import cat.hack3.codingtests.marsrover.api.cartography.Direction;
 import cat.hack3.codingtests.marsrover.gps.MarsMap;
 
 import java.util.InputMismatchException;