From 8b3a7eab3ea8a97c2a32f3ff1ea750abbf4e1254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=A0s?= <vabrelucas@gmail.com>
Date: Wed, 20 Mar 2024 23:54:47 +0100
Subject: [PATCH] refacto(DevWeb): Remove EntityManager from DAO.java

---
 S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java | 7 +------
 .../src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java | 9 ++++++++-
 .../main/java/uppa/project/dao/jpa/DAO_JPA_Player.java   | 9 ++++++++-
 .../src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java | 9 ++++++++-
 .../project/{dao => provider}/EntityManagerProvider.java | 2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)
 rename S2/DevWeb/Projet/src/main/java/uppa/project/{dao => provider}/EntityManagerProvider.java (96%)

diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java
index aba76f2..0b2174c 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java
@@ -17,18 +17,13 @@ import jakarta.persistence.EntityManager;
  */
 public abstract class DAO<D> {
 
-  /**
-   * Gestionnaire d'entités
-   */
-  protected EntityManager entityManager;
-
   /**
    * Constructeur par défaut
    *
    * @throws DAOException si une erreur survient lors de la création du DAO
    */
   public DAO() throws DAOException {
-    this.entityManager = EntityManagerProvider.getInstance();
+    throw new DAOException("DAO not implemented");
   }
 
   /**
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java
index 08ddb7f..82235de 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java
@@ -6,12 +6,14 @@
 
 package uppa.project.dao.jpa;
 
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
 import uppa.project.dao.DAO;
 import uppa.project.dao.DAOException;
 import uppa.project.pojo.Game;
+import uppa.project.provider.EntityManagerProvider;
 
 /**
  * DAO pour les parties de jeu
@@ -23,13 +25,18 @@ import uppa.project.pojo.Game;
  */
 public class DAO_JPA_Game extends DAO<Game> {
 
+  /**
+   * Gestionnaire d'entités
+   */
+  private final EntityManager entityManager;
+
   /**
    * Constructeur par défaut
    *
    * @throws DAOException si une erreur survient lors de la création du DAO
    */
   public DAO_JPA_Game() throws DAOException {
-    super();
+    this.entityManager = EntityManagerProvider.getInstance();
   }
 
   @Override
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java
index 5ca4e22..cf5755b 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java
@@ -6,12 +6,14 @@
 
 package uppa.project.dao.jpa;
 
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
 import uppa.project.dao.DAO;
 import uppa.project.dao.DAOException;
 import uppa.project.pojo.Player;
+import uppa.project.provider.EntityManagerProvider;
 
 /**
  * DAO pour les joueurs
@@ -23,8 +25,13 @@ import uppa.project.pojo.Player;
  */
 public class DAO_JPA_Player extends DAO<Player> {
 
+  /**
+   * Gestionnaire d'entités
+   */
+  private final EntityManager entityManager;
+
   public DAO_JPA_Player() throws DAOException {
-    super();
+    this.entityManager = EntityManagerProvider.getInstance();
   }
 
   @Override
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java
index 7562fa5..09ca748 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java
@@ -6,12 +6,14 @@
 
 package uppa.project.dao.jpa;
 
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
 import uppa.project.dao.DAO;
 import uppa.project.dao.DAOException;
 import uppa.project.pojo.User;
+import uppa.project.provider.EntityManagerProvider;
 
 /**
  * DAO pour les utilisateurs
@@ -23,8 +25,13 @@ import uppa.project.pojo.User;
  */
 public class DAO_JPA_User extends DAO<User> {
 
+  /**
+   * Gestionnaire d'entités
+   */
+  private final EntityManager entityManager;
+
   public DAO_JPA_User() throws DAOException {
-    super();
+    this.entityManager = EntityManagerProvider.getInstance();
   }
 
   @Override
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/EntityManagerProvider.java b/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
similarity index 96%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/EntityManagerProvider.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
index 4e8e0e2..cabcdc0 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/EntityManagerProvider.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao;
+package uppa.project.provider;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;