Author: tv
Date: Thu Aug 16 09:15:10 2018
New Revision: 1838165
URL: http://svn.apache.org/viewvc?rev=1838165&view=rev
Log:
Use try-with-resources where applicable
Replace StringBuffer with StringBuilder
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/LikeBuilder.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Thu Aug 16 09:15:10 2018
@@ -337,11 +337,9 @@ public class TorqueInstance
Adapter.AUTODETECT_ADAPTER,
adapterKey))
{
- Connection con = null;
- try
+ try (Connection con = database.getDataSourceFactory()
+ .getDataSource().getConnection())
{
- con = database.getDataSourceFactory()
- .getDataSource().getConnection();
adapter = AdapterFactory.autoDetectAdapter(con);
}
catch (SQLException e)
@@ -350,10 +348,6 @@ public class TorqueInstance
"Could not get product information from JDBC",
e);
}
- finally
- {
- closeConnection(con);
- }
}
else
{
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
Thu Aug 16 09:15:10 2018
@@ -61,7 +61,7 @@ public class DerbyAdapter extends Abstra
@Override
public String toUpperCase(String str)
{
- return new StringBuffer("UPPER(")
+ return new StringBuilder("UPPER(")
.append(str)
.append(")")
.toString();
@@ -112,30 +112,12 @@ public class DerbyAdapter extends Abstra
public void lockTable(Connection con, String table)
throws SQLException
{
- Statement statement = null;
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
- StringBuffer stmt = new StringBuffer();
+ StringBuilder stmt = new StringBuilder();
stmt.append("LOCK TABLE ")
.append(table).append(" IN EXCLUSIVE MODE");
statement.executeUpdate(stmt.toString());
- statement.close();
- statement = null;
- }
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- log.warn("Could not close statement", e);
- }
- }
}
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
Thu Aug 16 09:15:10 2018
@@ -54,7 +54,7 @@ public class HsqldbAdapter extends Abstr
@Override
public String toUpperCase(String in)
{
- String s = new
StringBuffer("UPPER(").append(in).append(")").toString();
+ String s = new
StringBuilder("UPPER(").append(in).append(")").toString();
return s;
}
@@ -94,7 +94,7 @@ public class HsqldbAdapter extends Abstr
@Override
public String getIDMethodSQL(Object obj)
{
- StringBuffer command = new StringBuffer("select IDENTITY() from ");
+ StringBuilder command = new StringBuilder("select IDENTITY() from ");
String qualifiedIdentifier = (String) obj;
command.append(qualifiedIdentifier);
return command.toString();
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
Thu Aug 16 09:15:10 2018
@@ -23,8 +23,6 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.TorqueException;
import org.apache.torque.sql.Query;
@@ -42,9 +40,6 @@ public class MssqlAdapter extends Abstra
*/
private static final long serialVersionUID = -2924485528975497044L;
- /** The class logger. */
- private static final Log log = LogFactory.getLog(MssqlAdapter.class);
-
/**
* Empty constructor.
*/
@@ -62,7 +57,7 @@ public class MssqlAdapter extends Abstra
@Override
public String toUpperCase(String in)
{
- return new StringBuffer("UPPER(").append(in).append(")").toString();
+ return new StringBuilder("UPPER(").append(in).append(")").toString();
}
/**
@@ -74,7 +69,7 @@ public class MssqlAdapter extends Abstra
@Override
public String ignoreCase(String in)
{
- return new StringBuffer("UPPER(").append(in).append(")").toString();
+ return new StringBuilder("UPPER(").append(in).append(")").toString();
}
/**
@@ -121,26 +116,10 @@ public class MssqlAdapter extends Abstra
@Override
public void lockTable(Connection con, String table) throws SQLException
{
- Statement statement = null;
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
statement.execute("SELECT * FROM " + table + " WITH (TABLOCKX)");
}
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (Exception e)
- {
- log.warn("Could not close lock statement", e);
- }
- }
- }
}
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
Thu Aug 16 09:15:10 2018
@@ -23,8 +23,6 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.sql.Query;
/**
@@ -49,9 +47,6 @@ public class MysqlAdapter extends Abstra
*/
private static final long serialVersionUID = 7547291410802807010L;
- /** The class log. */
- private static Log log = LogFactory.getLog(DerbyAdapter.class);
-
/**
* Empty protected constructor.
*/
@@ -117,29 +112,11 @@ public class MysqlAdapter extends Abstra
@Override
public void lockTable(Connection con, String table) throws SQLException
{
- Statement statement = null;
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
- StringBuffer stmt = new StringBuffer();
+ StringBuilder stmt = new StringBuilder();
stmt.append("LOCK TABLE ").append(table).append(" WRITE");
statement.executeUpdate(stmt.toString());
- statement.close();
- statement = null;
- }
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- log.warn("Could not close statement", e);
- }
- }
}
}
@@ -154,27 +131,9 @@ public class MysqlAdapter extends Abstra
@Override
public void unlockTable(Connection con, String table) throws SQLException
{
- Statement statement = null;
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
statement.executeUpdate("UNLOCK TABLES");
- statement.close();
- statement = null;
- }
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- log.warn("Could not close statement", e);
- }
- }
}
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
Thu Aug 16 09:15:10 2018
@@ -26,8 +26,6 @@ import java.util.HashSet;
import java.util.ListIterator;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.sql.Query;
import org.apache.torque.util.UniqueList;
@@ -47,9 +45,6 @@ public class OracleAdapter extends Abstr
*/
private static final long serialVersionUID = 8966976210230241194L;
- /** The class logger. */
- private static final Log log = LogFactory.getLog(OracleAdapter.class);
-
/**
* Empty constructor.
*/
@@ -67,7 +62,7 @@ public class OracleAdapter extends Abstr
@Override
public String toUpperCase(final String in)
{
- return new StringBuffer("UPPER(").append(in).append(")").toString();
+ return new StringBuilder("UPPER(").append(in).append(")").toString();
}
/**
@@ -79,7 +74,7 @@ public class OracleAdapter extends Abstr
@Override
public String ignoreCase(final String in)
{
- return new StringBuffer("UPPER(").append(in).append(")").toString();
+ return new StringBuilder("UPPER(").append(in).append(")").toString();
}
/**
@@ -120,26 +115,10 @@ public class OracleAdapter extends Abstr
@Override
public void lockTable(final Connection con, final String table) throws
SQLException
{
- Statement statement = null;
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
statement.execute("SELECT * FROM " + table + " FOR UPDATE");
}
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (Exception e)
- {
- log.warn("Colud not close lock statement", e);
- }
- }
- }
}
/**
@@ -197,11 +176,11 @@ public class OracleAdapter extends Abstr
@Override
public void generateLimits(final Query query, final long offset, final int
limit)
{
- StringBuffer preLimit = new StringBuffer()
+ StringBuilder preLimit = new StringBuilder()
.append("SELECT B.* FROM ( ")
.append("SELECT A.*, rownum AS TORQUE$ROWNUM FROM ( ");
- StringBuffer postLimit = new StringBuffer()
+ StringBuilder postLimit = new StringBuilder()
.append(" ) A ")
.append(" ) B WHERE ");
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
Thu Aug 16 09:15:10 2018
@@ -57,7 +57,7 @@ public class PostgresAdapter extends Abs
@Override
public String toUpperCase(String in)
{
- String s = new
StringBuffer("UPPER(").append(in).append(")").toString();
+ String s = new
StringBuilder("UPPER(").append(in).append(")").toString();
return s;
}
@@ -70,7 +70,7 @@ public class PostgresAdapter extends Abs
@Override
public String ignoreCase(String in)
{
- String s = new
StringBuffer("UPPER(").append(in).append(")").toString();
+ String s = new
StringBuilder("UPPER(").append(in).append(")").toString();
return s;
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
Thu Aug 16 09:15:10 2018
@@ -109,7 +109,7 @@ public class TorqueComponent
+ configurationFile);
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(appRoot);
sb.append(File.separator);
sb.append(configurationFile);
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java
Thu Aug 16 09:15:10 2018
@@ -207,7 +207,7 @@ public class FromElement implements Seri
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
if (joinType != null)
{
result.append(joinType);
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
Thu Aug 16 09:15:10 2018
@@ -342,7 +342,7 @@ public class DatabaseMap extends OptionS
*/
protected String javanameMethod(String schemaName)
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
StringTokenizer tok = new StringTokenizer
(schemaName, String.valueOf(STD_SEPARATOR_CHAR));
while (tok.hasMoreTokens())
@@ -354,7 +354,7 @@ public class DatabaseMap extends OptionS
// remove the SCHEMA_SEPARATOR_CHARs and capitalize
// the tokens
schemaName = result.toString();
- result = new StringBuffer();
+ result = new StringBuilder();
tok = new StringTokenizer
(schemaName, String.valueOf(SCHEMA_SEPARATOR_CHAR));
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
Thu Aug 16 09:15:10 2018
@@ -475,7 +475,7 @@ public class TableMap extends OptionSupp
public final String removeUnderScores(String data)
{
String tmp = null;
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
if (hasPrefix(data))
{
tmp = removePrefix(data);
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java
Thu Aug 16 09:15:10 2018
@@ -659,7 +659,7 @@ public class IDBroker implements Runnabl
BigDecimal bdNewQuantity = BigDecimal.valueOf(newQuantity);
BigDecimal maxQuantity = configuration.getBigDecimal(
DB_IDBROKER_CLEVERQUANTITY_MAX,
- CLEVERQUANTITY_MAX_DEFAULT);
+ CLEVERQUANTITY_MAX_DEFAULT);
if (maxQuantity != null &&
bdNewQuantity.compareTo(maxQuantity) > 0)
{
if (quantity.compareTo(maxQuantity) > 0)
@@ -867,7 +867,7 @@ public class IDBroker implements Runnabl
private BigDecimal[] selectRow(Connection con, String tableName)
throws TorqueException
{
- StringBuffer stmt = new StringBuffer();
+ StringBuilder stmt = new StringBuilder();
stmt.append("SELECT ")
.append(COL_NEXT_ID)
.append(", ")
@@ -878,65 +878,33 @@ public class IDBroker implements Runnabl
.append(COL_TABLE_NAME)
.append(" = ?");
- PreparedStatement statement = null;
- ResultSet rs = null;
-
BigDecimal[] results = new BigDecimal[2];
- try
+ try (PreparedStatement statement =
con.prepareStatement(stmt.toString()))
{
- statement = con.prepareStatement(stmt.toString());
statement.setString(1, tableName);
- rs = statement.executeQuery();
- if (rs.next())
- {
- // work around for MySQL which appears to support
- // getBigDecimal in the source code, but the binary
- // is throwing an NotImplemented exception.
- results[0] = new BigDecimal(rs.getString(1)); // next_id
- results[1] = new BigDecimal(rs.getString(2)); // quantity
- }
- else
- {
- throw new TorqueException("The table " + tableName
- + " does not have a proper entry in the " + ID_TABLE);
- }
- rs.close();
- rs = null;
- statement.close();
- statement = null;
-
- }
- catch (SQLException e)
- {
- throw new TorqueException(e);
- }
- finally
- {
- if (rs != null)
+ try (ResultSet rs = statement.executeQuery())
{
- try
+ if (rs.next())
{
- rs.close();
+ // work around for MySQL which appears to support
+ // getBigDecimal in the source code, but the binary
+ // is throwing an NotImplemented exception.
+ results[0] = new BigDecimal(rs.getString(1)); // next_id
+ results[1] = new BigDecimal(rs.getString(2)); // quantity
}
- catch (SQLException e)
+ else
{
- log.warn("Could not close result set", e);
- }
- }
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- log.warn("Could not close statement", e);
+ throw new TorqueException("The table " + tableName
+ + " does not have a proper entry in the " +
ID_TABLE);
}
}
}
+ catch (SQLException e)
+ {
+ throw new TorqueException(e);
+ }
return results;
}
@@ -967,36 +935,19 @@ public class IDBroker implements Runnabl
.append(tableName)
.append('\'');
- Statement statement = null;
-
if (log.isDebugEnabled())
{
log.debug("updateNextId: " + stmt.toString());
}
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
statement.executeUpdate(stmt.toString());
}
catch (SQLException e)
{
throw new TorqueException(e);
}
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- throw new TorqueException(e);
- }
- }
- }
}
/**
@@ -1027,16 +978,13 @@ public class IDBroker implements Runnabl
.append(tableName)
.append('\'');
- Statement statement = null;
-
if (log.isDebugEnabled())
{
log.debug("updateQuantity(): " + stmt.toString());
}
- try
+ try (Statement statement = con.createStatement())
{
- statement = con.createStatement();
statement.executeUpdate(stmt.toString());
log.debug("updateQuantity(): quantity written, end");
}
@@ -1044,20 +992,6 @@ public class IDBroker implements Runnabl
{
throw new TorqueException(e);
}
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- throw new TorqueException(e);
- }
- }
- }
}
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java
Thu Aug 16 09:15:10 2018
@@ -272,10 +272,10 @@ public class ComboKey extends ObjectKey
/**
*
- * @param sb the StringBuffer to append
+ * @param sb the StringBuilder to append
* @see #toString()
*/
- public void appendTo(StringBuffer sb)
+ public void appendTo(StringBuilder sb)
{
if (key != null)
{
@@ -344,7 +344,7 @@ public class ComboKey extends ObjectKey
*/
public String toString()
{
- StringBuffer sbuf = new StringBuffer();
+ StringBuilder sbuf = new StringBuilder();
appendTo(sbuf);
return sbuf.toString();
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java
Thu Aug 16 09:15:10 2018
@@ -121,9 +121,9 @@ public abstract class ObjectKey implemen
/**
* Appends a String representation of the key to a buffer.
*
- * @param sb a <code>StringBuffer</code>
+ * @param sb a <code>StringBuilder</code>
*/
- public void appendTo(StringBuffer sb)
+ public void appendTo(StringBuilder sb)
{
sb.append(this.toString());
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
Thu Aug 16 09:15:10 2018
@@ -706,7 +706,7 @@ public final class SqlBuilder
// table and return.
if (StringUtils.isNotEmpty(targetSchema))
{
- return new StringBuffer()
+ return new StringBuilder()
.append(targetSchema)
.append(".")
.append(table)
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/LikeBuilder.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/LikeBuilder.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/LikeBuilder.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/LikeBuilder.java
Thu Aug 16 09:15:10 2018
@@ -81,7 +81,7 @@ public class LikeBuilder extends Abstrac
// and checks whether we switch to equals,
// the second removes escapes if we have switched to equals.
int position = 0;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean replaceWithEquals = true;
while (position < value.length())
{
@@ -184,7 +184,7 @@ public class LikeBuilder extends Abstrac
// remove escape backslashes from String
position = 0;
- sb = new StringBuffer();
+ sb = new StringBuilder();
while (position < value.length())
{
char checkWildcard = value.charAt(position);
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
Thu Aug 16 09:15:10 2018
@@ -280,10 +280,8 @@ public class BasePeerImpl<T> implements
}
String sql = query.toString();
- PreparedStatement preparedStatement = null;
- try
+ try (PreparedStatement preparedStatement =
connection.prepareStatement(sql))
{
- preparedStatement = connection.prepareStatement(sql);
List<Object> replacements = setPreparedStatementReplacements(
preparedStatement,
query.getPreparedStatementReplacements(),
@@ -298,28 +296,12 @@ public class BasePeerImpl<T> implements
log.trace("delete took " + (queryEndTime - startTime)
+ " milliseconds");
- preparedStatement.close();
- preparedStatement = null;
return affectedRows;
}
catch (SQLException e)
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- finally
- {
- if (preparedStatement != null)
- {
- try
- {
- preparedStatement.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing prepared statement", e);
- }
- }
- }
}
/**
@@ -478,10 +460,8 @@ public class BasePeerImpl<T> implements
}
query.append(")");
- PreparedStatement preparedStatement = null;
- try
+ try (PreparedStatement preparedStatement =
connection.prepareStatement(query.toString()))
{
- preparedStatement = connection.prepareStatement(query.toString());
int position = 1;
for (JdbcTypedValue replacementObject : replacementObjects)
{
@@ -519,28 +499,11 @@ public class BasePeerImpl<T> implements
long queryEndTime = System.currentTimeMillis();
log.trace("insert took " + (queryEndTime - startTime)
+ " milliseconds");
-
- preparedStatement.close();
- preparedStatement = null;
}
catch (SQLException e)
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- finally
- {
- if (preparedStatement != null)
- {
- try
- {
- preparedStatement.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing prepared statement", e);
- }
- }
- }
// If the primary key column is auto-incremented, get the id
// now.
@@ -742,10 +705,8 @@ public class BasePeerImpl<T> implements
.append(selectQuery);
int numberOfInsertedRows = 0;
- PreparedStatement preparedStatement = null;
- try
+ try (PreparedStatement preparedStatement =
connection.prepareStatement(query.toString()))
{
- preparedStatement = connection.prepareStatement(query.toString());
List<Object> replacements = setPreparedStatementReplacements(
preparedStatement,
selectQuery.getPreparedStatementReplacements(),
@@ -758,28 +719,12 @@ public class BasePeerImpl<T> implements
long queryEndTime = System.currentTimeMillis();
log.trace("insert took " + (queryEndTime - startTime)
+ " milliseconds");
-
- preparedStatement.close();
- preparedStatement = null;
}
catch (SQLException e)
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- finally
- {
- if (preparedStatement != null)
- {
- try
- {
- preparedStatement.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing prepared statement", e);
- }
- }
- }
+
return numberOfInsertedRows;
}
@@ -1121,57 +1066,32 @@ public class BasePeerImpl<T> implements
}
List<TT> result = new ArrayList<TT>();
- Statement statement = null;
- ResultSet resultSet = null;
- try
+ try (Statement statement = connection.createStatement())
{
- statement = connection.createStatement();
long startTime = System.currentTimeMillis();
log.debug("Executing query " + query);
- resultSet = statement.executeQuery(query.toString());
- long queryEndTime = System.currentTimeMillis();
- log.trace("query took " + (queryEndTime - startTime)
- + " milliseconds");
-
- while (resultSet.next())
+ try (ResultSet resultSet =
statement.executeQuery(query.toString()))
{
- TT rowResult = mapper.processRow(resultSet, 0, null);
- result.add(rowResult);
+ long queryEndTime = System.currentTimeMillis();
+ log.trace("query took " + (queryEndTime - startTime)
+ + " milliseconds");
+
+ while (resultSet.next())
+ {
+ TT rowResult = mapper.processRow(resultSet, 0, null);
+ result.add(rowResult);
+ }
+ long mappingEndTime = System.currentTimeMillis();
+ log.trace("mapping took " + (mappingEndTime - queryEndTime)
+ + " milliseconds");
}
- long mappingEndTime = System.currentTimeMillis();
- log.trace("mapping took " + (mappingEndTime - queryEndTime)
- + " milliseconds");
}
catch (SQLException e)
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- finally
- {
- if (resultSet != null)
- {
- try
- {
- resultSet.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing resultSet", e);
- }
- }
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing statement", e);
- }
- }
- }
+
return result;
}
@@ -1205,11 +1125,8 @@ public class BasePeerImpl<T> implements
query.getFromClause().add(new FromElement(tableName));
}
- PreparedStatement statement = null;
- ResultSet resultSet = null;
- try
+ try (PreparedStatement statement =
connection.prepareStatement(query.toString()))
{
- statement = connection.prepareStatement(query.toString());
if (query.getFetchSize() != null)
{
statement.setFetchSize(query.getFetchSize());
@@ -1225,106 +1142,84 @@ public class BasePeerImpl<T> implements
+ ", parameters = "
+ replacements);
- resultSet = statement.executeQuery();
- long queryEndTime = System.currentTimeMillis();
- log.trace("query took " + (queryEndTime - startTime)
- + " milliseconds");
-
- long offset;
- Database database = Torque.getDatabase(criteria.getDbName());
- if (database.getAdapter().supportsNativeOffset())
- {
- offset = 0; //database takes care of offset
- }
- else
+ try (ResultSet resultSet = statement.executeQuery())
{
- offset = criteria.getOffset();
- }
+ long queryEndTime = System.currentTimeMillis();
+ log.trace("query took " + (queryEndTime - startTime)
+ + " milliseconds");
- long limit;
- if (database.getAdapter().supportsNativeLimit())
- {
- limit = -1; //database takes care of offset
- }
- else
- {
+ long offset;
+ Database database = Torque.getDatabase(criteria.getDbName());
if (database.getAdapter().supportsNativeOffset())
{
- limit = criteria.getLimit();
+ offset = 0; //database takes care of offset
+ }
+ else
+ {
+ offset = criteria.getOffset();
+ }
+
+ long limit;
+ if (database.getAdapter().supportsNativeLimit())
+ {
+ limit = -1; //database takes care of offset
}
else
{
- if (criteria.getLimit() == -1)
+ if (database.getAdapter().supportsNativeOffset())
{
limit = criteria.getLimit();
}
else
{
- limit = offset + criteria.getLimit();
+ if (criteria.getLimit() == -1)
+ {
+ limit = criteria.getLimit();
+ }
+ else
+ {
+ limit = offset + criteria.getLimit();
+ }
}
}
- }
- List<TT> result = new ArrayList<TT>();
- int rowNumber = 0;
- while (resultSet.next())
- {
- if (rowNumber < offset)
+ List<TT> result = new ArrayList<TT>();
+ int rowNumber = 0;
+ while (resultSet.next())
{
+ if (rowNumber < offset)
+ {
+ rowNumber++;
+ continue;
+ }
+ if (limit >= 0 && rowNumber >= limit)
+ {
+ break;
+ }
+
+ TT rowResult = mapper.processRow(resultSet, 0, criteria);
+ result.add(rowResult);
+
rowNumber++;
- continue;
}
- if (limit >= 0 && rowNumber >= limit)
+ long mappingEndTime = System.currentTimeMillis();
+ log.trace("mapping took " + (mappingEndTime - queryEndTime)
+ + " milliseconds");
+
+ if (criteria.isSingleRecord() && result.size() > 1)
{
- break;
+ throw new TooManyRowsException(
+ "Criteria expected single Record and "
+ + "Multiple Records were selected");
}
- TT rowResult = mapper.processRow(resultSet, 0, criteria);
- result.add(rowResult);
-
- rowNumber++;
- }
- long mappingEndTime = System.currentTimeMillis();
- log.trace("mapping took " + (mappingEndTime - queryEndTime)
- + " milliseconds");
-
- if (criteria.isSingleRecord() && result.size() > 1)
- {
- throw new TooManyRowsException(
- "Criteria expected single Record and "
- + "Multiple Records were selected");
+ return result;
}
- return result;
}
catch (SQLException e)
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- finally
- {
- if (resultSet != null)
- {
- try
- {
- resultSet.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing resultSet", e);
- }
- }
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing statement", e);
- }
- }
- }
}
/**
@@ -1558,10 +1453,8 @@ public class BasePeerImpl<T> implements
query.getUpdateValues().putAll(updateValues);
- PreparedStatement preparedStatement = null;
- try
+ try (PreparedStatement preparedStatement =
connection.prepareStatement(query.toString()))
{
- preparedStatement = connection.prepareStatement(query.toString());
int position = 1;
List<JdbcTypedValue> replacementObjects
= new ArrayList<JdbcTypedValue>();
@@ -1604,28 +1497,12 @@ public class BasePeerImpl<T> implements
log.trace("update took " + (queryEndTime - startTime)
+ " milliseconds");
- preparedStatement.close();
- preparedStatement = null;
return affectedRows;
}
catch (SQLException e)
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- finally
- {
- if (preparedStatement != null)
- {
- try
- {
- preparedStatement.close();
- }
- catch (SQLException e)
- {
- log.warn("error closing prepared statement", e);
- }
- }
- }
}
/**
@@ -1738,10 +1615,8 @@ public class BasePeerImpl<T> implements
throws TorqueException
{
int rowCount = -1;
- PreparedStatement statement = null;
- try
+ try (PreparedStatement statement =
con.prepareStatement(statementString))
{
- statement = con.prepareStatement(statementString);
if (replacementValues != null)
{
int position = 1;
@@ -1769,20 +1644,7 @@ public class BasePeerImpl<T> implements
{
throw new TorqueException(e);
}
- finally
- {
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- throw new TorqueException(e);
- }
- }
- }
+
return rowCount;
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
Thu Aug 16 09:15:10 2018
@@ -870,7 +870,7 @@ public class LargeSelect<T> implements R
*/
public String getPageProgressText()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getCurrentPageNumber());
result.append(" of ");
if (!totalsFinalized)
@@ -942,7 +942,7 @@ public class LargeSelect<T> implements R
*/
public String getRecordProgressText() throws TorqueException
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getFirstRecordNoForPage());
result.append(" - ");
result.append(getLastRecordNoForPage());
@@ -1121,7 +1121,7 @@ public class LargeSelect<T> implements R
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("LargeSelect - TotalRecords: ");
result.append(getTotalRecords());
result.append(" TotalsFinalised: ");
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java?rev=1838165&r1=1838164&r2=1838165&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
Thu Aug 16 09:15:10 2018
@@ -197,7 +197,7 @@ public class ComboKeyTest extends TestCa
*/
public void testAppendTo()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
c1a.appendTo(sb);
Assert.assertEquals("Skey1:Skey2:", sb.toString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
