se ejecuto limpieza del codigo, reformateo del codigo y optimizacion de los imports por parte del IDE

This commit is contained in:
Daniel Cortes
2019-01-20 02:16:59 -03:00
parent 4ddc2b2ee7
commit b14222c875
42 changed files with 293 additions and 326 deletions

View File

@@ -24,11 +24,8 @@
package danielcortes.xyz.models.documentos;
import danielcortes.xyz.data.ConnectionHolder;
import danielcortes.xyz.data.SQLiteConnectionHolder;
import danielcortes.xyz.models.caja.Caja;
import danielcortes.xyz.models.caja.CajaDAO;
import danielcortes.xyz.models.caja.SQLiteCajaDAO;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -45,8 +42,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public List<Documentos> findAll() {
List<Documentos> documentosList = new ArrayList<>();
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from documentos");
ResultSet rs = ps.executeQuery();
@@ -54,7 +50,6 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
rs.close();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
}
@@ -64,21 +59,19 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public Documentos findById(int id) {
Documentos documentos = null;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from documentos where id = ?");
ps.setInt(1, id);
ResultSet rs = ps.executeQuery();
List<Documentos> documentosList = this.documentosFromResultSet(rs);
if(documentosList.size() > 0){
if (documentosList.size() > 0) {
documentos = documentosList.get(0);
}
rs.close();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
}
@@ -88,21 +81,19 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public Documentos findByCaja(Caja caja) {
Documentos documentos = null;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from documentos where caja_id = ?");
ps.setInt(1, caja.getId());
ResultSet rs = ps.executeQuery();
List<Documentos> documentosList = this.documentosFromResultSet(rs);
if(documentosList.size() > 0){
if (documentosList.size() > 0) {
documentos = documentosList.get(0);
}
rs.close();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
}
@@ -112,8 +103,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public boolean insertDocumentos(Documentos documentos) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("insert into documentos (cheques, tarjetas, retiros, caja_id) values (?,?,?,?)");
ps.setInt(1, documentos.getCheques());
ps.setInt(2, documentos.getTarjetas());
@@ -130,7 +120,6 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
rs.close();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
return false;
@@ -141,8 +130,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public boolean insertDefaultDocumentos(Documentos documentos) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("insert into documentos (cheques, tarjetas, retiros, caja_id) values (0,0,0,?)");
ps.setInt(1, documentos.getCaja().getId());
@@ -156,7 +144,6 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
rs.close();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
return false;
@@ -167,8 +154,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public boolean updateDocumentos(Documentos documentos) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("update documentos set tarjetas = ?, cheques = ?, retiros = ?, caja_id = ? where id = ?");
ps.setInt(1, documentos.getTarjetas());
ps.setInt(2, documentos.getCheques());
@@ -178,7 +164,6 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
updates = ps.executeUpdate();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
return false;
@@ -189,15 +174,13 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public boolean deleteDocumentos(Documentos documentos) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("delete from documentos where id = ?");
ps.setInt(1, documentos.getId());
updates = ps.executeUpdate();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
return false;
@@ -208,8 +191,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
@Override
public int getTotalDocumentos(Caja caja) {
int total = 0;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select cheques + tarjetas + retiros from documentos where caja_id = ?");
ps.setInt(1, caja.getId());
@@ -219,7 +201,6 @@ public class SQLiteDocumentosDAO extends DocumentosDAO {
rs.close();
ps.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
}