Hibernate warning fixes
All checks were successful
Gitea/swiss-backend/pipeline/head This commit looks good

This commit is contained in:
2025-10-24 15:18:18 +02:00
parent 97af2628fb
commit dd653cb525
9 changed files with 34 additions and 27 deletions

View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.6</version> <version>3.5.7</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>nl.connected-it</groupId> <groupId>nl.connected-it</groupId>
@@ -50,10 +50,7 @@
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>

View File

@@ -26,7 +26,7 @@ public class Event extends AbstractEntity {
@ManyToOne @ManyToOne
private Tournament tournament; private Tournament tournament;
@OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY) @OneToMany(mappedBy = "event", cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
private List<Registration> registrations; private List<Registration> registrations;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)

View File

@@ -30,9 +30,11 @@ public class Match extends AbstractEntity {
private Round round; private Round round;
@ManyToOne @ManyToOne
@JoinColumn(name = "team1_id")
private Team team1; private Team team1;
@ManyToOne @ManyToOne
@JoinColumn(name = "team2_id")
private Team team2; private Team team2;
private Boolean played; private Boolean played;

View File

@@ -58,11 +58,11 @@ public class Player extends AbstractEntity {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private PlayerStrength strength; private PlayerStrength strength;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(mappedBy = "player", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Registration> registrations;// = new ArrayList<>(); private List<Registration> registrations;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(mappedBy = "partner", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Registration> partnerRegistrations;// = new ArrayList<>(); private List<Registration> partnerRegistrations;
public String getFullName() { public String getFullName() {
return hasLength(middleName) ? return hasLength(middleName) ?

View File

@@ -20,8 +20,8 @@ public class Registration extends AbstractEntity {
@ManyToOne @ManyToOne
private Event event; private Event event;
@ManyToOne // @ManyToOne
private Tournament tournament; // private Tournament tournament;
@ManyToOne @ManyToOne
@JoinColumn(name = "player_id") @JoinColumn(name = "player_id")

View File

@@ -27,7 +27,7 @@ public class Round extends AbstractEntity {
private Status status; private Status status;
@OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY) @OneToMany(mappedBy = "round", cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
@OrderBy("id") @OrderBy("id")
private List<Match> matches; private List<Match> matches;

View File

@@ -35,7 +35,7 @@ public class Tournament extends AbstractEntity {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private TournamentStatus status; private TournamentStatus status;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(mappedBy = "tournament", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Event> events; private List<Event> events;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)

View File

@@ -94,6 +94,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
var playersCounting = new ArrayList<Long>(); var playersCounting = new ArrayList<Long>();
for (var event : tournament.getEvents()) { for (var event : tournament.getEvents()) {
if (event.getGroups() != null) {
for (var group : event.getGroups()) { for (var group : event.getGroups()) {
for (var round : group.getRounds()) { for (var round : group.getRounds()) {
for (var match : round.getMatches()) { for (var match : round.getMatches()) {
@@ -107,6 +108,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
} }
} }
} }
}
return playersCounting; return playersCounting;
} }
@@ -114,6 +116,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
var playersPlaying = new ArrayList<Long>(); var playersPlaying = new ArrayList<Long>();
for (var event : tournament.getEvents()) { for (var event : tournament.getEvents()) {
if (event.getGroups() != null) {
for (var group : event.getGroups()) { for (var group : event.getGroups()) {
for (var round : group.getRounds()) { for (var round : group.getRounds()) {
for (var match : round.getMatches()) { for (var match : round.getMatches()) {
@@ -124,11 +127,16 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
} }
} }
} }
}
return playersPlaying; return playersPlaying;
} }
private List<Long> getPlayersAvailable(Tournament tournament) { private List<Long> getPlayersAvailable(Tournament tournament) {
if (tournament.getTournamentPlayers() == null) {
return List.of();
}
var playersAvailable = tournament.getTournamentPlayers() var playersAvailable = tournament.getTournamentPlayers()
.stream() .stream()
.map(TournamentPlayer::getId) .map(TournamentPlayer::getId)

View File

@@ -27,7 +27,7 @@ public class RegistrationService {
.findAny(); .findAny();
if (optionalExistingPlayerRegistration.isEmpty()) { // no previous registration for this event if (optionalExistingPlayerRegistration.isEmpty()) { // no previous registration for this event
var newRegistration = new Registration(); var newRegistration = new Registration();
newRegistration.setTournament(tournament); // newRegistration.setTournament(tournament);
newRegistration.setEvent(event); newRegistration.setEvent(event);
newRegistration.setPlayer(player); newRegistration.setPlayer(player);
if (eventRegistration.getPartner() != null) { if (eventRegistration.getPartner() != null) {