Skip to content

Commit 2b4f653

Browse files
committed
fix package name in day 24
1 parent 6bc62ee commit 2b4f653

File tree

10 files changed

+34
-40
lines changed

10 files changed

+34
-40
lines changed

exercise/day24/src/main/java/M/Instruction.java renamed to exercise/day24/src/main/java/submarine/Instruction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package M;
1+
package submarine;
22

33
public record Instruction(String text, int x) {
44
public static Instruction fromText(String text) {

exercise/day24/src/main/java/M/Position.java renamed to exercise/day24/src/main/java/submarine/Position.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package M;
1+
package submarine;
22

33
public record Position(int horizontal, int depth) {
44
public Position changeDepth(int newDepth) {

exercise/day24/src/main/java/M/Submarine.java renamed to exercise/day24/src/main/java/submarine/Submarine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package M;
1+
package submarine;
22

33
import java.util.List;
44

exercise/day24/src/test/java/M/FileUtils.java renamed to exercise/day24/src/test/java/submarine/FileUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package M;
1+
package submarine;
22

33
import java.io.IOException;
44
import java.net.URISyntaxException;

exercise/day24/src/test/java/M/SubmarineTests.java renamed to exercise/day24/src/test/java/submarine/SubmarineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package M;
1+
package submarine;
22

33
import org.junit.jupiter.api.Test;
44

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
package org.craftedsw.tripservicekata.exception;
22

33
public class CollaboratorCallException extends RuntimeException {
4+
private static final long serialVersionUID = -4584041339906109902L;
45

5-
private static final long serialVersionUID = -4584041339906109902L;
6+
public CollaboratorCallException() {
7+
super();
8+
}
69

7-
public CollaboratorCallException() {
8-
super();
9-
}
10+
public CollaboratorCallException(String message,
11+
Throwable cause) {
12+
super(message, cause);
13+
}
1014

11-
public CollaboratorCallException(String message,
12-
Throwable cause) {
13-
super(message, cause);
14-
}
15+
public CollaboratorCallException(String message) {
16+
super(message);
17+
}
1518

16-
public CollaboratorCallException(String message) {
17-
super(message);
18-
}
19-
20-
public CollaboratorCallException(Throwable cause) {
21-
super(cause);
22-
}
23-
24-
19+
public CollaboratorCallException(Throwable cause) {
20+
super(cause);
21+
}
2522
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.craftedsw.tripservicekata.exception;
22

33
public class UserNotLoggedInException extends RuntimeException {
4+
private static final long serialVersionUID = 8959479918185637340L;
45

5-
private static final long serialVersionUID = 8959479918185637340L;
6-
7-
}
6+
}

solution/day23/src/main/java/org/craftedsw/tripservicekata/trip/TripService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private Try<Seq<Trip>> checkUser(User loggedUser,
3636
: failure(new UserNotLoggedInException());
3737
}
3838

39-
protected Seq<Trip> findTripsByUser(User user) {
39+
private Seq<Trip> findTripsByUser(User user) {
4040
return repository.findTripsByUser(user);
4141
}
4242
}

solution/day23/src/main/java/org/craftedsw/tripservicekata/user/UserSession.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@
33
import org.craftedsw.tripservicekata.exception.CollaboratorCallException;
44

55
public class UserSession {
6+
private static final UserSession userSession = new UserSession();
67

7-
private static final UserSession userSession = new UserSession();
8-
9-
private UserSession() {
10-
}
11-
12-
public static UserSession getInstance() {
13-
return userSession;
14-
}
8+
private UserSession() {
9+
}
1510

16-
public User getLoggedUser() {
17-
throw new CollaboratorCallException(
18-
"UserSession.getLoggedUser() should not be called in an unit test");
19-
}
11+
public static UserSession getInstance() {
12+
return userSession;
13+
}
2014

21-
}
15+
public User getLoggedUser() {
16+
throw new CollaboratorCallException(
17+
"UserSession.getLoggedUser() should not be called in an unit test");
18+
}
19+
}

solution/day23/src/test/java/org/craftedsw/tripservicekata/trip/TripRepositoryShould.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
1010

1111
@DisplayNameGeneration(ReplaceUnderscores.class)
12-
public class TripRepositoryShould {
12+
class TripRepositoryShould {
1313
private final TripRepository tripRepository = new TripRepository();
1414

1515
@Test

0 commit comments

Comments
 (0)