mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-05-14 01:21:49 +00:00
fix(DevWeb): Use List for foreigth key instead of ArrayList to prevent OneToMany ManyToMany errors
This commit is contained in:
@@ -8,6 +8,7 @@ package uppa.project.database.pojo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Représentation d'un paquet de cartes
|
||||
@@ -29,7 +30,7 @@ public class Deck {
|
||||
* Ensemble de cartes du paquet
|
||||
* @see Card
|
||||
*/
|
||||
private ArrayList<Card> cards;
|
||||
private final List<Card> cards;
|
||||
|
||||
/**
|
||||
* Constructeur par défaut
|
||||
@@ -69,7 +70,7 @@ public class Deck {
|
||||
/**
|
||||
* @return l'ensemble de cartes du paquet
|
||||
*/
|
||||
public ArrayList<Card> getCards() {
|
||||
public List<Card> getCards() {
|
||||
return cards;
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@@ -60,7 +61,7 @@ public class Game implements Serializable {
|
||||
private int nbValuesPerColor;
|
||||
|
||||
@OneToMany(mappedBy = "game", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
private ArrayList<Player> players;
|
||||
private List<Player> players;
|
||||
|
||||
@Transient
|
||||
private Deck deck;
|
||||
@@ -234,7 +235,7 @@ public class Game implements Serializable {
|
||||
/**
|
||||
* @return les joueurs de la partie
|
||||
*/
|
||||
public ArrayList<Player> getPlayers() {
|
||||
public List<Player> getPlayers() {
|
||||
return players;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@@ -61,10 +62,10 @@ public class User implements Serializable {
|
||||
private Gender gender;
|
||||
|
||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
private ArrayList<Player> playedGames;
|
||||
private List<Player> playedGames;
|
||||
|
||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
private ArrayList<RecoveryPasswordToken> recoveryPasswordTokens;
|
||||
private List<RecoveryPasswordToken> recoveryPasswordTokens;
|
||||
|
||||
@Transient
|
||||
private int nbPlayedGame;
|
||||
@@ -310,12 +311,12 @@ public class User implements Serializable {
|
||||
*
|
||||
* @return la liste des parties jouées
|
||||
*/
|
||||
public ArrayList<Player> getPlayedGames() {
|
||||
public List<Player> getPlayedGames() {
|
||||
return playedGames;
|
||||
}
|
||||
|
||||
/**
|
||||
* ajoute un partie dans la liste des parties jouées
|
||||
* Ajoute une partie dans la liste des parties jouées
|
||||
*
|
||||
* @param player la nouvelle partie jouée
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user