Skip to content
Snippets Groups Projects
Commit 0250b42b authored by Giorgio Utzeri's avatar Giorgio Utzeri
Browse files

refacto all

parent 3dcf2524
No related branches found
No related tags found
No related merge requests found
nbday=7 nbday=7
driver=org.postgresql.Driver driver=org.postgresql.Driver
url=jdbc:postgresql://localhost:5432/sae url=jdbc:postgresql://psqlserv/but2
login=admin login=giorgioutzerietu
mdp=admin mdp=moi
\ No newline at end of file
...@@ -9,8 +9,8 @@ import dao.UtilisateurDAO; ...@@ -9,8 +9,8 @@ import dao.UtilisateurDAO;
import dto.Utilisateur; import dto.Utilisateur;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
@WebServlet("/servlet-Authent") @WebServlet("/Authent")
public class Authent extends HttpServlet { public class AccountAuthent extends HttpServlet {
UtilisateurDAO utilisateurDAO = new UtilisateurDAO(); UtilisateurDAO utilisateurDAO = new UtilisateurDAO();
......
...@@ -10,7 +10,7 @@ import dto.Utilisateur; ...@@ -10,7 +10,7 @@ import dto.Utilisateur;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
@WebServlet("/Create") @WebServlet("/Create")
public class Create extends HttpServlet { public class AccountCreate extends HttpServlet {
UtilisateurDAO utilisateurDAO = new UtilisateurDAO(); UtilisateurDAO utilisateurDAO = new UtilisateurDAO();
protected void service(HttpServletRequest req, HttpServletResponse res) protected void service(HttpServletRequest req, HttpServletResponse res)
......
package controleurs; package controleurs;
import dao.FilDAO;
import dao.ParticipantFilDAO; import dao.ParticipantFilDAO;
import dao.UtilisateurDAO; import dao.UtilisateurDAO;
import dto.Utilisateur; import dto.Utilisateur;
...@@ -17,7 +16,7 @@ import java.util.Arrays; ...@@ -17,7 +16,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
@WebServlet("/addUserFil") @WebServlet("/addUserFil")
public class addUserFil extends HttpServlet { public class FilAddUser extends HttpServlet {
protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
res.setContentType("text/html;charset=UTF-8"); res.setContentType("text/html;charset=UTF-8");
HttpSession session = req.getSession(true); HttpSession session = req.getSession(true);
......
...@@ -13,7 +13,7 @@ import jakarta.servlet.annotation.WebServlet; ...@@ -13,7 +13,7 @@ import jakarta.servlet.annotation.WebServlet;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
@WebServlet("/CreateFil") @WebServlet("/CreateFil")
public class CreateFil extends HttpServlet { public class FilCreate extends HttpServlet {
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
res.setContentType("text/html;charset=UTF-8"); res.setContentType("text/html;charset=UTF-8");
......
...@@ -10,7 +10,7 @@ import dto.Utilisateur; ...@@ -10,7 +10,7 @@ import dto.Utilisateur;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
@WebServlet("/LeaveFil") @WebServlet("/LeaveFil")
public class LeaveFil extends HttpServlet { public class FilLeave extends HttpServlet {
protected void service(HttpServletRequest req, HttpServletResponse res) protected void service(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException { throws ServletException, IOException {
HttpSession session = req.getSession(false); HttpSession session = req.getSession(false);
......
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import dao.FilDAO; import dao.FilDAO;
import dao.ParticipantFilDAO; import dao.ParticipantFilDAO;
import dao.UtilisateurDAO;
import dto.Fil; import dto.Fil;
import dto.Utilisateur; import dto.Utilisateur;
import jakarta.servlet.*; import jakarta.servlet.*;
...@@ -14,7 +13,9 @@ import jakarta.servlet.annotation.WebServlet; ...@@ -14,7 +13,9 @@ import jakarta.servlet.annotation.WebServlet;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
@WebServlet("/AddUser") @WebServlet("/AddUser")
public class AddUser extends HttpServlet { public class FilUser extends HttpServlet {
private ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
private FilDAO filDAO = new FilDAO();
protected void doGet(HttpServletRequest req, HttpServletResponse res) protected void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException { throws ServletException, IOException {
...@@ -24,8 +25,6 @@ public class AddUser extends HttpServlet { ...@@ -24,8 +25,6 @@ public class AddUser extends HttpServlet {
if (utilisateur == null) { if (utilisateur == null) {
res.sendRedirect("login.html"); res.sendRedirect("login.html");
} else { } else {
FilDAO filDAO = new FilDAO();
ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
List<Fil> fils = filDAO.getFilsByUser(utilisateur.getId()); List<Fil> fils = filDAO.getFilsByUser(utilisateur.getId());
req.setAttribute("fils", fils); req.setAttribute("fils", fils);
String rese = req.getParameter("filId"); String rese = req.getParameter("filId");
...@@ -54,7 +53,6 @@ public class AddUser extends HttpServlet { ...@@ -54,7 +53,6 @@ public class AddUser extends HttpServlet {
int userId = Integer.parseInt(userIdString); int userId = Integer.parseInt(userIdString);
int filId = Integer.parseInt(filIdString); int filId = Integer.parseInt(filIdString);
ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
participantFilDAO.deleteUserById(userId, filId); participantFilDAO.deleteUserById(userId, filId);
res.sendRedirect("Menu?filId=" + filIdString); res.sendRedirect("Menu?filId=" + filIdString);
......
...@@ -14,7 +14,7 @@ import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; ...@@ -14,7 +14,7 @@ import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
import java.io.IOException; import java.io.IOException;
@WebServlet("/ControleurLike") @WebServlet("/ControleurLike")
public class ControleurLike extends HttpServlet { public class LikeControler extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private LikeDAO likeDAO; private LikeDAO likeDAO;
private MessageDAO messageDAO; private MessageDAO messageDAO;
......
...@@ -6,8 +6,8 @@ import jakarta.servlet.*; ...@@ -6,8 +6,8 @@ import jakarta.servlet.*;
import jakarta.servlet.http.*; import jakarta.servlet.http.*;
import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.annotation.WebServlet;
@WebServlet("/LogoutServlet") @WebServlet("/Logout")
public class LogoutServlet extends HttpServlet { public class LogoutControler extends HttpServlet {
protected void service(HttpServletRequest req, HttpServletResponse res) protected void service(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException { throws ServletException, IOException {
......
...@@ -2,11 +2,8 @@ package controleurs; ...@@ -2,11 +2,8 @@ package controleurs;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List;
import dao.FilDAO;
import dao.MessageDAO; import dao.MessageDAO;
import dto.Fil;
import dto.Utilisateur; import dto.Utilisateur;
import jakarta.servlet.*; import jakarta.servlet.*;
import jakarta.servlet.annotation.MultipartConfig; import jakarta.servlet.annotation.MultipartConfig;
...@@ -20,7 +17,7 @@ import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils; ...@@ -20,7 +17,7 @@ import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
maxRequestSize = 1024 * 1024 * 50 maxRequestSize = 1024 * 1024 * 50
) )
@WebServlet("/EnvoyerMessage") @WebServlet("/EnvoyerMessage")
public class EnvoyerMessage extends HttpServlet { public class MessageSend extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private MessageDAO messageDAO; private MessageDAO messageDAO;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<form action=servlet-Authent method=get> <form action=Authent method=get>
<h2>Se connecter</h2> <h2>Se connecter</h2>
<div class="mb-3"> <div class="mb-3">
<label for="login" class="form-label">Adresse Mail</label> <label for="login" class="form-label">Adresse Mail</label>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<span><%= utilisateur.getPrenom() + " " + utilisateur.getNom() %></span> <span><%= utilisateur.getPrenom() + " " + utilisateur.getNom() %></span>
</a> </a>
<a href="LogoutServlet" class="text-danger fs-3"> <a href="Logout" class="text-danger fs-3">
<i class="bi bi-box-arrow-right"></i> <i class="bi bi-box-arrow-right"></i>
</a> </a>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment