From 5d01a9669ad2c8903f00b3c1e9bff88e1d50e5d9 Mon Sep 17 00:00:00 2001
From: Sola <loli@sola.love>
Date: Sun, 22 Nov 2015 23:23:39 +0800
Subject: [PATCH] use try-with-resource style for sql queries

---
 .../java/love/sola/netsupport/sql/SQLCore.java     |  6 ------
 .../java/love/sola/netsupport/sql/TableUser.java   | 14 ++++----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/main/java/love/sola/netsupport/sql/SQLCore.java b/src/main/java/love/sola/netsupport/sql/SQLCore.java
index e0c907d..667b162 100644
--- a/src/main/java/love/sola/netsupport/sql/SQLCore.java
+++ b/src/main/java/love/sola/netsupport/sql/SQLCore.java
@@ -2,8 +2,6 @@ package love.sola.netsupport.sql;
 
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
 
 /**
  * ***********************************************
@@ -25,8 +23,4 @@ public class SQLCore {
 		}
 	}
 
-	public static void free(Connection conn) {
-		if (conn != null) try { conn.close(); } catch (SQLException e) { }
-	}
-
 }
diff --git a/src/main/java/love/sola/netsupport/sql/TableUser.java b/src/main/java/love/sola/netsupport/sql/TableUser.java
index 3b2d5b3..4ca6a14 100644
--- a/src/main/java/love/sola/netsupport/sql/TableUser.java
+++ b/src/main/java/love/sola/netsupport/sql/TableUser.java
@@ -24,9 +24,7 @@ public class TableUser extends SQLCore {
 	public static final String COLUMN_WECHAT = "wechat";
 
 	public static User getUserByName(String name) {
-		Connection conn = null;
-		try {
-			conn = ds.getConnection();
+		try (Connection conn = ds.getConnection()) {
 			PreparedStatement ps = conn.prepareStatement("SELECT * FROM user_info WHERE name=?");
 			ps.setString(1, name);
 			ResultSet rs = ps.executeQuery();
@@ -38,15 +36,12 @@ public class TableUser extends SQLCore {
 						ISPType.fromId(rs.getInt(COLUMN_ISP)),
 						rs.getString(COLUMN_WECHAT));
 			}
-		} catch (SQLException e) {
-		} finally { free(conn); }
+		} catch (SQLException e) { }
 		return null;
 	}
 
 	public static User getUserById(int id) {
-		Connection conn = null;
-		try {
-			conn = ds.getConnection();
+		try (Connection conn = ds.getConnection()) {
 			PreparedStatement ps = conn.prepareStatement("SELECT * FROM user_info WHERE id=?");
 			ps.setInt(1, id);
 			ResultSet rs = ps.executeQuery();
@@ -58,8 +53,7 @@ public class TableUser extends SQLCore {
 						ISPType.fromId(rs.getInt(COLUMN_ISP)),
 						rs.getString(COLUMN_WECHAT));
 			}
-		} catch (SQLException e) {
-		} finally { free(conn); }
+		} catch (SQLException e) { }
 		return null;
 	}