Update src/fr/iutfbleau/papillon/model/BaseDeDonnees.java

Ajout des fermeture des connexion

src/fr/iutfbleau/papillon/model/BaseDeDonnees.java

@@ -4,82 +4,101 @@ import java.util.List;
 
 public class BaseDeDonnees {
 
- 
     private static final String URL  = "jdbc:mariadb://dwarves.iut-fbleau.fr:3306/yolou";
     private static final String USER = "yolou";
     private static final String PASS = "serikhaneyolou";
 
-
     /** Connexion */
-    public static Connection connecter() throws SQLException {
+    public static Connection getConnexion() throws SQLException {
         try {
             Class.forName("org.mariadb.jdbc.Driver");
-        } catch (ClassNotFoundException ignore) {}
+        } catch (ClassNotFoundException e) {
+            System.out.println("Erreur : pilote MariaDB non trouvé !");
+        }
         return DriverManager.getConnection(URL, USER, PASS);
     }
 
-    /** INSERT renvoie l'id généré. */
+    /** Ajout d’un rappel (INSERT) */
     public static int ajouter(Rappel r) throws SQLException {
         String sql = "INSERT INTO rappel(titre, contenu, theme, rang) VALUES (?, ?, ?, ?)";
-        try (Connection cnx = connecter();
+        Connection cnx = getConnexion();
-             PreparedStatement pst = cnx.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+        PreparedStatement pst = cnx.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+
         pst.setString(1, r.getTitre());
         pst.setString(2, r.getContenu());
         pst.setString(3, r.getTheme());
         pst.setInt(4, r.getRang());
         pst.executeUpdate();
 
-            try (ResultSet rs = pst.getGeneratedKeys()) {
+        ResultSet rs = pst.getGeneratedKeys();
+        int id = 0;
         if (rs.next()) {
-                    int id = rs.getInt(1);
+            id = rs.getInt(1);
             r.setId(id);
-                    return id;
-                }
-            }
-            return 0;
-        }
         }
 
-    /** SELECT * ORDER BY rang, id. */
+        rs.close();
+        pst.close();
+        cnx.close();
+        return id;
+    }
+
+    /** Liste des rappels */
     public static List<Rappel> lister() throws SQLException {
         String sql = "SELECT id, titre, contenu, theme, rang FROM rappel ORDER BY rang ASC, id ASC";
         List<Rappel> res = new ArrayList<>();
-        try (Connection cnx = connecter();
+
+        Connection cnx = getConnexion();
         PreparedStatement pst = cnx.prepareStatement(sql);
-             ResultSet rs = pst.executeQuery()) {
+        ResultSet rs = pst.executeQuery();
+
         while (rs.next()) {
-                res.add(new Rappel(
+            Rappel r = new Rappel(
                 rs.getInt("id"),
                 rs.getString("titre"),
                 rs.getString("contenu"),
                 rs.getString("theme"),
-                        rs.getInt("rang")));
+                rs.getInt("rang")
-            }
+            );
+            res.add(r);
         }
+
+        rs.close();
+        pst.close();
+        cnx.close();
         return res;
     }
 
-    /** UPDATE par id. */
+    /** Modification d’un rappel (UPDATE) */
     public static int modifier(int id, Rappel r) throws SQLException {
         String sql = "UPDATE rappel SET titre=?, contenu=?, theme=?, rang=? WHERE id=?";
-        try (Connection cnx = connecter();
+        Connection cnx = getConnexion();
-             PreparedStatement pst = cnx.prepareStatement(sql)) {
+        PreparedStatement pst = cnx.prepareStatement(sql);
+
         pst.setString(1, r.getTitre());
         pst.setString(2, r.getContenu());
         pst.setString(3, r.getTheme());
         pst.setInt(4, r.getRang());
         pst.setInt(5, id);
-            return pst.executeUpdate();
+
-        }
+        int rows = pst.executeUpdate();
+
+        pst.close();
+        cnx.close();
+        return rows;
     }
 
-    /** DELETE par id. */
+    /** Suppression d’un rappel (DELETE) */
     public static int supprimer(int id) throws SQLException {
         String sql = "DELETE FROM rappel WHERE id=?";
-        try (Connection cnx = connecter();
+        Connection cnx = getConnexion();
-             PreparedStatement pst = cnx.prepareStatement(sql)) {
+        PreparedStatement pst = cnx.prepareStatement(sql);
+
         pst.setInt(1, id);
-            return pst.executeUpdate();
+        int rows = pst.executeUpdate();
-        }
+
+        pst.close();
+        cnx.close();
+        return rows;
     }
 }