Merge pull request #100 from KenJoelTL/ajustements_dev

Ajustements au niveau de la gestion des erreurs au niveau de la Connexion vers la base de données

Merge pull request #100 from KenJoelTL/ajustements_dev
bcde7302 · Joel Lutumba · GitHub · e511fd31 · a20a6549 · bcde7302
Unverified Commit bcde7302 authored 7 years ago by Joel Lutumba Committed by GitHub 7 years ago
--- a/DefiLecture-JC/src/java/com/defiLecture/controleur/ActionBuilder.java
+++ b/DefiLecture-JC/src/java/com/defiLecture/controleur/ActionBuilder.java
@@ -8,7 +8,7 @@ package com.defiLecture.controleur;

 /**
 *
- * @authors Charles & Joel
+ * @author Charles et Joel
 */
 public class ActionBuilder {
    public static Action getAction(String actionName) {

--- a/DefiLecture-JC/src/java/jdbc/Config.java
+++ b/DefiLecture-JC/src/java/jdbc/Config.java
@@ -11,11 +11,11 @@ package jdbc;
 */
 public class Config {
    
-    public static String URL = "jdbc:mysql://localhost/defilecture?useUnicode=true&characterEncoding=UTF-8";
-    public static String DB_HOST = "localhost";
-    public static String DB_USER = "root"; //utiliser les para de config
-    public static String DB_PWD = "root";
-    public static String DB_NAME = "defilecture";
-    public static String DRIVER = "com.mysql.jdbc.Driver"; //Ajout de l'attribut contenant info du pilote - Joel
+    public static String URL = "";
+    public static String DB_HOST = "";
+    public static String DB_USER = ""; //utiliser les para de config
+    public static String DB_PWD = "";
+    public static String DB_NAME = "";
+    public static String DRIVER = ""; //Ajout de l'attribut contenant info du pilote - Joel
 
 }
--- a/DefiLecture-JC/src/java/jdbc/Connexion.java
+++ b/DefiLecture-JC/src/java/jdbc/Connexion.java
@@ -22,21 +22,17 @@ public class Connexion {

        public Connexion(){}
        
-	public static Connection getInstance() {
+	public static Connection getInstance() throws SQLException {
            if (connection == null)
-                try {
                if (user.equals(""))
                    connection = DriverManager.getConnection(url);
                else
                    connection = DriverManager.getConnection(url,user,password);

-                } catch (SQLException e) {
-                        e.printStackTrace();
-                }
            return connection;
 	}
        
-        public Connection getCnx(){
+        public Connection getCnx() throws SQLException{
            cnx = Connexion.getInstance();
            return cnx;
        }
@@ -103,7 +99,7 @@ public class Connexion {
     * @return Connection
     * @throws java.lang.ClassNotFoundException
         */
-        public static Connection startConnection(String user, String password, String url, String driver) throws ClassNotFoundException{
+        public static Connection startConnection(String user, String password, String url, String driver) throws ClassNotFoundException, SQLException{
                Class.forName(driver);
                Connexion.user = user;
                Connexion.password = password;

--- a/DefiLecture-JC/web/WEB-INF/vue/pageConnexion.jsp
+++ b/DefiLecture-JC/web/WEB-INF/vue/pageConnexion.jsp
@@ -17,7 +17,7 @@
            
        <c:when test="${ empty sessionScope.connecte }">
       <div class="col-sm-12 col-lg-12 col-xs-12 col-md-12 connexion-col"> 
-           <h1>Connection</h1>
+           <h1>Connexion</h1>
        <form class="connexion-form" action="connexion.do" method="post">
            <div class="form-group">
                <label for="identifiant">Nom d'utilisateur :</label>

--- a/DefiLecture-JC/web/WEB-INF/vue/pageListeEquipes.jsp
+++ b/DefiLecture-JC/web/WEB-INF/vue/pageListeEquipes.jsp
@@ -71,4 +71,3 @@
            </table>
    </div>
 </div>
->>>>>>> 6d5aa13e83d515f0e2817b0cda9a1b24f431d391
--- a/DefiLecture-JC/web/WEB-INF/vue/pageTableauScores.jsp
+++ b/DefiLecture-JC/web/WEB-INF/vue/pageTableauScores.jsp
@@ -8,7 +8,19 @@
 <%@page import="com.defiLecture.modele.EquipeDAO"%>
 <%@page import="jdbc.Config"%>
 <%@page import="jdbc.Connexion"%>
+<%@page import="java.sql.SQLException"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<%  try{
+        EquipeDAO dao = new EquipeDAO(Connexion.startConnection(Config.DB_USER, Config.DB_PWD, Config.URL, Config.DRIVER));
+        pageContext.setAttribute("listeEquipes", dao.findAll());
+    }
+    catch(SQLException e){
+        response.sendError(response.SC_INTERNAL_SERVER_ERROR,"Erreur interne" + e.getMessage());
+	out.close();
+    } %>
+
+        
 <!DOCTYPE html>
 <html>
    <head>
@@ -17,8 +29,6 @@
    </head>
    <body>

-<%  EquipeDAO dao = new EquipeDAO(Connexion.startConnection(Config.DB_USER, Config.DB_PWD, Config.URL, Config.DRIVER));
-    pageContext.setAttribute("listeEquipes", dao.findAll());   %>
        <div class="row scores-row">
            <div class="col-sm-12 col-lg-12 col-xs-12 col-md-12 scores-col">
                <h2>Tableau des scores</h2>