Repository: cayenne Updated Branches: refs/heads/master bc0429d9e -> 8a4eb6a6f
- replace deprecated logQuery() method with log() - cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8a4eb6a6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8a4eb6a6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8a4eb6a6 Branch: refs/heads/master Commit: 8a4eb6a6f1b0a5966c80300df02b819a5eb0ff71 Parents: bc0429d Author: Nikita Timofeev <[email protected]> Authored: Thu Mar 23 13:09:31 2017 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Thu Mar 23 13:09:31 2017 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/access/DbGenerator.java | 2 +- .../apache/cayenne/access/jdbc/BatchAction.java | 6 +-- .../cayenne/access/jdbc/SQLTemplateAction.java | 2 +- .../procedure/ProcedureTranslator.java | 1 - .../org/apache/cayenne/dba/JdbcPkGenerator.java | 3 +- .../cayenne/dba/mysql/MySQLPkGenerator.java | 8 ++-- .../dba/openbase/OpenBasePkGenerator.java | 48 ++++++++------------ .../dba/oracle/Oracle8LOBBatchAction.java | 5 +- .../cayenne/dba/oracle/OraclePkGenerator.java | 5 +- .../dba/sqlserver/SQLServerBatchAction.java | 5 +- .../log/FormattedCommonsJdbcEventLogger.java | 1 + 11 files changed, 37 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java index 623331a..0b7028d 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java @@ -337,7 +337,7 @@ public class DbGenerator { protected boolean safeExecute(Connection connection, String sql) throws SQLException { try (Statement statement = connection.createStatement();) { - jdbcEventLogger.logQuery(sql, null); + jdbcEventLogger.log(sql); statement.execute(sql); return true; } catch (SQLException ex) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java index 09e0c96..90f5219 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java @@ -100,13 +100,13 @@ public class BatchAction extends BaseSQLAction { boolean isLoggable = logger.isLoggable(); // log batch SQL execution - logger.logQuery(sql, Collections.EMPTY_LIST); + logger.log(sql); // run batch DbAdapter adapter = dataNode.getAdapter(); - try (PreparedStatement statement = con.prepareStatement(sql);) { + try (PreparedStatement statement = con.prepareStatement(sql)) { for (BatchQueryRow row : query.getRows()) { DbAttributeBinding[] bindings = translator.updateBindings(row); @@ -151,7 +151,7 @@ public class BatchAction extends BaseSQLAction { String queryStr = translator.getSql(); // log batch SQL execution - logger.logQuery(queryStr, Collections.EMPTY_LIST); + logger.log(queryStr); // run batch queries one by one http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java index c8369a0..e8c1cf7 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java @@ -214,7 +214,7 @@ public class SQLTemplateAction implements SQLAction { break; } - updateCounts.add(Integer.valueOf(updateCount)); + updateCounts.add(updateCount); dataNode.getJdbcEventLogger().logUpdateCount(updateCount); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java index 92feb2c..aa9fdf7 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java @@ -164,7 +164,6 @@ public class ProcedureTranslator { loggableParameters.add(val); } - // FIXME: compute proper attributes via callParams logger.logQuery(sqlStr, null, loggableParameters, time); } CallableStatement stmt = connection.prepareCall(sqlStr); http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java index 38cee0e..c223273 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java @@ -39,7 +39,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; @@ -172,7 +171,7 @@ public class JdbcPkGenerator implements PkGenerator { * in case of query failure. */ public int runUpdate(DataNode node, String sql) throws SQLException { - adapter.getJdbcEventLogger().logQuery(sql, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(sql); try (Connection con = node.getDataSource().getConnection()) { try (Statement upd = con.createStatement()) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java index 9812f5f..ab186a4 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java @@ -92,7 +92,7 @@ public class MySQLPkGenerator extends JdbcPkGenerator { // THIS MUST BE EXECUTED NO MATTER WHAT, OR WE WILL LOCK THE PRIMARY KEY TABLE!! try { String unlockString = "UNLOCK TABLES"; - adapter.getJdbcEventLogger().logQuery(unlockString, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(unlockString); st.execute(unlockString); } catch (SQLException unlockEx) { exception = processSQLException(unlockEx, exception); @@ -145,12 +145,12 @@ public class MySQLPkGenerator extends JdbcPkGenerator { protected long getLongPrimaryKey(Statement statement, String entityName) throws SQLException { // lock String lockString = "LOCK TABLES AUTO_PK_SUPPORT WRITE"; - adapter.getJdbcEventLogger().logQuery(lockString, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(lockString); statement.execute(lockString); // select String selectString = super.pkSelectString(entityName); - adapter.getJdbcEventLogger().logQuery(selectString, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(selectString); long pk; try(ResultSet rs = statement.executeQuery(selectString)) { if (!rs.next()) { @@ -165,7 +165,7 @@ public class MySQLPkGenerator extends JdbcPkGenerator { // update String updateString = super.pkUpdateString(entityName) + " AND NEXT_ID = " + pk; - adapter.getJdbcEventLogger().logQuery(updateString, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(updateString); int updated = statement.executeUpdate(updateString); // optimistic lock failure... if (updated != 1) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java index 6a19de3..305add2 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java @@ -57,7 +57,7 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { @Override public Object generatePk(DataNode node, DbAttribute pk) throws Exception { - DbEntity entity = (DbEntity) pk.getEntity(); + DbEntity entity = pk.getEntity(); switch (pk.getType()) { case Types.BINARY: @@ -68,11 +68,11 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { long value = longPkFromDatabase(node, entity); if (pk.getType() == Types.BIGINT) { - return Long.valueOf(value); + return value; } else { // leaving it up to the user to ensure that PK does not exceed max // int... - return Integer.valueOf((int) value); + return (int) value; } } @@ -92,13 +92,11 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { protected long longPkFromDatabase(DataNode node, DbEntity entity) throws Exception { String sql = newIDString(entity); - adapter.getJdbcEventLogger().logQuery(sql, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(sql); - try (Connection con = node.getDataSource().getConnection();) { - - try (Statement st = con.createStatement();) { - - try (ResultSet rs = st.executeQuery(sql);) { + try (Connection con = node.getDataSource().getConnection()) { + try (Statement st = con.createStatement()) { + try (ResultSet rs = st.executeQuery(sql)) { // Object pk = null; if (!rs.next()) { throw new CayenneRuntimeException("Error generating pk for DbEntity " + entity.getName()); @@ -127,23 +125,20 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { } @Override - public void createAutoPk(DataNode node, List dbEntities) throws Exception { + public void createAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception { // looks like generating a PK on top of an existing one does not // result in errors... // create needed sequences - Iterator<?> it = dbEntities.iterator(); - while (it.hasNext()) { - DbEntity entity = (DbEntity) it.next(); - + for (DbEntity dbEntity : dbEntities) { // the caller must take care of giving us the right entities // but lets check anyway - if (!canCreatePK(entity)) { + if (!canCreatePK(dbEntity)) { continue; } - runUpdate(node, createPKString(entity)); - runUpdate(node, createUniquePKIndexString(entity)); + runUpdate(node, createPKString(dbEntity)); + runUpdate(node, createUniquePKIndexString(dbEntity)); } } @@ -151,20 +146,17 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { * */ @Override - public List createAutoPkStatements(List dbEntities) { + public List<String> createAutoPkStatements(List<DbEntity> dbEntities) { List<String> list = new ArrayList<>(2 * dbEntities.size()); - Iterator<?> it = dbEntities.iterator(); - while (it.hasNext()) { - DbEntity entity = (DbEntity) it.next(); - + for (DbEntity dbEntity : dbEntities) { // the caller must take care of giving us the right entities // but lets check anyway - if (!canCreatePK(entity)) { + if (!canCreatePK(dbEntity)) { continue; } - list.add(createPKString(entity)); - list.add(createUniquePKIndexString(entity)); + list.add(createPKString(dbEntity)); + list.add(createUniquePKIndexString(dbEntity)); } return list; @@ -178,7 +170,7 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { * */ @Override - public void dropAutoPk(DataNode node, List dbEntities) throws Exception { + public void dropAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception { // there is no simple way to do that... probably requires // editing metadata tables... // Good thing is that it doesn't matter, since PK support @@ -190,8 +182,8 @@ public class OpenBasePkGenerator extends JdbcPkGenerator { * Returns an empty list, since OpenBase doesn't support this operation. */ @Override - public List dropAutoPkStatements(List dbEntities) { - return Collections.EMPTY_LIST; + public List<String> dropAutoPkStatements(List<DbEntity> dbEntities) { + return Collections.emptyList(); } /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java index 93fda77..c9fcce5 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java @@ -29,7 +29,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import java.util.Collections; import java.util.List; import org.apache.cayenne.CayenneException; @@ -99,11 +98,11 @@ class Oracle8LOBBatchAction implements SQLAction { selectQuery.indexLOBAttributes(row); - int updated = 0; + int updated; String updateStr = translator.createSql(row); // 1. run row update - logger.logQuery(updateStr, Collections.EMPTY_LIST); + logger.log(updateStr); try (PreparedStatement statement = connection.prepareStatement(updateStr)) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java index e059a74..b6593ef 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java @@ -32,7 +32,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -167,7 +166,7 @@ public class OraclePkGenerator extends JdbcPkGenerator { try (Connection con = node.getDataSource().getConnection()) { try (Statement st = con.createStatement()) { String sql = selectNextValQuery(pkGeneratingSequenceName); - adapter.getJdbcEventLogger().logQuery(sql, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(sql); try (ResultSet rs = st.executeQuery(sql)) { if (!rs.next()) { @@ -228,7 +227,7 @@ public class OraclePkGenerator extends JdbcPkGenerator { try (Connection con = node.getDataSource().getConnection()) { try (Statement sel = con.createStatement()) { String sql = selectAllSequencesQuery(); - adapter.getJdbcEventLogger().logQuery(sql, Collections.EMPTY_LIST); + adapter.getJdbcEventLogger().log(sql); try (ResultSet rs = sel.executeQuery(sql)) { List<String> sequenceList = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java index bc757ef..612754a 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java @@ -22,7 +22,6 @@ package org.apache.cayenne.dba.sqlserver; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import java.util.Collections; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; @@ -71,9 +70,9 @@ public class SQLServerBatchAction extends BatchAction { String flag = on ? " ON" : " OFF"; String configSQL = "SET IDENTITY_INSERT " + query.getDbEntity().getFullyQualifiedName() + flag; - dataNode.getJdbcEventLogger().logQuery(configSQL, Collections.EMPTY_LIST); + dataNode.getJdbcEventLogger().log(configSQL); - try (Statement statement = connection.createStatement();) { + try (Statement statement = connection.createStatement()) { statement.execute(configSQL); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/8a4eb6a6/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedCommonsJdbcEventLogger.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedCommonsJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedCommonsJdbcEventLogger.java index e801969..ad08f86 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedCommonsJdbcEventLogger.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedCommonsJdbcEventLogger.java @@ -121,6 +121,7 @@ public class FormattedCommonsJdbcEventLogger extends CommonsJdbcEventLogger { } @Override + @Deprecated public void logQuery( String queryStr, List<DbAttribute> attrs,
