CodingTests
/
mars-rover-kata
1
0
Fork 0
Code

make Coordinates immutable

This commit is contained in:
Xavier Fontanet 2024-06-20 21:04:31 +02:00
parent b0e6fc197f
commit 9bac80db8e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java
View File

@ -14,8 +14,8 @@ import java.util.logging.Logger;
* 3 3-1 3-2 3-3 * 3 3-1 3-2 3-3
*/ */
public class Coordinates { public class Coordinates {
private int latitude; private final int latitude;
private int longitude; private final int longitude;
private final Logger logger = Logger.getLogger(Coordinates.class.getName()); private final Logger logger = Logger.getLogger(Coordinates.class.getName());
public static Coordinates of(int latitude, int longitude) { public static Coordinates of(int latitude, int longitude) {
@ -27,16 +27,19 @@ public class Coordinates {
this.longitude = longitude; this.longitude = longitude;
} }
public Coordinates updatePositionTowards(Direction direction) { public Coordinates getNextPositionTowards(Direction direction) {
var newLatitude = latitude;
var newLongitude = longitude;
switch (direction) { switch (direction) {
case NORTH -> latitude--; case NORTH -> newLatitude--;
case SOUTH -> latitude++; case SOUTH -> newLatitude++;
case WEST -> longitude--; case WEST -> newLongitude--;
case EAST -> longitude++; case EAST -> newLongitude++;
} }
logger.info(String.format("Updated coordinates towards %s, now is %d-%d", logger.info(String.format("Updated coordinates towards %s, now is %d-%d",
direction, latitude, longitude)); direction, newLatitude, newLongitude));
return this;
return new Coordinates(newLatitude, newLongitude);
} }
@Override @Override
@ -58,7 +61,4 @@ public class Coordinates {
'}'; '}';
} }
public Coordinates copy() {
return new Coordinates(latitude, longitude);
}
} }

8
src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java
View File

@ -2,7 +2,7 @@ package cat.hack3.codingtests.marsrover;
public class MarsRover { public class MarsRover {
private final MarsMap marsMap; private final MarsMap marsMap;
private final Coordinates currentCoordinates; private Coordinates currentCoordinates;
private Direction currentDirection; private Direction currentDirection;
public MarsRover(MarsMap marsMap, Coordinates startingCoordinates, Direction startingDirection) { public MarsRover(MarsMap marsMap, Coordinates startingCoordinates, Direction startingDirection) {
@ -12,11 +12,11 @@ public class MarsRover {
} }
public Coordinates moveForward() { public Coordinates moveForward() {
return currentCoordinates.updatePositionTowards(currentDirection); return currentCoordinates = currentCoordinates.getNextPositionTowards(currentDirection);
} }
public Coordinates moveBackwards() { public Coordinates moveBackwards() {
return currentCoordinates.updatePositionTowards(currentDirection.reversed()); return currentCoordinates = currentCoordinates.getNextPositionTowards(currentDirection.reversed());
} }
public Direction turnLeft() { public Direction turnLeft() {
@ -25,7 +25,7 @@ public class MarsRover {
} }
public Coordinates getCurrentCoordinates() { public Coordinates getCurrentCoordinates() {
return currentCoordinates.copy(); return currentCoordinates;
} }
public Direction getCurrentDirection() { public Direction getCurrentDirection() {