update DTO

src/main/java/DAO/AbstractJpaDao.java

@@ -2,17 +2,16 @@ package DAO;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.PersistenceException;
 import jpa.EntityManagerHelper;
 
 import java.io.Serializable;
 import java.util.List;
 
-public abstract class GenericDAOImpl<K, T extends Serializable> implements Generic<K, T> {
+public abstract class AbstractJpaDao<K, T extends Serializable> implements IGenericDao<K, T> {
     protected EntityManager em;
     private Class<T> entityClass;
 
-    public GenericDAOImpl() {
+    public AbstractJpaDao() {
         this.em = EntityManagerHelper.getEntityManager();
     }
 
@@ -21,6 +20,10 @@ public abstract class GenericDAOImpl<K, T extends Serializable> implements Gener
         this.entityClass= class2;
     }
 
+    public T findOne(K id) {
+        return em.find(entityClass, id);
+    }
+
     public List<T> findAll() {
         return em.createQuery("select e from " + entityClass.getName() + " as e", entityClass).getResultList();
     }

src/main/java/DAO/EntityManagerHelper.java

@@ -0,0 +1,50 @@
+package DAO;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+
+public class EntityManagerHelper {
+
+	private static final EntityManagerFactory emf;
+	private static final ThreadLocal<EntityManager> threadLocal;
+
+	static {
+		emf = Persistence.createEntityManagerFactory("dev");
+		threadLocal = new ThreadLocal<EntityManager>();
+	}
+
+	public static EntityManager getEntityManager() {
+		EntityManager em = threadLocal.get();
+
+		if (em == null) {
+			em = emf.createEntityManager();
+			threadLocal.set(em);
+		}
+		return em;
+	}
+
+	public static void closeEntityManager() {
+		EntityManager em = threadLocal.get();
+		if (em != null) {
+			em.close();
+			threadLocal.set(null);
+		}
+	}
+
+	public static void closeEntityManagerFactory() {
+		emf.close();
+	}
+
+	public static void beginTransaction() {
+		getEntityManager().getTransaction().begin();
+	}
+
+	public static void rollback() {
+		getEntityManager().getTransaction().rollback();
+	}
+
+	public static void commit() {
+		getEntityManager().getTransaction().commit();
+	}
+}

src/main/java/DAO/IGenericDao.java

@@ -3,11 +3,12 @@ package DAO;
 import java.io.Serializable;
 import java.util.List;
 
-public interface Generic<K, T extends Serializable> {
+public interface IGenericDao<K, T extends Serializable> {
     void create(final T entity);
     T findById(final K id);
     T update(final T entity);
     void delete(final T entity);
     void deleteById(final K id);
     List<T> findAll();
+    T findOne(final K id);
 }

src/main/java/DAO/QuestionDAO.java

@@ -2,7 +2,7 @@ package DAO;
 
 import metier.Question;
 
-public class QuestionDAO extends GenericDAOImpl<Integer, Question> {
+public class QuestionDAO extends AbstractJpaDao<Integer, Question> {
     public QuestionDAO(){
         super();
         this.setClass(Question.class);

src/main/java/DAO/QuizzDAO.java

@@ -3,7 +3,7 @@ package DAO;
 import jakarta.persistence.EntityTransaction;
 import metier.Quizz;
 
-public class QuizzDAO extends  GenericDAOImpl<Integer, Quizz>{
+public class QuizzDAO extends AbstractJpaDao<Integer, Quizz> {
     public QuizzDAO(){
         super();
         this.setClass(Quizz.class);

src/main/java/DAO/ReponseDAO.java

@@ -1,12 +1,8 @@
 package DAO;
 
-import java.util.List;
-
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.Query;
 import metier.Reponse;
 
-public class ReponseDAO extends GenericDAOImpl<Integer, Reponse> {
+public class ReponseDAO extends AbstractJpaDao<Integer, Reponse> {
     public ReponseDAO(){
         super();
         this.setClass(Reponse.class);

src/main/java/DAO/SessionDAO.java

@@ -4,11 +4,10 @@ package DAO;
 import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.Query;
 import metier.Session;
-import metier.Utilisateur;
 
 import java.util.List;
 
-public class SessionDAO extends GenericDAOImpl<Integer, Session> {
+public class SessionDAO extends AbstractJpaDao<Integer, Session> {
     public SessionDAO() {
         super();
         this.setClass(Session.class);

src/main/java/DAO/UtilisateurDAO.java

@@ -5,9 +5,7 @@ import jakarta.persistence.Query;
 import metier.Session;
 import metier.Utilisateur;
 
-import java.util.ArrayList;
+public class UtilisateurDAO extends AbstractJpaDao<Integer, Utilisateur> {
-
-public class UtilisateurDAO extends GenericDAOImpl<Integer, Utilisateur>{
     public UtilisateurDAO() {
         super();
         this.setClass(Utilisateur.class);

src/main/java/Mapper/UtilisateurMapper.java

@@ -13,7 +13,4 @@ public interface UtilisateurMapper {
 
     UtilisateurDTO toDTO(Utilisateur utilisateur);
     Utilisateur toEntity(UtilisateurDTO dto);
-
-    List<UtilisateurDTO> toDTOs(List<Utilisateur> utilisateurs);
-    List<Utilisateur> toEntitys(List<UtilisateurDTO> dtos);
 }

src/main/java/jpa/JpaTest.java

@@ -16,6 +16,7 @@ public class JpaTest {
     public JpaTest(EntityManager manager) {
         this.manager = manager;
     }
+
     /**
      * @param args
      */
@@ -93,5 +94,4 @@ public class JpaTest {
             }
         }
     }
-
 }