Code cleanup in ORM structure

src/main/java/fr/pandacube/java/util/network_api/server/NetworkAPIListener.java

@@ -2,7 +2,6 @@ package fr.pandacube.java.util.network_api.server;
 
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.net.Socket;
 import java.util.Arrays;
 import java.util.HashMap;
 
@@ -47,8 +46,7 @@ public class NetworkAPIListener implements Runnable {
 		try {
 			// réception des connexion client
 			while (!serverSocket.isClosed()) {
-				Socket socketClient = serverSocket.accept();
+				nAPIExecutionHandler.handleRun(new PacketExecutor(serverSocket.accept(), this));
-				nAPIExecutionHandler.handleRun(new PacketExecutor(socketClient, this));
 			}
 		} catch (IOException e) {}
 

src/main/java/fr/pandacube/java/util/orm/DBConnection.java

@@ -6,10 +6,12 @@ import java.sql.SQLException;
 import java.sql.Statement;
 
 public class DBConnection {
-	Connection conn;
+	private Connection conn;
-	String url;
+	private String url;
-	String login;
+	private String login;
-	String pass;
+	private String pass;
+	
+	private long timeOfLastCheck = 0;
 
 	public DBConnection(String host, int port, String dbname, String l, String p)
 			throws ClassNotFoundException, SQLException {
@@ -27,31 +29,34 @@ public class DBConnection {
 	}
 
 	public void reconnectIfNecessary() throws SQLException {
-		try {
+		try(Statement stmt = conn.createStatement()) {
-			Statement stmt = conn.createStatement();
-			stmt.close();
 		} catch (SQLException e) {
-			try {
 			close();
-			} catch (Exception ex) {}
 			connect();
 		}
 	}
 
 	public Connection getNativeConnection() throws SQLException {
-		if (!conn.isValid(1)) reconnectIfNecessary();
+		if (conn.isClosed())
+			connect();
+		long now = System.currentTimeMillis();
+		if (timeOfLastCheck + 5000 > now) {
+			timeOfLastCheck = now;
+			if (!conn.isValid(1))
+				reconnectIfNecessary();
+		}
 		return conn;
 	}
 
 	private void connect() throws SQLException {
 		conn = DriverManager.getConnection(url, login, pass);
+		timeOfLastCheck = System.currentTimeMillis();
 	}
 
 	public void close() {
 		try {
 			conn.close();
 		} catch (Exception e) {}
-
 	}
 
 }

src/main/java/fr/pandacube/java/util/orm/ORM.java

@@ -67,26 +67,20 @@ public final class ORM {
 		}
 
 		sql += ", PRIMARY KEY id(id))";
-		PreparedStatement ps = connection.getNativeConnection().prepareStatement(sql);
+		
+		try (PreparedStatement ps = connection.getNativeConnection().prepareStatement(sql)) {
 			int i = 1;
 			for (Object val : params)
 				ps.setObject(i++, val);
-		try {
 			Log.info("Creating table " + elem.tableName() + ":\n" + ps.toString());
 			ps.executeUpdate();
-		} finally {
-			ps.close();
 		}
 	}
 
 	private static boolean tableExist(String tableName) throws SQLException {
-		ResultSet set = null;
 		boolean exist = false;
-		try {
+		try (ResultSet set = connection.getNativeConnection().getMetaData().getTables(null, null, tableName, null)) {
-			set = connection.getNativeConnection().getMetaData().getTables(null, null, tableName, null);
 			exist = set.next();
-		} finally {
-			if (set != null) set.close();
 		}
 		return exist;
 	}
@@ -146,9 +140,7 @@ public final class ORM {
 
 			SQLElementList<E> elmts = new SQLElementList<>();
 
-			PreparedStatement ps = connection.getNativeConnection().prepareStatement(sql);
+			try (PreparedStatement ps = connection.getNativeConnection().prepareStatement(sql)) {
-
-			try {
 
 				int i = 1;
 				for (Object val : params) {
@@ -156,16 +148,11 @@ public final class ORM {
 					ps.setObject(i++, val);
 				}
 				Log.debug(ps.toString());
-				ResultSet set = ps.executeQuery();
 				
-				try {
+				try (ResultSet set = ps.executeQuery()) {
 					while (set.next())
 						elmts.add(getElementInstance(set, elemClass));
-				} finally {
-					set.close();
 				}
-			} finally {
-				ps.close();
 			}
 
 			return elmts;

src/main/java/fr/pandacube/java/util/orm/SQLElement.java

@@ -1,6 +1,5 @@
 package fr.pandacube.java.util.orm;
 
-import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -211,8 +210,6 @@ public abstract class SQLElement<E extends SQLElement<E>> {
 		String toStringStatement = "";
 		try {
 
-			Connection conn = db.getNativeConnection();
-
 			if (stored) { // mettre à jour les valeurs dans la base
 
 				// restaurer l'ID au cas il aurait été changé à la main dans
@@ -234,9 +231,8 @@ public abstract class SQLElement<E extends SQLElement<E>> {
 
 				if (sql.length() > 0) sql = sql.substring(0, sql.length() - 1);
 
-				PreparedStatement ps = conn.prepareStatement("UPDATE " + tableName + " SET " + sql + " WHERE id=" + id);
+				try (PreparedStatement ps = db.getNativeConnection()
-
+						.prepareStatement("UPDATE " + tableName + " SET " + sql + " WHERE id=" + id)) {
-				try {
 
 					int i = 1;
 					for (Object val : psValues)
@@ -244,8 +240,6 @@ public abstract class SQLElement<E extends SQLElement<E>> {
 
 					toStringStatement = ps.toString();
 					ps.executeUpdate();
-				} finally {
-					ps.close();
 				}
 			}
 			else { // ajouter dans la base
@@ -270,10 +264,9 @@ public abstract class SQLElement<E extends SQLElement<E>> {
 					addValueToSQLObjectList(psValues, entry.getKey(), entry.getValue());
 				}
 
-				PreparedStatement ps = conn.prepareStatement(
+				try (PreparedStatement ps = db.getNativeConnection().prepareStatement(
 						"INSERT INTO " + tableName + "  (" + concat_fields + ") VALUES (" + concat_vals + ")",
-						Statement.RETURN_GENERATED_KEYS);
+						Statement.RETURN_GENERATED_KEYS)) {
-				try {
 
 					int i = 1;
 					for (Object val : psValues)
@@ -282,16 +275,10 @@ public abstract class SQLElement<E extends SQLElement<E>> {
 					toStringStatement = ps.toString();
 					ps.executeUpdate();
 
-					ResultSet rs = ps.getGeneratedKeys();
+					try (ResultSet rs = ps.getGeneratedKeys()) {
-					try {
 						if (rs.next()) id = rs.getInt(1);
-
 						stored = true;
-					} finally {
-						rs.close();
 					}
-				} finally {
-					ps.close();
 				}
 
 			}
@@ -332,21 +319,16 @@ public abstract class SQLElement<E extends SQLElement<E>> {
 
 	public void delete() throws ORMException {
 
-		try {
 		if (stored) { // supprimer la ligne de la base
-				PreparedStatement st = db.getNativeConnection()
+			try (PreparedStatement st = db.getNativeConnection()
-						.prepareStatement("DELETE FROM " + tableName + " WHERE id=" + id);
+					.prepareStatement("DELETE FROM " + tableName + " WHERE id=" + id)) {
-				try {
 				Log.debug(st.toString());
 				st.executeUpdate();
 				markAsNotStored();
-				} finally {
-					st.close();
-				}
-			}
 			} catch (SQLException e) {
 				throw new ORMException(e);
 			}
+		}
 
 	}
 

src/main/java/fr/pandacube/java/util/orm/SQLElementList.java

@@ -107,8 +107,7 @@ public class SQLElementList<E extends SQLElement<E>> extends ArrayList<E> {
 		}
 
 		try(PreparedStatement ps = ORM.getConnection().getNativeConnection()
-					.prepareStatement("UPDATE " + storedEl.get(0).tableName() + " SET " + sqlSet + " WHERE " + sqlWhere);) {
+					.prepareStatement("UPDATE " + storedEl.get(0).tableName() + " SET " + sqlSet + " WHERE " + sqlWhere)) {
-			
 			
 			int i = 1;
 			for (Object val : psValues)
@@ -150,17 +149,14 @@ public class SQLElementList<E extends SQLElement<E>> extends ArrayList<E> {
 				sqlWhere += "id = " + el.getId();
 			}
 
-			PreparedStatement st = ORM.getConnection().getNativeConnection()
+			try (PreparedStatement st = ORM.getConnection().getNativeConnection()
-					.prepareStatement("DELETE FROM " + storedEl.get(0).tableName() + " WHERE " + sqlWhere);
+					.prepareStatement("DELETE FROM " + storedEl.get(0).tableName() + " WHERE " + sqlWhere)) {
-			try {
 				Log.debug(st.toString());
 				st.executeUpdate();
 
 				for (E el : storedEl)
 					el.markAsNotStored();
 
-			} finally {
-				st.close();
 			}
 
 		} catch (SQLException e) {