You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2018/08/27 09:48:39 UTC
svn commit: r1839288 [12/20] - in /db/torque/torque4/trunk:
torque-ant-tasks/src/main/java/org/apache/torque/ant/task/
torque-generator/src/main/java/org/apache/torque/generator/configuration/
torque-generator/src/main/java/org/apache/torque/generator/...
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -207,9 +207,9 @@ public class BasePeerImpl<T> implements
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
*/
- public int doDelete(final Criteria criteria)
- throws TorqueException
- {
+ public int doDelete(final Criteria criteria)
+ throws TorqueException
+ {
setDbName(criteria);
try (TorqueConnection connection = Transaction.begin(criteria.getDbName()))
{
@@ -217,12 +217,12 @@ public class BasePeerImpl<T> implements
Transaction.commit(connection);
return deletedRows;
}
- }
+ }
/**
* Deletes rows from a table. This method is to be used
* during a transaction, otherwise use the doDelete(Criteria) method.
- *
+ *
* @param criteria defines the rows to be deleted, not null.
* @param connection the connection to use, not null.
*
@@ -231,11 +231,11 @@ public class BasePeerImpl<T> implements
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
*/
- public int doDelete(
- final Criteria criteria,
- final Connection connection)
- throws TorqueException
- {
+ public int doDelete(
+ final Criteria criteria,
+ final Connection connection)
+ throws TorqueException
+ {
correctBooleans(criteria);
setDbName(criteria);
@@ -292,7 +292,7 @@ public class BasePeerImpl<T> implements
{
throw ExceptionMapper.getInstance().toTorqueException(e);
}
- }
+ }
/**
* Inserts a record into a database table.
@@ -316,7 +316,7 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if a database error occurs.
*/
public ObjectKey doInsert(final ColumnValues insertValues)
- throws TorqueException
+ throws TorqueException
{
String databaseNameFromInsertValues = insertValues.getDbName();
if (databaseNameFromInsertValues == null)
@@ -354,9 +354,9 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if a database error occurs.
*/
public ObjectKey doInsert(
- final ColumnValues insertValues,
- final Connection connection)
- throws TorqueException
+ final ColumnValues insertValues,
+ final Connection connection)
+ throws TorqueException
{
if (insertValues == null)
{
@@ -398,21 +398,21 @@ public class BasePeerImpl<T> implements
}
}
- List<String> columnNames = new ArrayList<String>();
+ List<String> columnNames = new ArrayList<>();
insertValues.keySet().forEach((column) -> columnNames.add(column.getColumnName()));
String fullTableName = SqlBuilder.getFullTableName(
getTableMap().getFullyQualifiedTableName(),
databaseNameFromInsertValues);
StringBuilder query = new StringBuilder("INSERT INTO ")
- .append(fullTableName)
- .append("(")
- .append(StringUtils.join(columnNames, ","))
- .append(") VALUES (");
+ .append(fullTableName)
+ .append("(")
+ .append(StringUtils.join(columnNames, ","))
+ .append(") VALUES (");
boolean first = true;
List<JdbcTypedValue> replacementObjects
- = new ArrayList<JdbcTypedValue>();
+ = new ArrayList<>();
for (Map.Entry<Column, JdbcTypedValue> columnValue
: insertValues.entrySet())
{
@@ -428,7 +428,7 @@ public class BasePeerImpl<T> implements
else
{
Column sqlExpression
- = columnValue.getValue().getSqlExpression();
+ = columnValue.getValue().getSqlExpression();
query.append(sqlExpression.getSqlExpression());
}
first = false;
@@ -468,7 +468,7 @@ public class BasePeerImpl<T> implements
}
long startTime = System.currentTimeMillis();
log.debug("Executing insert " + query.toString()
- + " using parameters " + replacementObjects);
+ + " using parameters " + replacementObjects);
preparedStatement.executeUpdate();
long queryEndTime = System.currentTimeMillis();
@@ -505,9 +505,9 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if a database error occurs.
*/
public int doInsert(
- final Column[] toInsertInto,
- final Criteria criteria)
- throws TorqueException
+ final Column[] toInsertInto,
+ final Criteria criteria)
+ throws TorqueException
{
return doInsert(toInsertInto, criteria, (String) null);
}
@@ -526,10 +526,10 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if a database error occurs.
*/
public int doInsert(
- final Column[] toInsertInto,
- final Criteria criteria,
- final String dbName)
- throws TorqueException
+ final Column[] toInsertInto,
+ final Criteria criteria,
+ final String dbName)
+ throws TorqueException
{
String dbNameToUse = dbName;
if (dbNameToUse == null)
@@ -539,7 +539,7 @@ public class BasePeerImpl<T> implements
try (TorqueConnection connection = Transaction.begin(dbNameToUse))
{
int numberOfInsertedRows
- = doInsert(toInsertInto, criteria, dbNameToUse, connection);
+ = doInsert(toInsertInto, criteria, dbNameToUse, connection);
Transaction.commit(connection);
return numberOfInsertedRows;
}
@@ -558,10 +558,10 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if a database error occurs.
*/
public int doInsert(
- final Column[] toInsertInto,
- final Criteria criteria,
- final Connection connection)
- throws TorqueException
+ final Column[] toInsertInto,
+ final Criteria criteria,
+ final Connection connection)
+ throws TorqueException
{
return doInsert(toInsertInto, criteria, null, connection);
}
@@ -582,11 +582,11 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if a database error occurs.
*/
public int doInsert(
- final Column[] toInsertInto,
- final Criteria criteria,
- String dbName,
- final Connection connection)
- throws TorqueException
+ final Column[] toInsertInto,
+ final Criteria criteria,
+ String dbName,
+ final Connection connection)
+ throws TorqueException
{
if (dbName == null)
{
@@ -596,7 +596,7 @@ public class BasePeerImpl<T> implements
ColumnMap pk = getTableMap().getPrimaryKey();
boolean pkExistsInColumnMap = false;
- List<String> columnNames = new ArrayList<String>();
+ List<String> columnNames = new ArrayList<>();
for (Column column : toInsertInto)
{
columnNames.add(column.getColumnName());
@@ -619,14 +619,14 @@ public class BasePeerImpl<T> implements
}
else if (idMethod == IDMethod.SEQUENCE
|| (idMethod == IDMethod.NATIVE
- && adapter.getIDMethodType() == IDMethod.SEQUENCE))
+ && adapter.getIDMethodType() == IDMethod.SEQUENCE))
{
IdGenerator keyGen = Torque.getDatabase(dbName).getIdGenerator(
getTableMap().getPrimaryKeyMethod());
if (keyGen instanceof SequenceIdGenerator)
{
SequenceIdGenerator sequenceIdGenerator
- = (SequenceIdGenerator) keyGen;
+ = (SequenceIdGenerator) keyGen;
String idSql = sequenceIdGenerator.getIdSql(
getIdMethodInfo());
// This is a bit of a hack.
@@ -663,11 +663,11 @@ public class BasePeerImpl<T> implements
dbName);
Query selectQuery = SqlBuilder.buildQuery(criteria);
StringBuilder query = new StringBuilder("INSERT INTO ")
- .append(fullTableName)
- .append("(")
- .append(StringUtils.join(columnNames, ","))
- .append(") ")
- .append(selectQuery);
+ .append(fullTableName)
+ .append("(")
+ .append(StringUtils.join(columnNames, ","))
+ .append(") ")
+ .append(selectQuery);
int numberOfInsertedRows = 0;
try (PreparedStatement preparedStatement = connection.prepareStatement(query.toString()))
@@ -678,7 +678,7 @@ public class BasePeerImpl<T> implements
0);
long startTime = System.currentTimeMillis();
log.debug("Executing insert " + query.toString()
- + " using parameters " + replacements);
+ + " using parameters " + replacements);
numberOfInsertedRows = preparedStatement.executeUpdate();
long queryEndTime = System.currentTimeMillis();
@@ -710,10 +710,10 @@ public class BasePeerImpl<T> implements
Adapter adapter = Torque.getAdapter(getDatabaseName());
if (adapter == null)
{
- throw new TorqueException(
- "missing adapter configuration for database "
- + getDatabaseName()
- + "check the Torque configuration");
+ throw new TorqueException(
+ "missing adapter configuration for database "
+ + getDatabaseName()
+ + "check the Torque configuration");
}
idMethod = adapter.getIDMethodType();
}
@@ -733,11 +733,11 @@ public class BasePeerImpl<T> implements
* @throws TorqueException Possible errors get wrapped in here.
*/
private SimpleKey getId(
- final ColumnMap pk,
- final IdGenerator keyGen,
- final Connection con,
- final Object keyInfo)
- throws TorqueException
+ final ColumnMap pk,
+ final IdGenerator keyGen,
+ final Connection con,
+ final Object keyInfo)
+ throws TorqueException
{
SimpleKey id = null;
@@ -793,8 +793,8 @@ public class BasePeerImpl<T> implements
setDbName(criteria);
return doSelect(
- criteria,
- getRecordMapper());
+ criteria,
+ getRecordMapper());
}
/**
@@ -810,9 +810,9 @@ public class BasePeerImpl<T> implements
* rethrown wrapped into a TorqueException.
*/
public List<T> doSelect(
- final Criteria criteria,
- final Connection connection)
- throws TorqueException
+ final Criteria criteria,
+ final Connection connection)
+ throws TorqueException
{
if (criteria.getSelectColumns().size() == 0)
{
@@ -844,7 +844,7 @@ public class BasePeerImpl<T> implements
if (recordList.size() > 1)
{
throw new TooManyRowsException("Criteria " + criteria
- + " matched more than one record");
+ + " matched more than one record");
}
if (!recordList.isEmpty())
{
@@ -866,16 +866,16 @@ public class BasePeerImpl<T> implements
* an error occurs when processing the query.
*/
public T doSelectSingleRecord(
- final Criteria criteria,
- final Connection connection)
- throws TorqueException
+ final Criteria criteria,
+ final Connection connection)
+ throws TorqueException
{
List<T> recordList = doSelect(criteria, connection);
T record = null;
if (recordList.size() > 1)
{
throw new TooManyRowsException("Criteria " + criteria
- + " matched more than one record");
+ + " matched more than one record");
}
if (!recordList.isEmpty())
{
@@ -896,9 +896,9 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if querying the database fails.
*/
public <TT> List<TT> doSelect(
- final Criteria criteria,
- final RecordMapper<TT> mapper)
- throws TorqueException
+ final Criteria criteria,
+ final RecordMapper<TT> mapper)
+ throws TorqueException
{
try (TorqueConnection connection = Transaction.begin(criteria.getDbName()))
{
@@ -941,9 +941,9 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if querying the database fails.
*/
public List<T> doSelect(
- final String query,
- final Connection connection)
- throws TorqueException
+ final String query,
+ final Connection connection)
+ throws TorqueException
{
return doSelect(
query,
@@ -965,15 +965,15 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if querying the database fails.
*/
public <TT> List<TT> doSelect(
- final String query,
- final RecordMapper<TT> mapper,
- final String dbName)
- throws TorqueException
+ final String query,
+ final RecordMapper<TT> mapper,
+ final String dbName)
+ throws TorqueException
{
try (TorqueConnection connection = Transaction.begin(
(dbName == null)
? Torque.getDefaultDB()
- : dbName))
+ : dbName))
{
List<TT> result = doSelect(
query,
@@ -998,17 +998,17 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if querying the database fails.
*/
public <TT> List<TT> doSelect(
- final String query,
- final RecordMapper<TT> mapper,
- final Connection connection)
- throws TorqueException
+ final String query,
+ final RecordMapper<TT> mapper,
+ final Connection connection)
+ throws TorqueException
{
if (connection == null)
{
throw new NullPointerException("connection is null");
}
- List<TT> result = new ArrayList<TT>();
+ List<TT> result = new ArrayList<>();
try (Statement statement = connection.createStatement())
{
long startTime = System.currentTimeMillis();
@@ -1052,10 +1052,10 @@ public class BasePeerImpl<T> implements
* @throws TorqueException Error performing database query.
*/
public <TT> List<TT> doSelect(
- final Criteria criteria,
- final RecordMapper<TT> mapper,
- final Connection connection)
- throws TorqueException
+ final Criteria criteria,
+ final RecordMapper<TT> mapper,
+ final Connection connection)
+ throws TorqueException
{
correctBooleans(criteria);
@@ -1127,7 +1127,7 @@ public class BasePeerImpl<T> implements
log.trace("query took " + (queryEndTime - startTime)
+ " milliseconds");
- List<TT> result = new ArrayList<TT>();
+ List<TT> result = new ArrayList<>();
int rowNumber = 0;
while (resultSet.next())
{
@@ -1154,7 +1154,7 @@ public class BasePeerImpl<T> implements
{
throw new TooManyRowsException(
"Criteria expected single Record and "
- + "Multiple Records were selected");
+ + "Multiple Records were selected");
}
return result;
@@ -1178,16 +1178,16 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if querying the database fails.
*/
public <TT> TT doSelectSingleRecord(
- final Criteria criteria,
- final RecordMapper<TT> mapper)
- throws TorqueException
+ final Criteria criteria,
+ final RecordMapper<TT> mapper)
+ throws TorqueException
{
List<TT> resultList = doSelect(criteria, mapper);
TT result = null;
if (resultList.size() > 1)
{
throw new TooManyRowsException("Criteria " + criteria
- + " matched more than one record");
+ + " matched more than one record");
}
if (!resultList.isEmpty())
{
@@ -1209,10 +1209,10 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if querying the database fails.
*/
public <TT> TT doSelectSingleRecord(
- final Criteria criteria,
- final RecordMapper<TT> mapper,
- final Connection connection)
- throws TorqueException
+ final Criteria criteria,
+ final RecordMapper<TT> mapper,
+ final Connection connection)
+ throws TorqueException
{
List<TT> resultList = doSelect(
criteria,
@@ -1222,7 +1222,7 @@ public class BasePeerImpl<T> implements
if (resultList.size() > 1)
{
throw new TooManyRowsException("Criteria " + criteria
- + " matched more than one record");
+ + " matched more than one record");
}
if (!resultList.isEmpty())
{
@@ -1295,9 +1295,9 @@ public class BasePeerImpl<T> implements
* rethrown wrapped into a TorqueException.
*/
public int doUpdate(
- final ColumnValues updateValues,
- final Connection connection)
- throws TorqueException
+ final ColumnValues updateValues,
+ final Connection connection)
+ throws TorqueException
{
ColumnMap pk = getTableMap().getPrimaryKey();
Criteria selectCriteria = null;
@@ -1306,7 +1306,7 @@ public class BasePeerImpl<T> implements
{
selectCriteria = new Criteria();
selectCriteria.where(pk,
- updateValues.remove(pk).getValue());
+ updateValues.remove(pk).getValue());
}
else
{
@@ -1330,9 +1330,9 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if updating fails.
*/
public int doUpdate(
- final Criteria selectCriteria,
- final ColumnValues updateValues)
- throws TorqueException
+ final Criteria selectCriteria,
+ final ColumnValues updateValues)
+ throws TorqueException
{
String databaseNameFromUpdateValues = updateValues.getDbName();
if (databaseNameFromUpdateValues == null)
@@ -1361,10 +1361,10 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if updating fails.
*/
public int doUpdate(
- final Criteria criteria,
- final ColumnValues updateValues,
- final Connection connection)
- throws TorqueException
+ final Criteria criteria,
+ final ColumnValues updateValues,
+ final Connection connection)
+ throws TorqueException
{
Query query = SqlBuilder.buildQuery(criteria);
query.setType(Query.Type.UPDATE);
@@ -1381,7 +1381,7 @@ public class BasePeerImpl<T> implements
{
int position = 1;
List<JdbcTypedValue> replacementObjects
- = new ArrayList<JdbcTypedValue>();
+ = new ArrayList<>();
for (Map.Entry<Column, JdbcTypedValue> updateValue
: updateValues.entrySet())
{
@@ -1412,9 +1412,9 @@ public class BasePeerImpl<T> implements
position - 1);
long startTime = System.currentTimeMillis();
log.debug("Executing update " + query.toString()
- + " using update parameters " + replacementObjects
- + " and query parameters "
- + replacements);
+ + " using update parameters " + replacementObjects
+ + " and query parameters "
+ + replacements);
int affectedRows = preparedStatement.executeUpdate();
long queryEndTime = System.currentTimeMillis();
@@ -1463,9 +1463,9 @@ public class BasePeerImpl<T> implements
* or no database connection can be established.
*/
public int executeStatement(
- final String statementString,
- final List<JdbcTypedValue> replacementValues)
- throws TorqueException
+ final String statementString,
+ final List<JdbcTypedValue> replacementValues)
+ throws TorqueException
{
return executeStatement(
statementString,
@@ -1494,7 +1494,7 @@ public class BasePeerImpl<T> implements
final String statementString,
final String dbName,
final List<JdbcTypedValue> replacementValues)
- throws TorqueException
+ throws TorqueException
{
try (TorqueConnection con = Transaction.begin(dbName))
{
@@ -1526,7 +1526,7 @@ public class BasePeerImpl<T> implements
final String statementString,
final Connection con,
final List<JdbcTypedValue> replacementValues)
- throws TorqueException
+ throws TorqueException
{
int rowCount = -1;
try (PreparedStatement statement = con.prepareStatement(statementString))
@@ -1583,7 +1583,7 @@ public class BasePeerImpl<T> implements
public int executeStatement(
final String statementString,
final Map<String, JdbcTypedValue> replacementValues)
- throws TorqueException
+ throws TorqueException
{
return executeStatement(
statementString,
@@ -1612,23 +1612,23 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if executing the statement fails.
*/
public int executeStatement(
- final String statementString,
- final String dbName,
- final Map<String, JdbcTypedValue> replacementValues)
- throws TorqueException
+ final String statementString,
+ final String dbName,
+ final Map<String, JdbcTypedValue> replacementValues)
+ throws TorqueException
+ {
+ try (TorqueConnection con = Transaction.begin(dbName))
{
- try (TorqueConnection con = Transaction.begin(dbName))
- {
- int rowCount = executeStatement(
- statementString,
- con,
- replacementValues);
- Transaction.commit(con);
- return rowCount;
- }
+ int rowCount = executeStatement(
+ statementString,
+ con,
+ replacementValues);
+ Transaction.commit(con);
+ return rowCount;
}
+ }
- /**
+ /**
* Utility method which executes a given sql statement
* as prepared statement.
* This method should be used for update, insert, and delete statements.
@@ -1648,13 +1648,13 @@ public class BasePeerImpl<T> implements
* @throws TorqueException if executing the statement fails.
*/
public int executeStatement(
- final String statementString,
- final Connection con,
- final Map<String, JdbcTypedValue> replacementValues)
- throws TorqueException
+ final String statementString,
+ final Connection con,
+ final Map<String, JdbcTypedValue> replacementValues)
+ throws TorqueException
{
StringBuilder changedStatement = new StringBuilder();
- List<JdbcTypedValue> replacementValueList = new ArrayList<JdbcTypedValue>();
+ List<JdbcTypedValue> replacementValueList = new ArrayList<>();
Pattern pattern = Pattern.compile(":(\\w+)(?: |$)");
Matcher matcher = pattern.matcher(statementString);
int statementPosition = 0;
@@ -1704,12 +1704,12 @@ public class BasePeerImpl<T> implements
* @throws SQLException if setting the parameter fails.
*/
private List<Object> setPreparedStatementReplacements(
- final PreparedStatement statement,
- final List<Object> replacements,
- final int offset)
- throws SQLException
+ final PreparedStatement statement,
+ final List<Object> replacements,
+ final int offset)
+ throws SQLException
{
- List<Object> result = new ArrayList<Object>(replacements.size());
+ List<Object> result = new ArrayList<>(replacements.size());
int i = 1 + offset;
for (Object param : replacements)
{
@@ -1800,18 +1800,18 @@ public class BasePeerImpl<T> implements
* retrieved.
*/
public void correctBooleans(
- final Criteria criteria)
- throws TorqueException
+ final Criteria criteria)
+ throws TorqueException
{
- correctBooleans(
- criteria,
- criteria.getTopLevelCriterion());
+ correctBooleans(
+ criteria,
+ criteria.getTopLevelCriterion());
}
private void correctBooleans(
- final Criteria criteria,
- final Criterion criterion)
- throws TorqueException
+ final Criteria criteria,
+ final Criterion criterion)
+ throws TorqueException
{
if (criterion == null)
{
@@ -1850,7 +1850,7 @@ public class BasePeerImpl<T> implements
else if ("BOOLEANCHAR".equals(columnMap.getTorqueType()))
{
replaceBooleanValues(criterion, "Y", "N");
- }
+ }
}
}
@@ -1875,7 +1875,7 @@ public class BasePeerImpl<T> implements
Boolean booleanValue = (Boolean) rValue;
criterion.setRValue(
Boolean.TRUE.equals(booleanValue)
- ? trueValue
+ ? trueValue
: falseValue);
}
Object lValue = criterion.getLValue();
@@ -1884,7 +1884,7 @@ public class BasePeerImpl<T> implements
Boolean booleanValue = (Boolean) lValue;
criterion.setLValue(
Boolean.TRUE.equals(booleanValue)
- ? trueValue
+ ? trueValue
: falseValue);
}
}
@@ -1903,7 +1903,7 @@ public class BasePeerImpl<T> implements
*/
public void correctBooleans(
final ColumnValues columnValues)
- throws TorqueException
+ throws TorqueException
{
for (Map.Entry<Column, JdbcTypedValue> entry : columnValues.entrySet())
{
@@ -1941,7 +1941,7 @@ public class BasePeerImpl<T> implements
{
entry.setValue(new JdbcTypedValue(null, Types.CHAR));
}
- }
+ }
}
}
}
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java Mon Aug 27 09:48:33 2018
@@ -36,7 +36,7 @@ public class ColumnValues implements Map
{
/** The column values, keyed by the column names. */
private final Map<Column, JdbcTypedValue> columnValues
- = new LinkedHashMap<Column, JdbcTypedValue>();
+ = new LinkedHashMap<>();
/**
* The name of the database handle to use for connection opening if needed,
@@ -114,61 +114,73 @@ public class ColumnValues implements Map
return dbName;
}
+ @Override
public int size()
{
return columnValues.size();
}
+ @Override
public boolean isEmpty()
{
return columnValues.isEmpty();
}
+ @Override
public boolean containsKey(final Object key)
{
return columnValues.containsKey(key);
}
+ @Override
public boolean containsValue(final Object value)
{
return columnValues.containsValue(value);
}
+ @Override
public JdbcTypedValue get(final Object key)
{
return columnValues.get(key);
}
+ @Override
public JdbcTypedValue put(final Column key, final JdbcTypedValue value)
{
return columnValues.put(key, value);
}
+ @Override
public JdbcTypedValue remove(final Object key)
{
return columnValues.remove(key);
}
+ @Override
public void putAll(final Map<? extends Column, ? extends JdbcTypedValue> t)
{
columnValues.putAll(t);
}
+ @Override
public void clear()
{
columnValues.clear();
}
+ @Override
public Set<Column> keySet()
{
return columnValues.keySet();
}
+ @Override
public Collection<JdbcTypedValue> values()
{
return columnValues.values();
}
+ @Override
public Set<java.util.Map.Entry<Column, JdbcTypedValue>> entrySet()
{
return columnValues.entrySet();
@@ -178,7 +190,7 @@ public class ColumnValues implements Map
public String toString()
{
return "ColumnValues [dbName=" + dbName
- + ", columnValues=" + columnValues + "]";
+ + ", columnValues=" + columnValues + "]";
}
}
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java Mon Aug 27 09:48:33 2018
@@ -92,7 +92,7 @@ public class CountHelper
* @throws TorqueException if the query could not be executed
*/
public int count(final Criteria c, final String columnName)
- throws TorqueException
+ throws TorqueException
{
return count(c, null, columnName, null);
}
@@ -107,7 +107,7 @@ public class CountHelper
* @throws TorqueException if the query could not be executed
*/
public int count(final Criteria c, final Column column)
- throws TorqueException
+ throws TorqueException
{
return count(c, column.getSqlExpression());
}
@@ -126,7 +126,7 @@ public class CountHelper
final Criteria c,
final Connection conn,
final Column column)
- throws TorqueException
+ throws TorqueException
{
return count(c, conn, column.getSqlExpression(), null);
}
@@ -141,7 +141,7 @@ public class CountHelper
* @throws TorqueException if the query could not be executed
*/
public int count(final TableMap tableMap)
- throws TorqueException
+ throws TorqueException
{
return count(
new Criteria(),
@@ -185,11 +185,11 @@ public class CountHelper
* @throws TorqueException if the query could not be executed.
*/
public int count(
- final Criteria c,
- final Connection conn,
- final String columnName,
- final TableMap tableMap)
- throws TorqueException
+ final Criteria c,
+ final Connection conn,
+ final String columnName,
+ final TableMap tableMap)
+ throws TorqueException
{
/* Clear the select columns. */
c.getSelectColumns().clear();
@@ -197,12 +197,12 @@ public class CountHelper
c.getGroupByColumns().clear();
UniqueList<String> criteriaSelectModifiers
- = c.getSelectModifiers();
+ = c.getSelectModifiers();
boolean distinct = false;
if (criteriaSelectModifiers != null
- && criteriaSelectModifiers.size() > 0
- && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
+ && criteriaSelectModifiers.size() > 0
+ && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
{
criteriaSelectModifiers.remove(SqlEnum.DISTINCT.toString());
distinct = true;
@@ -212,16 +212,16 @@ public class CountHelper
String databaseName = (c.getDbName() == null)
? Torque.getDefaultDB()
- : c.getDbName();
+ : c.getDbName();
- BasePeerImpl<Integer> peer = new BasePeerImpl<Integer>(
- new IntegerMapper(),
- tableMap, databaseName);
+ BasePeerImpl<Integer> peer = new BasePeerImpl<>(
+ new IntegerMapper(),
+ tableMap, databaseName);
- List<Integer> result = (conn == null)
- ? peer.doSelect(c)
- : peer.doSelect(c, conn);
+ List<Integer> result = (conn == null)
+ ? peer.doSelect(c)
+ : peer.doSelect(c, conn);
- return result.get(0);
+ return result.get(0);
}
}
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java Mon Aug 27 09:48:33 2018
@@ -134,9 +134,9 @@ public class JdbcTypedValue
public int hashCode()
{
HashCodeBuilder hashCodeBuilder = new HashCodeBuilder()
- .append(jdbcType)
- .append(value)
- .append(sqlExpression);
+ .append(jdbcType)
+ .append(value)
+ .append(sqlExpression);
return hashCodeBuilder.toHashCode();
}
@@ -157,9 +157,9 @@ public class JdbcTypedValue
}
JdbcTypedValue other = (JdbcTypedValue) obj;
EqualsBuilder equalsBuilder = new EqualsBuilder()
- .append(jdbcType, other.jdbcType)
- .append(value, other.value)
- .append(sqlExpression, other.sqlExpression);
+ .append(jdbcType, other.jdbcType)
+ .append(value, other.value)
+ .append(sqlExpression, other.sqlExpression);
return equalsBuilder.isEquals();
}
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -242,10 +242,10 @@ public class LargeSelect<T> implements R
final BasePeerImpl<T> peerImpl)
{
this(
- criteria,
- pageSize,
- LargeSelect.DEFAULT_MEMORY_LIMIT_PAGES,
- peerImpl);
+ criteria,
+ pageSize,
+ LargeSelect.DEFAULT_MEMORY_LIMIT_PAGES,
+ peerImpl);
}
/**
@@ -509,7 +509,7 @@ public class LargeSelect<T> implements R
List<T> returnResults;
- returnResults = new ArrayList<T>(results.subList(fromIndex, toIndex));
+ returnResults = new ArrayList<>(results.subList(fromIndex, toIndex));
position = start + size;
lastResults = returnResults;
@@ -525,7 +525,7 @@ public class LargeSelect<T> implements R
/* The connection to the database. */
try (TorqueConnection conn = Transaction.begin(criteria.getDbName()))
{
- results = new CopyOnWriteArrayList<T>();
+ results = new CopyOnWriteArrayList<>();
criteria.setOffset(blockBegin);
// Add 1 to memory limit to check if the query ends on a
@@ -557,8 +557,8 @@ public class LargeSelect<T> implements R
// of the results have been determined to be irrelevant.
boolean allRecordsRetrieved = false;
while (!killThread
- && !allRecordsRetrieved
- && currentlyFilledTo + pageSize <= blockEnd)
+ && !allRecordsRetrieved
+ && currentlyFilledTo + pageSize <= blockEnd)
{
if (log.isDebugEnabled())
{
@@ -595,7 +595,7 @@ public class LargeSelect<T> implements R
currentlyFilledTo += resultSetSize;
if (results.size() > 0
- && blockBegin + currentlyFilledTo >= totalRecords)
+ && blockBegin + currentlyFilledTo >= totalRecords)
{
// Add 1 because index starts at 0
totalRecords = blockBegin + currentlyFilledTo + 1;
@@ -610,7 +610,7 @@ public class LargeSelect<T> implements R
// not finalized when a user does something like requesting
// a page greater than what exists in the database.
if (perhapsLastPage
- && getCurrentPageNumber() <= getTotalPages())
+ && getCurrentPageNumber() <= getTotalPages())
{
totalsFinalized = true;
}
@@ -1061,7 +1061,7 @@ public class LargeSelect<T> implements R
{
if (null == params)
{
- params = new Hashtable<String, String>();
+ params = new Hashtable<>();
}
params.put(name, value);
}
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java Mon Aug 27 09:48:33 2018
@@ -42,7 +42,7 @@ public class ListOrderedMapCI<T> extends
@Override
public T get(Object key)
{
- return super.get(((String) key).toLowerCase());
+ return super.get(((String) key).toLowerCase());
}
/**
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java Mon Aug 27 09:48:33 2018
@@ -113,8 +113,8 @@ public class SummaryHelper
* @throws TorqueException if a database error occurs.
*/
public List<ListOrderedMapCI<Object>> summarize(
- final Criteria crit)
- throws TorqueException
+ final Criteria crit)
+ throws TorqueException
{
return summarize(crit, (List<Class<?>>) null);
}
@@ -135,9 +135,9 @@ public class SummaryHelper
* @throws TorqueException if a database error occurs.
*/
public List<ListOrderedMapCI<Object>> summarize(
- final Criteria crit,
- final List<Class<?>> resultTypes)
- throws TorqueException
+ final Criteria crit,
+ final List<Class<?>> resultTypes)
+ throws TorqueException
{
try (TorqueConnection connection = Transaction.begin(crit.getDbName()))
{
@@ -162,9 +162,9 @@ public class SummaryHelper
* @throws TorqueException if a database error occurs.
*/
public List<ListOrderedMapCI<Object>> summarize(
- final Criteria crit,
- final Connection conn)
- throws TorqueException
+ final Criteria crit,
+ final Connection conn)
+ throws TorqueException
{
return summarize(crit, null, conn);
}
@@ -186,55 +186,55 @@ public class SummaryHelper
* @throws TorqueException if a database error occurs.
*/
public List<ListOrderedMapCI<Object>> summarize(
- final Criteria crit,
- final List<Class<?>> resultTypes,
- final Connection conn)
- throws TorqueException
+ final Criteria crit,
+ final List<Class<?>> resultTypes,
+ final Connection conn)
+ throws TorqueException
{
Criteria c = buildCriteria(crit);
String databaseName = (c.getDbName() == null)
? Torque.getDefaultDB()
- : c.getDbName();
- c.setDbName(databaseName);
+ : c.getDbName();
+ c.setDbName(databaseName);
- BasePeerImpl<List<Object>> peer = new BasePeerImpl<List<Object>>(
- new ObjectListMapper(resultTypes),
- null, databaseName);
-
- // use extra ObjectListMapper in doSelect to avoid addSelectcolumns()
- // call in peer.doSelect(c, conn)
- List<List<Object>> rows
+ BasePeerImpl<List<Object>> peer = new BasePeerImpl<>(
+ new ObjectListMapper(resultTypes),
+ null, databaseName);
+
+ // use extra ObjectListMapper in doSelect to avoid addSelectcolumns()
+ // call in peer.doSelect(c, conn)
+ List<List<Object>> rows
= peer.doSelect(c, new ObjectListMapper(resultTypes), conn);
- List<ListOrderedMapCI<Object>> resultsList
- = new ArrayList<ListOrderedMapCI<Object>>(rows.size());
- List<String> columnNames = new ArrayList<String>();
- for (Column column : c.getSelectColumns())
- {
- columnNames.add(column.getColumnName());
- }
- columnNames.addAll(c.getAsColumns().keySet());
- for (List<Object> row : rows)
- {
- ListOrderedMapCI<Object> recordMap = new ListOrderedMapCI<Object>();
- for (int i = 0; i < row.size(); i++)
- {
- Object value = row.get(i);
- String cName = columnNames.get(i);
- if (cName == null || cName.equals(""))
- {
- if (excludeExprColumns())
+ List<ListOrderedMapCI<Object>> resultsList
+ = new ArrayList<>(rows.size());
+ List<String> columnNames = new ArrayList<>();
+ for (Column column : c.getSelectColumns())
+ {
+ columnNames.add(column.getColumnName());
+ }
+ columnNames.addAll(c.getAsColumns().keySet());
+ for (List<Object> row : rows)
+ {
+ ListOrderedMapCI<Object> recordMap = new ListOrderedMapCI<>();
+ for (int i = 0; i < row.size(); i++)
{
- continue;
+ Object value = row.get(i);
+ String cName = columnNames.get(i);
+ if (cName == null || cName.equals(""))
+ {
+ if (excludeExprColumns())
+ {
+ continue;
+ }
+ cName = "Expr" + i;
+ }
+ recordMap.put(cName, value);
}
- cName = "Expr" + i;
+ resultsList.add(recordMap);
}
- recordMap.put(cName, value);
- }
- resultsList.add(recordMap);
- }
- return resultsList;
+ return resultsList;
}
/**
@@ -254,8 +254,8 @@ public class SummaryHelper
criteriaSelectModifiers = c.getSelectModifiers();
if (criteriaSelectModifiers != null
- && criteriaSelectModifiers.size() > 0
- && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
+ && criteriaSelectModifiers.size() > 0
+ && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
{
criteriaSelectModifiers.remove(SqlEnum.DISTINCT.toString());
}
@@ -309,7 +309,7 @@ public class SummaryHelper
{
throw new TorqueException(
"No FROM table defined by the GroupBy set, "
- + "criteria.setAlias, or specified function column!");
+ + "criteria.setAlias, or specified function column!");
}
return c;
}
@@ -360,7 +360,7 @@ public class SummaryHelper
{
if (groupByColumns == null)
{
- groupByColumns = new Vector<Column>();
+ groupByColumns = new Vector<>();
}
return groupByColumns;
}
@@ -376,7 +376,7 @@ public class SummaryHelper
{
if (aggregates == null)
{
- aggregates = new ListOrderedMapCI<SQLFunction>();
+ aggregates = new ListOrderedMapCI<>();
}
return aggregates;
}
@@ -392,7 +392,7 @@ public class SummaryHelper
* @throws IOException
*/
public void dumpResults(final Writer out, final List<?> results, final boolean includeHeader)
- throws IOException
+ throws IOException
{
Iterator<?> i = results.iterator();
boolean first = includeHeader;
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java Mon Aug 27 09:48:33 2018
@@ -47,36 +47,36 @@ import org.apache.torque.TorqueException
*/
public class TorqueConnectionImpl implements TorqueConnection
{
- /** Has this transaction already been committed? */
- private boolean committed;
+ /** Has this transaction already been committed? */
+ private boolean committed;
/** Has this transaction already been rolled back? */
private boolean rolledBack;
- /** The wrapped connection instance */
- private Connection connection;
+ /** The wrapped connection instance */
+ private Connection connection;
- /**
+ /**
* Constructor
*
- */
- public TorqueConnectionImpl(Connection con)
- {
- this.committed = false;
+ */
+ public TorqueConnectionImpl(Connection con)
+ {
+ this.committed = false;
this.rolledBack = false;
- this.connection = con;
- }
+ this.connection = con;
+ }
- /**
- * Has commit() been called successfully on this connection?
- * (for testing)
- *
- * @return true, if commit() has been called.
- */
- public boolean isCommitted()
- {
- return committed;
- }
+ /**
+ * Has commit() been called successfully on this connection?
+ * (for testing)
+ *
+ * @return true, if commit() has been called.
+ */
+ public boolean isCommitted()
+ {
+ return committed;
+ }
/**
* Has rollback() been called successfully on this connection?
@@ -89,9 +89,10 @@ public class TorqueConnectionImpl implem
return rolledBack;
}
- /**
+ /**
* @see java.sql.Wrapper#unwrap(java.lang.Class)
*/
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException
{
return connection.unwrap(iface);
@@ -100,6 +101,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
*/
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException
{
return connection.isWrapperFor(iface);
@@ -108,6 +110,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createStatement()
*/
+ @Override
public Statement createStatement() throws SQLException
{
return connection.createStatement();
@@ -116,6 +119,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareStatement(java.lang.String)
*/
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException
{
return connection.prepareStatement(sql);
@@ -124,6 +128,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareCall(java.lang.String)
*/
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException
{
return connection.prepareCall(sql);
@@ -132,6 +137,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#nativeSQL(java.lang.String)
*/
+ @Override
public String nativeSQL(String sql) throws SQLException
{
return connection.nativeSQL(sql);
@@ -140,6 +146,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setAutoCommit(boolean)
*/
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException
{
connection.setAutoCommit(autoCommit);
@@ -148,6 +155,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getAutoCommit()
*/
+ @Override
public boolean getAutoCommit() throws SQLException
{
return connection.getAutoCommit();
@@ -156,6 +164,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#commit()
*/
+ @Override
public void commit() throws SQLException
{
connection.commit();
@@ -165,6 +174,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#rollback()
*/
+ @Override
public void rollback() throws SQLException
{
connection.rollback();
@@ -174,13 +184,14 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#close()
*/
+ @Override
public void close() throws TorqueException
{
try
{
if (this.committed == false &&
- this.rolledBack == false &&
- connection.getAutoCommit() == false)
+ this.rolledBack == false &&
+ connection.getAutoCommit() == false)
{
// calls close on the connection
Transaction.safeRollback(connection);
@@ -201,6 +212,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#isClosed()
*/
+ @Override
public boolean isClosed() throws SQLException
{
return connection.isClosed();
@@ -209,6 +221,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getMetaData()
*/
+ @Override
public DatabaseMetaData getMetaData() throws SQLException
{
return connection.getMetaData();
@@ -217,6 +230,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setReadOnly(boolean)
*/
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException
{
connection.setReadOnly(readOnly);
@@ -225,6 +239,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#isReadOnly()
*/
+ @Override
public boolean isReadOnly() throws SQLException
{
return connection.isReadOnly();
@@ -233,6 +248,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setCatalog(java.lang.String)
*/
+ @Override
public void setCatalog(String catalog) throws SQLException
{
connection.setCatalog(catalog);
@@ -241,6 +257,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getCatalog()
*/
+ @Override
public String getCatalog() throws SQLException
{
return connection.getCatalog();
@@ -249,6 +266,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setTransactionIsolation(int)
*/
+ @Override
public void setTransactionIsolation(int level) throws SQLException
{
connection.setTransactionIsolation(level);
@@ -257,6 +275,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getTransactionIsolation()
*/
+ @Override
public int getTransactionIsolation() throws SQLException
{
return connection.getTransactionIsolation();
@@ -265,6 +284,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getWarnings()
*/
+ @Override
public SQLWarning getWarnings() throws SQLException
{
return connection.getWarnings();
@@ -273,6 +293,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#clearWarnings()
*/
+ @Override
public void clearWarnings() throws SQLException
{
connection.clearWarnings();
@@ -281,6 +302,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createStatement(int, int)
*/
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException
{
return connection.createStatement(resultSetType, resultSetConcurrency);
@@ -289,6 +311,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareStatement(java.lang.String, int, int)
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
throws SQLException
{
@@ -298,6 +321,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareCall(java.lang.String, int, int)
*/
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
{
return connection.prepareCall(sql, resultSetType, resultSetConcurrency);
@@ -306,6 +330,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getTypeMap()
*/
+ @Override
public Map<String, Class<?>> getTypeMap() throws SQLException
{
return connection.getTypeMap();
@@ -314,6 +339,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setTypeMap(java.util.Map)
*/
+ @Override
public void setTypeMap(Map<String, Class<?>> map) throws SQLException
{
connection.setTypeMap(map);
@@ -322,6 +348,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setHoldability(int)
*/
+ @Override
public void setHoldability(int holdability) throws SQLException
{
connection.setHoldability(holdability);
@@ -330,6 +357,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getHoldability()
*/
+ @Override
public int getHoldability() throws SQLException
{
return connection.getHoldability();
@@ -338,6 +366,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setSavepoint()
*/
+ @Override
public Savepoint setSavepoint() throws SQLException
{
return connection.setSavepoint();
@@ -346,6 +375,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setSavepoint(java.lang.String)
*/
+ @Override
public Savepoint setSavepoint(String name) throws SQLException
{
return connection.setSavepoint(name);
@@ -354,6 +384,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#rollback(java.sql.Savepoint)
*/
+ @Override
public void rollback(Savepoint savepoint) throws SQLException
{
connection.rollback(savepoint);
@@ -362,6 +393,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#releaseSavepoint(java.sql.Savepoint)
*/
+ @Override
public void releaseSavepoint(Savepoint savepoint) throws SQLException
{
connection.releaseSavepoint(savepoint);
@@ -370,6 +402,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createStatement(int, int, int)
*/
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
throws SQLException
{
@@ -379,6 +412,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareStatement(java.lang.String, int, int, int)
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
int resultSetHoldability) throws SQLException
{
@@ -388,6 +422,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareCall(java.lang.String, int, int, int)
*/
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
int resultSetHoldability) throws SQLException
{
@@ -397,6 +432,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareStatement(java.lang.String, int)
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException
{
return connection.prepareStatement(sql, autoGeneratedKeys);
@@ -405,6 +441,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareStatement(java.lang.String, int[])
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException
{
return connection.prepareStatement(sql, columnIndexes);
@@ -413,6 +450,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#prepareStatement(java.lang.String, java.lang.String[])
*/
+ @Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException
{
return connection.prepareStatement(sql, columnNames);
@@ -421,6 +459,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createClob()
*/
+ @Override
public Clob createClob() throws SQLException
{
return connection.createClob();
@@ -429,6 +468,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createBlob()
*/
+ @Override
public Blob createBlob() throws SQLException
{
return connection.createBlob();
@@ -437,6 +477,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createNClob()
*/
+ @Override
public NClob createNClob() throws SQLException
{
return connection.createNClob();
@@ -445,6 +486,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createSQLXML()
*/
+ @Override
public SQLXML createSQLXML() throws SQLException
{
return connection.createSQLXML();
@@ -453,6 +495,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#isValid(int)
*/
+ @Override
public boolean isValid(int timeout) throws SQLException
{
return connection.isValid(timeout);
@@ -461,6 +504,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setClientInfo(java.lang.String, java.lang.String)
*/
+ @Override
public void setClientInfo(String name, String value) throws SQLClientInfoException
{
connection.setClientInfo(name, value);
@@ -469,6 +513,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setClientInfo(java.util.Properties)
*/
+ @Override
public void setClientInfo(Properties properties) throws SQLClientInfoException
{
connection.setClientInfo(properties);
@@ -477,6 +522,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getClientInfo(java.lang.String)
*/
+ @Override
public String getClientInfo(String name) throws SQLException
{
return connection.getClientInfo(name);
@@ -485,6 +531,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getClientInfo()
*/
+ @Override
public Properties getClientInfo() throws SQLException
{
return connection.getClientInfo();
@@ -493,6 +540,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createArrayOf(java.lang.String, java.lang.Object[])
*/
+ @Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException
{
return connection.createArrayOf(typeName, elements);
@@ -501,6 +549,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#createStruct(java.lang.String, java.lang.Object[])
*/
+ @Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException
{
return connection.createStruct(typeName, attributes);
@@ -509,6 +558,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setSchema(java.lang.String)
*/
+ @Override
public void setSchema(String schema) throws SQLException
{
connection.setSchema(schema);
@@ -517,6 +567,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getSchema()
*/
+ @Override
public String getSchema() throws SQLException
{
return connection.getSchema();
@@ -525,6 +576,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#abort(java.util.concurrent.Executor)
*/
+ @Override
public void abort(Executor executor) throws SQLException
{
connection.abort(executor);
@@ -533,6 +585,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#setNetworkTimeout(java.util.concurrent.Executor, int)
*/
+ @Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException
{
connection.setNetworkTimeout(executor, milliseconds);
@@ -541,6 +594,7 @@ public class TorqueConnectionImpl implem
/**
* @see java.sql.Connection#getNetworkTimeout()
*/
+ @Override
public int getNetworkTimeout() throws SQLException
{
return connection.getNetworkTimeout();
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java Mon Aug 27 09:48:33 2018
@@ -52,6 +52,7 @@ public class TransactionManagerImpl impl
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
*/
+ @Override
public TorqueConnection begin() throws TorqueException
{
return begin(Torque.getDefaultDB());
@@ -70,6 +71,7 @@ public class TransactionManagerImpl impl
*
* @throws TorqueException If the connection cannot be retrieved.
*/
+ @Override
public TorqueConnection begin(String dbName) throws TorqueException
{
TorqueConnection con = new TorqueConnectionImpl(Torque.getConnection(dbName));
@@ -86,6 +88,7 @@ public class TransactionManagerImpl impl
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
*/
+ @Override
public void commit(Connection con) throws TorqueException
{
if (con == null)
@@ -99,7 +102,7 @@ public class TransactionManagerImpl impl
try
{
if (con.getMetaData().supportsTransactions()
- && !con.getAutoCommit())
+ && !con.getAutoCommit())
{
con.commit();
}
@@ -124,6 +127,7 @@ public class TransactionManagerImpl impl
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
*/
+ @Override
public void rollback(Connection con) throws TorqueException
{
if (con == null)
@@ -138,7 +142,7 @@ public class TransactionManagerImpl impl
try
{
if (con.getMetaData().supportsTransactions()
- && !con.getAutoCommit())
+ && !con.getAutoCommit())
{
con.rollback();
}
@@ -165,6 +169,7 @@ public class TransactionManagerImpl impl
* @param con The Connection for the transaction.
* @see TransactionManagerImpl#rollback(Connection)
*/
+ @Override
public void safeRollback(Connection con)
{
if (con == null)
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueColumnList.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueColumnList.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueColumnList.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueColumnList.java Mon Aug 27 09:48:33 2018
@@ -64,6 +64,7 @@ public class UniqueColumnList extends Ar
*
* @throws NullPointerException if column is null.
*/
+ @Override
public boolean add(Column column)
{
if (column == null)
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueList.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueList.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueList.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueList.java Mon Aug 27 09:48:33 2018
@@ -60,6 +60,7 @@ public class UniqueList<T> extends Array
* @param o the Object to add
* @return true if the Object is added
*/
+ @Override
public boolean add(T o)
{
if (o != null && !contains(o))
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java Mon Aug 27 09:48:33 2018
@@ -36,7 +36,7 @@ import org.apache.torque.Column;
public abstract class AbstractFunction implements SQLFunction
{
/** The arguments being used by this function */
- private List<Object> argumentList = new ArrayList<Object>();
+ private List<Object> argumentList = new ArrayList<>();
/**
* Functions should only be created via the FunctionFactory class.
@@ -53,6 +53,7 @@ public abstract class AbstractFunction i
*
* @return The SQL String.
*/
+ @Override
public abstract String getSqlExpression();
/**
@@ -64,6 +65,7 @@ public abstract class AbstractFunction i
* @return Should return a valid Object array and not null. E.g.
* implementors should return new Object[0] if there are no parameters.
*/
+ @Override
public Object[] getArguments()
{
Object[] args = getArgumentList().toArray();
@@ -79,6 +81,7 @@ public abstract class AbstractFunction i
*
* @param args the function arguments, not null.
*/
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void setArguments(Object[] args)
{
@@ -92,6 +95,7 @@ public abstract class AbstractFunction i
*
* @throws IllegalStateException if the column cannot be determined.
*/
+ @Override
public Column getColumn()
{
for (Object argument : getArgumentList())
@@ -103,7 +107,7 @@ public abstract class AbstractFunction i
}
throw new IllegalStateException(
"Column could not be determined from arguments "
- + getArgumentList());
+ + getArgumentList());
}
/**
@@ -114,6 +118,7 @@ public abstract class AbstractFunction i
* @return The parameter object. Null if one does not
* exist.
*/
+ @Override
public Object getArgument(int index)
{
List<Object> argList = getArgumentList();
@@ -153,7 +158,7 @@ public abstract class AbstractFunction i
{
if (this.argumentList == null)
{
- this.argumentList = new ArrayList<Object>();
+ this.argumentList = new ArrayList<>();
}
return this.argumentList;
}
@@ -165,6 +170,7 @@ public abstract class AbstractFunction i
*
* @return the column name, always null.
*/
+ @Override
public String getColumnName()
{
return null;
@@ -178,6 +184,7 @@ public abstract class AbstractFunction i
*
* @return the name of the table, may be null but not blank.
*/
+ @Override
public String getTableName()
{
String tableName = null;
@@ -188,7 +195,7 @@ public abstract class AbstractFunction i
{
Column column = (Column) argument;
if (columnFound
- && !ObjectUtils.equals(tableName, column.getTableName()))
+ && !ObjectUtils.equals(tableName, column.getTableName()))
{
// cannot determine unique table name, return null
return null;
@@ -207,6 +214,7 @@ public abstract class AbstractFunction i
*
* @return the schema name, or null if the schema is not known.
*/
+ @Override
public String getSchemaName()
{
String schemaName = null;
@@ -217,7 +225,7 @@ public abstract class AbstractFunction i
{
Column column = (Column) argument;
if (columnFound
- && !ObjectUtils.equals(schemaName, column.getSchemaName()))
+ && !ObjectUtils.equals(schemaName, column.getSchemaName()))
{
// cannot determine unique schema name, return null
return null;
@@ -238,6 +246,7 @@ public abstract class AbstractFunction i
*
* @return the fully qualified table name may be null but not blank.
*/
+ @Override
public String getFullTableName()
{
String fullTableName = null;
@@ -248,9 +257,9 @@ public abstract class AbstractFunction i
{
Column column = (Column) argument;
if (columnFound
- && !ObjectUtils.equals(
- fullTableName,
- column.getFullTableName()))
+ && !ObjectUtils.equals(
+ fullTableName,
+ column.getFullTableName()))
{
// cannot determine unique full table name, return null
return null;
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java Mon Aug 27 09:48:33 2018
@@ -76,6 +76,7 @@ public class AggregateFunction implement
*
* @return the column, not null.
*/
+ @Override
public Column getColumn()
{
return column;
@@ -139,6 +140,7 @@ public class AggregateFunction implement
*
* @throws IllegalStateException if the arguments are not set
*/
+ @Override
public String getSqlExpression()
{
StringBuilder sb = new StringBuilder();
@@ -148,10 +150,11 @@ public class AggregateFunction implement
sb.append("DISTINCT ");
}
sb.append(column.getSqlExpression())
- .append(")");
+ .append(")");
return sb.toString();
}
+ @Override
public Object getArgument(int i)
{
switch (i)
@@ -166,6 +169,7 @@ public class AggregateFunction implement
}
+ @Override
public Object[] getArguments()
{
return new Object[] {column, distinct};
@@ -182,57 +186,62 @@ public class AggregateFunction implement
* been supplied or the second argument
* object is not Boolean.
*/
- public void setArguments(Object[] args)
- {
+ @Override
+ public void setArguments(Object[] args)
+ {
- if (args.length < 1)
- {
- throw new IllegalArgumentException(
- "There must be at least one argument object specified!");
- }
- if (args.length < 2)
- {
- this.distinct = false;
- }
- else
- {
- if (!(args[1] instanceof Boolean))
- {
- throw new IllegalArgumentException(
+ if (args.length < 1)
+ {
+ throw new IllegalArgumentException(
+ "There must be at least one argument object specified!");
+ }
+ if (args.length < 2)
+ {
+ this.distinct = false;
+ }
+ else
+ {
+ if (!(args[1] instanceof Boolean))
+ {
+ throw new IllegalArgumentException(
"Second argument object is not type Boolean!");
- }
- this.distinct = ((Boolean) args[1]).booleanValue();
- }
- if (!(args[0] instanceof Column))
- {
- throw new IllegalArgumentException(
+ }
+ this.distinct = ((Boolean) args[1]).booleanValue();
+ }
+ if (!(args[0] instanceof Column))
+ {
+ throw new IllegalArgumentException(
"First argument object is not type Column!");
- }
- this.column = (Column) args[0];
- }
-
- /**
- * Returns the column name.
- * This implementation always return null because we do not reference
- * a real column.
- *
- * @return the column name, always null.
- */
- public String getColumnName()
- {
- return null;
- }
+ }
+ this.column = (Column) args[0];
+ }
+
+ /**
+ * Returns the column name.
+ * This implementation always return null because we do not reference
+ * a real column.
+ *
+ * @return the column name, always null.
+ */
+ @Override
+ public String getColumnName()
+ {
+ return null;
+ }
+ @Override
public String getTableName()
{
return column.getTableName();
}
+ @Override
public String getSchemaName()
{
return column.getSchemaName();
}
+ @Override
public String getFullTableName()
{
return column.getFullTableName();
Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java Mon Aug 27 09:48:33 2018
@@ -38,7 +38,7 @@ public abstract class BaseTestCase exten
{
/** The path to the configuration file. */
public static final String CONFIG_FILE
- = "src/test/resources/Torque.properties";
+ = "src/test/resources/Torque.properties";
/** A pre-filled table map. */
protected TableMap tableMap;
Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java Mon Aug 27 09:48:33 2018
@@ -310,7 +310,7 @@ public class ColumnImplTest extends Base
public void testSqlExpressionConstructorCount()
{
ColumnImpl column
- = new ColumnImpl("count(schemaName.tableName.columnName)");
+ = new ColumnImpl("count(schemaName.tableName.columnName)");
assertEquals("schemaName", column.getSchemaName());
assertEquals("tableName", column.getTableName());
assertEquals("columnName", column.getColumnName());
@@ -412,7 +412,7 @@ public class ColumnImplTest extends Base
public void testGetSqlExpressionWithSchema()
{
ColumnImpl column
- = new ColumnImpl("schemaName", "tableName", "columnName");
+ = new ColumnImpl("schemaName", "tableName", "columnName");
assertEquals(
"tableName.columnName",
column.getSqlExpression());
Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java Mon Aug 27 09:48:33 2018
@@ -64,14 +64,14 @@ public class TorqueInstanceTest extends
public void testDefaultDataSourceFactory() throws Exception
{
DataSourceFactory defaultDataSourceFactory
- = Torque.getInstance().getDataSourceFactory(DEFAULT_NAME);
+ = Torque.getInstance().getDataSourceFactory(DEFAULT_NAME);
assertNotNull(
"The DataSourceFactory for Key "
- + DEFAULT_NAME
- + " should not be null",
- defaultDataSourceFactory);
+ + DEFAULT_NAME
+ + " should not be null",
+ defaultDataSourceFactory);
DataSourceFactory postgresqlDataSourceFactory
- = Torque.getInstance().getDataSourceFactory(POSTGRESQL_NAME);
+ = Torque.getInstance().getDataSourceFactory(POSTGRESQL_NAME);
assertSame("The default DataSourceFactory "
+ "and the postgresql DataSourceFactory "
+ "are not the same object",
@@ -89,9 +89,9 @@ public class TorqueInstanceTest extends
// check whether all expected databases are contained in the Map
assertEquals(
"Databases should contain 4 Databases, not "
- + databases.size(),
- 4,
- databases.size());
+ + databases.size(),
+ 4,
+ databases.size());
// check that the default database and the turbine database
// refer to the same object
@@ -99,9 +99,9 @@ public class TorqueInstanceTest extends
Database postgresqlDatabase = Torque.getDatabase(POSTGRESQL_NAME);
assertNotSame("The default database and the turbine database "
- + "are the same object",
- defaultDatabase,
- postgresqlDatabase);
+ + "are the same object",
+ defaultDatabase,
+ postgresqlDatabase);
}
/**
Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java Mon Aug 27 09:48:33 2018
@@ -45,7 +45,7 @@ public class TorqueRuntimeExceptionTest
"org.apache.torque.TorqueRuntimeException"));
assertTrue(stringWriter.toString().indexOf(
"org.apache.torque.TorqueRuntimeExceptionTest.testPrintStackTrace")
- > 0);
+ > 0);
}
}
Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/adapter/DBOracleTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/adapter/DBOracleTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/adapter/DBOracleTest.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/adapter/DBOracleTest.java Mon Aug 27 09:48:33 2018
@@ -32,7 +32,7 @@ public class DBOracleTest extends TestCa
*/
public void testSelectColumnsForLimitOffset()
{
- UniqueList<String> input = new UniqueList<String>();
+ UniqueList<String> input = new UniqueList<>();
input.add("c1");
input.add("c2");
input.add("c1 a1");
@@ -50,7 +50,7 @@ public class DBOracleTest extends TestCa
input.set(1, "t.c1");
query.getSelectClause().addAll(input);
new OracleAdapter().generateLimits(query, 0, 1);
- UniqueList<String> expected = new UniqueList<String>(input);
+ UniqueList<String> expected = new UniqueList<>(input);
expected.set(1, "t.c1 a0");
assertEquals(expected, query.getSelectClause());
@@ -60,7 +60,7 @@ public class DBOracleTest extends TestCa
input.set(0, "t.a1");
query.getSelectClause().addAll(input);
new OracleAdapter().generateLimits(query, 0, 1);
- expected = new UniqueList<String>(input);
+ expected = new UniqueList<>(input);
expected.set(0, "t.a1 a0");
assertEquals(query.getSelectClause(), expected);
@@ -69,7 +69,7 @@ public class DBOracleTest extends TestCa
input.set(1, "t2.a1");
query.getSelectClause().addAll(input);
new OracleAdapter().generateLimits(query, 0, 1);
- expected = new UniqueList<String>(input);
+ expected = new UniqueList<>(input);
expected.set(0, "t.a1 a0");
expected.set(1, "t2.a1 a3");
assertEquals(expected, query.getSelectClause());
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org