diff --git a/pom.xml b/pom.xml index 60cfac0..9c429ed 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,11 @@ ${jakartaee} provided + + org.mariadb.jdbc + mariadb-java-client + 3.5.6 + diff --git a/src/main/java/com/test/bdd/ClientJPA.java b/src/main/java/com/test/bdd/ClientJPA.java new file mode 100644 index 0000000..66f7393 --- /dev/null +++ b/src/main/java/com/test/bdd/ClientJPA.java @@ -0,0 +1,49 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.test.bdd; + +import com.test.beans.Client; +import jakarta.ejb.*; +import jakarta.persistence.*; +import java.util.List; + +/** + * + * @author steve.maingana + */ + + +@Stateless +public class ClientJPA { + @PersistenceContext(unitName = "bdclientPU") //en lien avec le fichier persistence.xml : + private EntityManager em; + + // Mise à jour d'un client + public int update(Client client) { + Client leClient = em.merge(client); + em.flush(); + return leClient.getId(); + } + + // Lecture d'un client + public Client read(int id) { + Client leClient = em.find(Client.class, id); + return leClient; + } + + // Lecture de tous les clients + public List readAll() { + List lesClients = em.createQuery("SELECT c FROM Client c", Client.class).getResultList(); + return lesClients; + } + + // Création d’un client + public int create(Client unClient) { + em.persist(unClient); // enregistre l’objet en base + // Force la synchro avec la base pour récupérer l’ID tout de suite + em.flush(); + return unClient.getId(); // l’ID est rempli automatiquement par JPA + } +} diff --git a/src/main/java/com/test/bdd/ClientMysql.java b/src/main/java/com/test/bdd/ClientMysql.java deleted file mode 100644 index e98c643..0000000 --- a/src/main/java/com/test/bdd/ClientMysql.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.test.bdd; - -import com.test.beans.Client; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; - -/** - * - * @author steve.maingana - */ -public class ClientMysql { - // private Connection laConnexion; - private Statement stmt = null; - private ResultSet result = null; - - // public ClientMysql() { - Connection laConnexion = Connexion.getConnect("192.168.100.100", "bdclient", "adminBDClient", "mdpBDClient"); - // } - - public ArrayList readAll() { - ArrayList clients = new ArrayList(); - - try { - stmt = laConnexion.createStatement(); - - result = stmt.executeQuery("SELECT * FROM client"); - while (result.next()) { - Client client = new Client( - result.getInt("id"), - result.getString("nom"), - result.getString("prenom"), - result.getString("mail") - ); - - clients.add(client); - } - - result.close(); - stmt.close(); - } catch (SQLException ex) { - System.out.println("SQLException : " + ex.getMessage()); - System.out.println("SQLState : " + ex.getSQLState()); - System.out.println("Code erreur : " + ex.getErrorCode()); - } - - return clients; - } - - public int create(Client unClient){ - int id=-1; - String sql = "INSERT INTO client (nom, prenom, mail) VALUES (?,?,?);"; - - try (PreparedStatement prepStmt = laConnexion.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { - - prepStmt.setString(1, unClient.getNom());//le param. 1 est remplacé par le nom du client - prepStmt.setString(2, unClient.getPrenom()); - prepStmt.setString(3, unClient.getMail()); - - int status = prepStmt.executeUpdate(); - // récupération de la clé auto-générée - if (status > 0) { - try (ResultSet result = prepStmt.getGeneratedKeys()) { - if (result.next()) { // <-- utiliser next() et pas first() - id = result.getInt(1); - } - } - } - prepStmt.close(); - - } catch(SQLException ex){ - System.out.println("SQLException:"+ex.getMessage()); - System.out.println("SQLState:"+ex.getSQLState()); - System.out.println("code Erreur:"+ex.getErrorCode()); - } - return id; - } - - public boolean update(int id, String nom, String prenom, String mail) { - String sql = "UPDATE client SET nom=?, prenom=?, mail=? WHERE id=?"; - int update = 0; - try { - PreparedStatement preparedStmt = laConnexion.prepareStatement(sql); - - preparedStmt.setString(1, nom); - preparedStmt.setString(2, prenom); - preparedStmt.setString(3, mail); - preparedStmt.setInt(4, id); - - update = preparedStmt.executeUpdate(); - } catch (SQLException ex) { - System.out.println("SQLException:"+ex.getMessage()); - System.out.println("SQLState:"+ex.getSQLState()); - System.out.println("code Erreur:"+ex.getErrorCode()); - } - - return update > 0; - } -} diff --git a/src/main/java/com/test/bdd/Connexion.java b/src/main/java/com/test/bdd/Connexion.java deleted file mode 100644 index 393a29f..0000000 --- a/src/main/java/com/test/bdd/Connexion.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.test.bdd; -/* -Connexion.java -Classe permettant d'établir une connexion avec une base de données mySQL -*/ -import java.sql.Connection; -import java.sql.DriverManager; - -public class Connexion { - private static Connection connect; // Variable de connexion - - /** - * Constructeur - * @param serveur nom du serveur, localhost si local - * @param bdd nom de la base de données - * @param nomUtil nom utilisateur - * @param mdp mot de passe lié à l'utilisateur - */ - private Connexion(String serveur, String bdd, String nomUtil, String mdp) { - try { - // 1. Chargement du driver - //Class.forName("com.mysql.jdbc.Driver"); - Class.forName("org.mariadb.jdbc.Driver"); - System.out.println("Driver accessible"); - - // 2. Initialisation des paramètres de connexion - String host = serveur; // Serveur de bd - String dbname = bdd; // Nom bd - String url = "jdbc:mariadb://" + host + "/" + dbname; // url de connexion - url += "?autoReconnect=true"; // Ajout 26/09/2021 - System.out.println("url : "+url); - String user = nomUtil; // nom du user - System.out.println("nomUtil : "+nomUtil); - String passwd = mdp; // mot de passe - System.out.println("mdp : "+mdp); - - // 3. Connexion - connect = (Connection) DriverManager.getConnection(url, user, passwd); - System.out.println("Connexion réussie !"); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Retourne la connection établie (Création d'une connection si elle n'existe pas) - * @param serveur nom du serveur, localhost si local - * @param bdd nom de la base de données - * @param nomUtil nom utilisateur - * @param mdp mot de passe lié à l'utilisateur - * @return connection établie - */ - public static Connection getConnect(String serveur, String bdd, String nomUtil, String mdp) { - System.out.println("getConnect"); - if (connect == null) { - new Connexion(serveur, bdd, nomUtil, mdp); - } - return connect; - } -} diff --git a/src/main/java/com/test/bdd/SalarieJPA.java b/src/main/java/com/test/bdd/SalarieJPA.java index 24ba5e6..ce249b9 100644 --- a/src/main/java/com/test/bdd/SalarieJPA.java +++ b/src/main/java/com/test/bdd/SalarieJPA.java @@ -32,9 +32,10 @@ public class SalarieJPA { } public Salarie readSalarie(String login, String mdp) { - TypedQuery query = em.createQuery("SELECT s FROM Salarie s WHERE s.login = ?1 AND s.mdp= ?2 LIMIT 1", Salarie.class); + TypedQuery query = em.createQuery("SELECT s FROM Salarie s WHERE s.login = ?1 AND s.mdp= ?2", Salarie.class); Salarie salarie = query.setParameter(1, login) .setParameter(2, mdp) + .setMaxResults(1) .getSingleResult(); return salarie; diff --git a/src/main/java/com/test/bdd/SalarieMysql.java b/src/main/java/com/test/bdd/SalarieMysql.java deleted file mode 100644 index 965acb3..0000000 --- a/src/main/java/com/test/bdd/SalarieMysql.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.test.bdd; - -import com.test.beans.Salarie; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; - -/** - * - * @author steve.maingana - */ -public class SalarieMysql { - // private Connection laConnexion; - private Statement stmt = null; - private ResultSet result = null; - - // public ClientMysql() { - Connection laConnexion = Connexion.getConnect("192.168.100.100", "bdclient", "adminBDClient", "mdpBDClient"); - // } - - public ArrayList readAll() { - ArrayList salaries = new ArrayList(); - - try { - stmt = laConnexion.createStatement(); - - result = stmt.executeQuery("SELECT * FROM salarie"); - while (result.next()) { - Salarie salarie = new Salarie( - result.getInt("id"), - result.getString("login"), - result.getString("mdp"), - result.getInt("admin") - ); - - salaries.add(salarie); - } - - result.close(); - stmt.close(); - } catch (SQLException ex) { - System.out.println("SQLException : " + ex.getMessage()); - System.out.println("SQLState : " + ex.getSQLState()); - System.out.println("Code erreur : " + ex.getErrorCode()); - } - - return salaries; - } - - public Salarie lireSalarie(String login, String mdp) { - Salarie salarie = null; - - try { - PreparedStatement preparedStmt = laConnexion.prepareStatement("SELECT * FROM salarie WHERE login = ? AND mdp = ?"); - - preparedStmt.setString(1, login); - preparedStmt.setString(2, mdp); - - result = preparedStmt.executeQuery(); - if (result.next()) { - salarie = new Salarie( - result.getInt("id"), - result.getString("login"), - result.getString("mdp"), - result.getInt("admin") - ); - } - } catch (SQLException ex) { - System.out.println("SQLException : " + ex.getMessage()); - System.out.println("SQLState : " + ex.getSQLState()); - System.out.println("Code erreur : " + ex.getErrorCode()); - } - - return salarie; - } -} - diff --git a/src/main/java/com/test/beans/Client.java b/src/main/java/com/test/beans/Client.java index 5337474..e5028aa 100644 --- a/src/main/java/com/test/beans/Client.java +++ b/src/main/java/com/test/beans/Client.java @@ -3,61 +3,54 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template */ package com.test.beans; +import jakarta.persistence.*; /** * * @author steve.maingana */ + +@Entity +@Table(name = "client") + public class Client { + + // Annotations pour gérer id auto-incrémenté + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; + private String nom; private String prenom; private String mail; - - public Client(String nom, String prenom, String mail) { - this.nom = nom; - this.prenom = prenom; - this.mail = mail; - } + + public Client() {} // obligatoire pour JPA (constructeur vide) public Client(int id, String nom, String prenom, String mail) { - this.id = id; + this.id=id; this.nom = nom; this.prenom = prenom; this.mail = mail; } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getNom() { - return nom; - } - - public void setNom(String nom) { + + public Client(String nom, String prenom, String mail) { this.nom = nom; - } - - public String getPrenom() { - return prenom; - } - - public void setPrenom(String prenom) { this.prenom = prenom; - } - - public String getMail() { - return mail; - } - - public void setMail(String mail) { this.mail = mail; } + // Getters, setters, toString() identiques + public int getId() { return id; } + public void setId(int id) { this.id = id; } + public String getNom() { return nom; } + public void setNom(String nom) { this.nom = nom; } + public String getPrenom() { return prenom; } + public void setPrenom(String prenom) { this.prenom = prenom; } + public String getMail() { return mail; } + public void setMail(String mail) { this.mail = mail; } + @Override + public String toString() { + return "Client{" + "id=" + id + ", nom=" + nom + ", prenom=" + prenom + ", mail=" + mail + '}'; + } } diff --git a/src/main/java/com/test/beans/Salarie.java b/src/main/java/com/test/beans/Salarie.java index ed8e731..146f9ac 100644 --- a/src/main/java/com/test/beans/Salarie.java +++ b/src/main/java/com/test/beans/Salarie.java @@ -3,53 +3,52 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template */ package com.test.beans; +import jakarta.persistence.*; /** * * @author steve.maingana */ + +@Entity +@Table(name = "salarie") + public class Salarie { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; + private String login; private String mdp; - private boolean admin; + private int admin; + + public Salarie() {} // obligatoire pour JPA (constructeur vide) public Salarie(int id, String login, String mdp, int admin) { this.id = id; this.login = login; this.mdp = mdp; - this.admin = admin > 0; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getMdp() { - return mdp; - } - - public void setMdp(String mdp) { - this.mdp = mdp; - } - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { this.admin = admin; } + + public Salarie(String login, String mdp, int admin) { + this.login = login; + this.mdp = mdp; + this.admin = admin; + } + + public int getId() { return id; } + public void setId(int id) { this.id = id; } + public String getLogin() { return login; } + public void setLogin(String login) { this.login = login; } + public String getMdp() { return mdp; } + public void setMdp(String mdp) { this.mdp = mdp; } + public int getAdmin() { return admin; }; + public void setAdmin(int admin) { this.admin = admin; }; + + @Override + public String toString() { + return "Salarie{" + "id=" + id + ", login=" + login + ", mdp=" + mdp + ", admin=" + admin + '}'; + } } diff --git a/src/main/java/com/test/forms/AuthentifForm.java b/src/main/java/com/test/forms/AuthentifForm.java index 85a8978..5d95309 100644 --- a/src/main/java/com/test/forms/AuthentifForm.java +++ b/src/main/java/com/test/forms/AuthentifForm.java @@ -4,20 +4,21 @@ */ package com.test.forms; -import com.test.bdd.SalarieMysql; +import com.test.bdd.SalarieJPA; import com.test.beans.Salarie; -import com.test.beans.User; +import jakarta.ejb.*; import jakarta.servlet.http.HttpServletRequest; /** * * @author steve.maingana */ +@Stateless public class AuthentifForm { + @EJB + private SalarieJPA dao; public String resultat; - public AuthentifForm() {}; - public String getResultat() { return this.resultat; } @@ -27,10 +28,9 @@ public class AuthentifForm { } public boolean existeUser(HttpServletRequest request) { - SalarieMysql salarieDB = new SalarieMysql(); String pseudo = (String) request.getParameter("pseudo"); String mdp = (String) request.getParameter("mdp"); - Salarie user = salarieDB.lireSalarie(pseudo, mdp); + Salarie user = dao.readSalarie(pseudo, mdp); boolean existe = user != null; @@ -42,11 +42,10 @@ public class AuthentifForm { } public boolean controlerAdmin(HttpServletRequest request) { - SalarieMysql salarieDB = new SalarieMysql(); String pseudo = (String) request.getParameter("pseudo"); String mdp = (String) request.getParameter("mdp"); - Salarie user = salarieDB.lireSalarie(pseudo, mdp); - boolean estAdmin = user.isAdmin(); + Salarie user = dao.readSalarie(pseudo, mdp); + boolean estAdmin = user.getAdmin() > 0; if (estAdmin) { this.setResultat("Vous êtes administrateur"); diff --git a/src/main/java/com/test/forms/ModifClientForm.java b/src/main/java/com/test/forms/ModifClientForm.java index 2709187..4bd2988 100644 --- a/src/main/java/com/test/forms/ModifClientForm.java +++ b/src/main/java/com/test/forms/ModifClientForm.java @@ -4,17 +4,21 @@ */ package com.test.forms; -import com.test.bdd.ClientMysql; +import com.test.bdd.ClientJPA; +import com.test.beans.Client; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; import jakarta.servlet.http.HttpServletRequest; /** * * @author steve.maingana */ +@Stateless public class ModifClientForm { + @EJB + private ClientJPA dao; public String resultat; - - public ModifClientForm() {}; public String getResultat() { return resultat; @@ -25,13 +29,28 @@ public class ModifClientForm { } public boolean modifierClient(HttpServletRequest request) { - ClientMysql clientDB = new ClientMysql(); + boolean modification = false; String id = request.getParameter("clientId"); String nom = request.getParameter("clientNom"); String prenom = request.getParameter("clientPrenom"); String mail = request.getParameter("clientMail"); + Client client = dao.read(Integer.parseInt(id)); - boolean modification = clientDB.update(Integer.parseInt(id), nom, prenom, mail); + if (client != null) { + if (nom != null && !nom.isEmpty()) { + client.setNom(nom); + } + + if (prenom != null && !prenom.isEmpty()) { + client.setPrenom(prenom); + } + + if (mail != null && !mail.isEmpty()) { + client.setMail(mail); + } + + modification = dao.update(client) == Integer.parseInt(id); + } if (modification) { this.setResultat("Le client N°"+id+" a été modifié avec succès"); diff --git a/src/main/java/com/test/forms/NouveauClientForm.java b/src/main/java/com/test/forms/NouveauClientForm.java index b88f19f..e73c526 100644 --- a/src/main/java/com/test/forms/NouveauClientForm.java +++ b/src/main/java/com/test/forms/NouveauClientForm.java @@ -4,31 +4,42 @@ */ package com.test.forms; -import com.test.bdd.ClientMysql; +import com.test.bdd.ClientJPA; import com.test.beans.Client; +import jakarta.ejb.*; import jakarta.servlet.http.HttpServletRequest; /** * * @author steve.maingana */ + +@Stateless public class NouveauClientForm { - public String resultat; + @EJB + private ClientJPA dao; - public NouveauClientForm() {}; + public String resultat; public String getResultat() { return resultat; } - + public void setResultat(String resultat) { this.resultat = resultat; } public int verifierClient(HttpServletRequest request) { - Client client = new Client(request.getParameter("nom_client"), request.getParameter("prenom_client"), request.getParameter("mail_client")); - ClientMysql clientDB = new ClientMysql(); - int nouveauClient = clientDB.create(client); - return nouveauClient; + int id=-1; + + String leNom = request.getParameter("nom"); + String lePrenom =request.getParameter("prenom"); + + if ((lePrenom.matches("[A-Za-zÀ-ÖØ-öø-ÿ' -]{1,100}"))&& (leNom.matches("[A-Za-zÀ-ÖØ-öø-ÿ' -]{1,100}"))){ + Client cliSaisi = new Client(request.getParameter("nom"),request.getParameter("prenom"),request.getParameter("mail") ); + id = dao.create(cliSaisi); + System.out.println("Client créé avec id : " + id); + } + return id; }; } diff --git a/src/main/java/com/test/servlets/AuthentifServlet.java b/src/main/java/com/test/servlets/AuthentifServlet.java index af4f817..f7ae359 100644 --- a/src/main/java/com/test/servlets/AuthentifServlet.java +++ b/src/main/java/com/test/servlets/AuthentifServlet.java @@ -5,6 +5,7 @@ package com.test.servlets; import com.test.forms.AuthentifForm; +import jakarta.ejb.EJB; import jakarta.servlet.RequestDispatcher; import java.io.IOException; import java.io.PrintWriter; @@ -23,9 +24,8 @@ import jakarta.servlet.http.HttpSession; @WebServlet(name = "AuthentifServlet", urlPatterns = {"/authentification"}) public class AuthentifServlet extends HttpServlet { - // String monPseudo = "Lovelace"; - String monPseudo = "steve"; - String monMdp = "Ada"; + @EJB + private AuthentifForm auhtentifForm; /** * Processes requests for both HTTP GET and POST @@ -82,18 +82,17 @@ public class AuthentifServlet extends HttpServlet { HttpSession maSession = request.getSession(); String pseudo = (String) request.getParameter("pseudo"); String mdp = (String) request.getParameter("mdp"); - AuthentifForm authentification = new AuthentifForm(); maSession.setAttribute("isAuthentified", false); if (!pseudo.isBlank() && !mdp.isBlank()) { - if (authentification.existeUser(request)) { - boolean isAdmin = authentification.controlerAdmin(request); + if (auhtentifForm.existeUser(request)) { + boolean isAdmin = auhtentifForm.controlerAdmin(request); maSession.setAttribute("isAdmin", isAdmin); maSession.setAttribute("isAuthentified", true); } } - request.setAttribute("authentification", authentification); + request.setAttribute("authentification", auhtentifForm); RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/accueilVue.jsp"); dispatcher.forward(request, response); } diff --git a/src/main/java/com/test/servlets/ListeServlet.java b/src/main/java/com/test/servlets/ListeServlet.java index 260f349..72efc03 100644 --- a/src/main/java/com/test/servlets/ListeServlet.java +++ b/src/main/java/com/test/servlets/ListeServlet.java @@ -4,8 +4,9 @@ */ package com.test.servlets; -import com.test.bdd.ClientMysql; +import com.test.bdd.ClientJPA; import com.test.beans.Client; +import jakarta.ejb.EJB; import java.io.IOException; import java.io.PrintWriter; import jakarta.servlet.ServletException; @@ -15,6 +16,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import java.util.ArrayList; +import java.util.List; /** * @@ -24,6 +26,8 @@ import java.util.ArrayList; @WebServlet(name = "ListeServlet", urlPatterns = {"/ListeClients"}) public class ListeServlet extends HttpServlet { + @EJB + private ClientJPA dao; /** * Processes requests for both HTTP GET and POST @@ -69,11 +73,9 @@ public class ListeServlet extends HttpServlet { response.sendRedirect("/Test2Jakarta/Accueil"); return; } - ClientMysql clientDB = new ClientMysql(); - ArrayList clients = clientDB.readAll(); + List clients = dao.readAll(); request.setAttribute("clients", clients); - getServletContext().getRequestDispatcher("/WEB-INF/listeClientsVue.jsp").forward(request, response); } diff --git a/src/main/java/com/test/servlets/ModifClientServlet.java b/src/main/java/com/test/servlets/ModifClientServlet.java index 3b742f9..7ec7169 100644 --- a/src/main/java/com/test/servlets/ModifClientServlet.java +++ b/src/main/java/com/test/servlets/ModifClientServlet.java @@ -5,6 +5,7 @@ package com.test.servlets; import com.test.forms.ModifClientForm; +import jakarta.ejb.EJB; import java.io.IOException; import java.io.PrintWriter; import jakarta.servlet.ServletException; @@ -20,6 +21,8 @@ import jakarta.servlet.http.HttpSession; */ @WebServlet(name = "ModifClientServlet", urlPatterns = {"modifierClient"}) public class ModifClientServlet extends HttpServlet { + @EJB + private ModifClientForm modifClient; /** * Processes requests for both HTTP GET and POST @@ -81,10 +84,9 @@ public class ModifClientServlet extends HttpServlet { return; } - ModifClientForm modification = new ModifClientForm(); - boolean modifClient = modification.modifierClient(request); + modifClient.modifierClient(request); request.setAttribute("modification", modifClient); - request.setAttribute("modification_message", modification.getResultat()); + request.setAttribute("modification_message", modifClient.getResultat()); response.sendRedirect("/Test2Jakarta/ListeClients"); } diff --git a/src/main/java/com/test/servlets/NouveauServlet.java b/src/main/java/com/test/servlets/NouveauServlet.java index 9458a3a..03dfb13 100644 --- a/src/main/java/com/test/servlets/NouveauServlet.java +++ b/src/main/java/com/test/servlets/NouveauServlet.java @@ -5,6 +5,7 @@ package com.test.servlets; import com.test.forms.NouveauClientForm; +import jakarta.ejb.EJB; import java.io.IOException; import java.io.PrintWriter; import jakarta.servlet.ServletException; @@ -23,6 +24,8 @@ import java.util.ArrayList; @WebServlet(name = "NouveauServlet", urlPatterns = {"/NouveauClient"}) public class NouveauServlet extends HttpServlet { + @EJB + private NouveauClientForm leControle; /** * Processes requests for both HTTP GET and POST @@ -85,9 +88,7 @@ public class NouveauServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - NouveauClientForm nouveauClient = new NouveauClientForm(); - int idClient = nouveauClient.verifierClient(request); + int idClient = leControle.verifierClient(request); request.setAttribute("new_client", idClient > -1); if (idClient > -1) { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 7582bf1..8cffd05 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,7 +1,16 @@ - - - + + + jdbc/bdclient + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/nouveauClientVue.jsp b/src/main/webapp/WEB-INF/nouveauClientVue.jsp index b460690..133a7e0 100644 --- a/src/main/webapp/WEB-INF/nouveauClientVue.jsp +++ b/src/main/webapp/WEB-INF/nouveauClientVue.jsp @@ -16,11 +16,11 @@
Client : - + - + - +