init 15

JesusBetaX · JesusBetaX · commit 4ad5845b3978 · 2018-03-28T09:22:16.000-06:00
diff --git a/src/com/jx/library/Dao.java b/src/com/jx/library/Dao.java
@@ -18,6 +18,20 @@
  */
 public abstract class Dao<Model, Id> {
   
+  public static final Object[] EMPTY_ARRAY = new Object[0];
+  
+  public static Object[] toArray(Object value) 
+  throws SQLException {
+    if (value == null) {
+      return EMPTY_ARRAY;
+    }
+    if (value instanceof Object[]) {
+      return (Object[]) value;
+    } else {
+      return new Object[] { value };
+    }
+  }
+  
   /**
    * Busca un registro por su identificador
    * 
@@ -29,7 +43,7 @@ public abstract class Dao<Model, Id> {
    */
   public Model findById(Id id) throws SQLException {
     String sql = "SELECT * FROM " + getTableName() + " WHERE " + whereClause(id);
-    return findById(sql, id);
+    return findById(sql, toArray(id));
   }
   
   /**
@@ -49,7 +63,7 @@ public Model findById(String sql, Object... params) throws SQLException {
       rs = db.query(sql, params);
       return rs.next() ? onRead(rs) : null;
     } finally {
-      db.close(rs);
+      DataBase.close(rs);
     }
   }
   
@@ -91,7 +105,7 @@ public List<Model> find(String sql, Object... params) throws SQLException {
       return list;
       
     } finally {
-      db.close(rs);
+      DataBase.close(rs);
     }
   }
   
@@ -114,7 +128,7 @@ public long count() throws SQLException {
    * @throws SQLException 
    */
   public boolean exists(Id id) throws SQLException {
-    return getDataBase().count(getTableName(), whereClause(id), id) > 0;
+    return getDataBase().count(getTableName(), whereClause(id), toArray(id)) > 0;
   }
   
   /**
@@ -146,7 +160,7 @@ public boolean update(Model m) throws SQLException {
     }
     Id id = getId(m);
     return getDataBase().update(getTableName(), values, 
-            whereClause(id), id) == 1;
+            whereClause(id), toArray(id)) == 1;
   }
  
   /**
@@ -192,7 +206,7 @@ public boolean delete(Model m) throws SQLException {
    */
   public boolean deleteById(Id id) throws SQLException {
     return getDataBase().delete(getTableName(), 
-            whereClause(id), id) == 1;
+            whereClause(id), toArray(id)) == 1;
   }
   
   /**
@@ -289,6 +303,8 @@ protected Map<String, Object> onWrite(Model m) {
    * @param m modelo
    * @param id insertado
    */
-  protected abstract void insertId(Model m, long id);
+  protected void insertId(Model m, long id) {
+    
+  }
 
 }
diff --git a/src/com/jx/library/DataBase.java b/src/com/jx/library/DataBase.java
@@ -7,7 +7,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Map;
-import javax.swing.JOptionPane;
 
 /**
  *
@@ -337,7 +336,7 @@ protected void finalize() throws Throwable {
     }
   }
   
-  public void close(AutoCloseable ac) {
+  public static void close(AutoCloseable ac) {
     try {
       if (ac != null) {
         ac.close();
@@ -347,30 +346,6 @@ public void close(AutoCloseable ac) {
     }
   }
   
-  public boolean log(SQLException e) {
-    String msg = e.getMessage();
-    if (e.getErrorCode() == 1049) {
-      msg = "La base de datos: " + url + " no existe.";
-    } else if (e.getErrorCode() == 1044) {
-      msg = "El usuario: " + username + " no existe.";
-    } else if (e.getErrorCode() == 1045) {
-      msg = "Contraseña incorrecta.";
-    } else if (e.getErrorCode() == 0) {
-      msg = "La conexión con la base de datos no se puede realizar.\n Parece que el servidor de base de datos no esta activo.";
-    }
-    displayError(msg);
-    return Boolean.FALSE;
-  }
-  
-   private void displayError(final String msg) {
-    java.awt.EventQueue.invokeLater(new Runnable() {
-      @Override
-      public void run() {
-        JOptionPane.showMessageDialog(null, msg, "Error", JOptionPane.ERROR_MESSAGE);
-      }
-    });
-  }
-
   public String getDriverClassName() {
     return driverClassName;
   }
