#1293 - Refactor - move JdbcClose into io.ebean.util ... from io.ebeaninternal.util as it is used in public API (platform code, sequences etc)

This commit is contained in:
Rob Bygrave committed 2018-02-27 12:56:20 +13:00
1 parent 3dfdd0e2e8
commit 06bce35f5a
20 files changed
+43 -159

No files matched your search

@@ -10,10 +10,11 @@ import io.ebean.bean.NodeUsageListener;
import io.ebean.bean.ObjectGraphNode;
import io.ebean.bean.PersistenceContext;
import io.ebean.event.readaudit.ReadEvent;
import io.ebean.util.JdbcClose;
import io.ebeaninternal.api.SpiProfileTransactionEvent;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.api.SpiQuery.Mode;
import io.ebeaninternal.api.SpiTransaction;
import io.ebeaninternal.api.SpiProfileTransactionEvent;
import io.ebeaninternal.server.autotune.ProfilingListener;
import io.ebeaninternal.server.core.OrmQueryRequest;
import io.ebeaninternal.server.core.SpiOrmQueryRequest;
@@ -381,14 +382,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
} catch (SQLException e) {
logger.error("Error closing dataReader", e);
}
try {
if (pstmt != null) {
pstmt.close();
pstmt = null;
}
} catch (SQLException e) {
logger.error("Error closing preparedStatement", e);
}
JdbcClose.close(pstmt);
pstmt = null;
}
/**
@@ -1,5 +1,6 @@
package io.ebeaninternal.server.query;
import io.ebean.util.JdbcClose;
import io.ebeaninternal.api.SpiProfileTransactionEvent;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.api.SpiTransaction;
@@ -169,14 +170,8 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
} catch (SQLException e) {
logger.error("Error closing DataReader", e);
}
try {
if (pstmt != null) {
pstmt.close();
pstmt = null;
}
} catch (SQLException e) {
logger.error("Error closing PreparedStatement", e);
}
JdbcClose.close(pstmt);
pstmt = null;
}
@Override
@@ -1,5 +1,6 @@
package io.ebeaninternal.server.query;
import io.ebean.util.JdbcClose;
import io.ebeaninternal.api.SpiProfileTransactionEvent;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.api.SpiTransaction;
@@ -141,8 +142,8 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
* Close the resources.
*/
private void close() {
UtilJdbc.close(rset);
UtilJdbc.close(pstmt);
JdbcClose.close(rset);
JdbcClose.close(pstmt);
rset = null;
pstmt = null;
}
@@ -1,5 +1,6 @@
package io.ebeaninternal.server.query;
import io.ebean.util.JdbcClose;
import io.ebeaninternal.api.SpiProfileTransactionEvent;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.api.SpiTransaction;
@@ -127,7 +128,7 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
* Close the resources.
*/
private void close() {
UtilJdbc.close(pstmt);
JdbcClose.close(pstmt);
pstmt = null;
}
@@ -1,34 +0,0 @@
package io.ebeaninternal.server.query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
public class UtilJdbc {
private static final Logger logger = LoggerFactory.getLogger(UtilJdbc.class);
public static void close(ResultSet resultSet) {
try {
if (resultSet != null) {
resultSet.close();
}
} catch (SQLException e) {
logger.error("Error closing ResultSet", e);
}
}
public static void close(PreparedStatement statement) {
try {
if (statement != null) {
statement.close();
}
} catch (SQLException e) {
logger.error("Error closing PreparedStatement", e);
}
}
}