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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018 @@ -100,11 +100,12 @@ public class ComboKey extends ObjectKey * * @param keys the key values */ + @Override public void setValue(String keys) { int startPtr = 0; int indexOfSep = keys.indexOf(SEPARATOR); - List<SimpleKey> tmpKeys = new ArrayList<SimpleKey>(); + List<SimpleKey> tmpKeys = new ArrayList<>(); while (indexOfSep != -1) { if (indexOfSep == startPtr) @@ -119,24 +120,24 @@ public class ComboKey extends ObjectKey SimpleKey newKey = null; switch(keyType) { - case 'N': - newKey = new NumberKey(keyString); - break; - case 'S': - newKey = new StringKey(keyString); - break; - case 'D': - try - { - newKey = new DateKey(keyString); - } - catch (NumberFormatException nfe) - { - newKey = new DateKey(); - } - break; - default: - // unexpected key type + case 'N': + newKey = new NumberKey(keyString); + break; + case 'S': + newKey = new StringKey(keyString); + break; + case 'D': + try + { + newKey = new DateKey(keyString); + } + catch (NumberFormatException nfe) + { + newKey = new DateKey(); + } + break; + default: + // unexpected key type } tmpKeys.add(newKey); } @@ -166,6 +167,7 @@ public class ComboKey extends ObjectKey * * @return the underlying object */ + @Override public Object getValue() { return key; @@ -177,6 +179,7 @@ public class ComboKey extends ObjectKey * * @return <code>Types.ARRAY</code>. */ + @Override public int getJdbcType() { return Types.ARRAY; @@ -189,6 +192,7 @@ public class ComboKey extends ObjectKey * @param keyObj the comparison value * @return whether the two objects are equal */ + @Override public boolean equals(Object keyObj) { boolean isEqual = false; @@ -246,7 +250,7 @@ public class ComboKey extends ObjectKey else if (keyObj instanceof ComboKey) { SimpleKey[] obj = (SimpleKey[]) - ((ComboKey) keyObj).getValue(); + ((ComboKey) keyObj).getValue(); SimpleKey[] keys1 = key; SimpleKey[] keys2 = obj; @@ -275,6 +279,7 @@ public class ComboKey extends ObjectKey * @param sb the StringBuilder to append * @see #toString() */ + @Override public void appendTo(StringBuilder sb) { if (key != null) @@ -316,6 +321,7 @@ public class ComboKey extends ObjectKey * * @return an <code>int</code> value */ + @Override public int hashCode() { if (key == null) @@ -342,6 +348,7 @@ public class ComboKey extends ObjectKey * * @return a String representation */ + @Override public String toString() { StringBuilder sbuf = new StringBuilder();
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/DateKey.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/DateKey.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/DateKey.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/DateKey.java Mon Aug 27 09:48:33 2018 @@ -96,6 +96,7 @@ public class DateKey extends SimpleKey * * @param key the key value */ + @Override public void setValue(String key) { if (key != null) @@ -131,6 +132,7 @@ public class DateKey extends SimpleKey * * @return <code>Types.TIMESTAMP</code>. */ + @Override public int getJdbcType() { return Types.TIMESTAMP; Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/NumberKey.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/NumberKey.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/NumberKey.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/NumberKey.java Mon Aug 27 09:48:33 2018 @@ -148,6 +148,7 @@ public class NumberKey extends SimpleKey * @param key the key value * @throws NumberFormatException if key is not a valid number */ + @Override public void setValue(String key) { if (key != null) @@ -186,6 +187,7 @@ public class NumberKey extends SimpleKey * * @return <code>Types.NUMERIC</code>. */ + @Override public int getJdbcType() { return Types.NUMERIC; @@ -204,6 +206,7 @@ public class NumberKey extends SimpleKey /** * @return a hash code based on the value */ + @Override public int hashCode() { if (getValue() == null) @@ -220,6 +223,7 @@ public class NumberKey extends SimpleKey * @param o the comparison value * @return a numeric comparison of the two values */ + @Override public int compareTo(Object o) { return getBigDecimal().compareTo(((NumberKey) o).getBigDecimal()); 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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018 @@ -56,6 +56,7 @@ public abstract class ObjectKey implemen * * @return an <code>int</code> value */ + @Override public int hashCode() { if (key == null) @@ -134,6 +135,7 @@ public abstract class ObjectKey implemen * @param obj the object to compare to this object * @return a numeric comparison of the two values */ + @Override public int compareTo(Object obj) { return toString().compareTo(obj.toString()); Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/StringKey.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/StringKey.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/StringKey.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/StringKey.java Mon Aug 27 09:48:33 2018 @@ -77,6 +77,7 @@ public class StringKey extends SimpleKey * * @param key the key value */ + @Override public void setValue(String key) { this.key = key; @@ -115,6 +116,7 @@ public class StringKey extends SimpleKey * * @return <code>Types.VARCHAR</code>. */ + @Override public int getJdbcType() { return Types.VARCHAR; Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java Mon Aug 27 09:48:33 2018 @@ -65,14 +65,15 @@ public class BigDecimalMapper implements * (if previous columns contain other objects), or 0 for no offset. * @param criteria The criteria which created the result set, or null * if not known. This parameter is not used by this record mapper. - * + * * @return the BigDecimal retrieved from the result set. */ + @Override public BigDecimal processRow( - final ResultSet resultSet, - final int rowOffset, - final Criteria criteria) - throws TorqueException + final ResultSet resultSet, + final int rowOffset, + final Criteria criteria) + throws TorqueException { try { Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java Mon Aug 27 09:48:33 2018 @@ -42,7 +42,7 @@ public class CompositeMapper implements * their individual offset. */ private final List<MapperWithOffset> mapperList - = new ArrayList<MapperWithOffset>(); + = new ArrayList<>(); /** * Adds a new mapper to be applied to a result set. @@ -68,13 +68,14 @@ public class CompositeMapper implements * @return a list of mapped objects in the same order as the mappers * were ordered, not null. */ + @Override public List<Object> processRow( final ResultSet resultSet, final int offset, final Criteria criteria) - throws TorqueException + throws TorqueException { - List<Object> result = new ArrayList<Object>(mapperList.size()); + List<Object> result = new ArrayList<>(mapperList.size()); for (MapperWithOffset mapperWithOffset : mapperList) { int totalOffset = offset + mapperWithOffset.getOffset(); Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java Mon Aug 27 09:48:33 2018 @@ -70,11 +70,12 @@ public class DateMapper implements Recor * * @return the date retrieved from the result set. */ + @Override public Date processRow( - final ResultSet resultSet, - final int rowOffset, - final Criteria criteria) - throws TorqueException + final ResultSet resultSet, + final int rowOffset, + final Criteria criteria) + throws TorqueException { try { Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java Mon Aug 27 09:48:33 2018 @@ -67,11 +67,12 @@ public class IntegerMapper implements Re * * @return the Integer retrieved from the result set. */ + @Override public Integer processRow( - final ResultSet resultSet, - final int rowOffset, - final Criteria criteria) - throws TorqueException + final ResultSet resultSet, + final int rowOffset, + final Criteria criteria) + throws TorqueException { try { Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java Mon Aug 27 09:48:33 2018 @@ -67,11 +67,12 @@ public class LongMapper implements Recor * * @return the Long retrieved from the result set. */ + @Override public Long processRow( - final ResultSet resultSet, - final int rowOffset, - final Criteria criteria) - throws TorqueException + final ResultSet resultSet, + final int rowOffset, + final Criteria criteria) + throws TorqueException { try { Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java Mon Aug 27 09:48:33 2018 @@ -85,7 +85,7 @@ public class ObjectListMapper implements */ public ObjectListMapper(final int numberOfColumnsToMap) { - this.convertClasses = new ArrayList<Class<?>>(numberOfColumnsToMap); + this.convertClasses = new ArrayList<>(numberOfColumnsToMap); if (numberOfColumnsToMap != -1) { for (int i = 0; i < numberOfColumnsToMap; ++i) @@ -114,7 +114,7 @@ public class ObjectListMapper implements { if (convertClasses != null) { - this.convertClasses = new ArrayList<Class<?>>(convertClasses); + this.convertClasses = new ArrayList<>(convertClasses); } } @@ -135,11 +135,12 @@ public class ObjectListMapper implements * fails or if the number of available columns cannot be determined * from the result set. */ + @Override public List<Object> processRow( - final ResultSet resultSet, - final int offset, - final Criteria criteria) - throws TorqueException + final ResultSet resultSet, + final int offset, + final Criteria criteria) + throws TorqueException { try { @@ -155,7 +156,7 @@ public class ObjectListMapper implements } List<Object> result - = new ArrayList<Object>(currentNumberOfColumnsToMap); + = new ArrayList<>(currentNumberOfColumnsToMap); for (int i = 0; i < currentNumberOfColumnsToMap; ++i) { Class<?> mapClass; Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java Mon Aug 27 09:48:33 2018 @@ -58,8 +58,8 @@ public interface RecordMapper<T> extends * @throws TorqueException when the mapping fails. */ T processRow( - ResultSet resultSet, - int rowOffset, - Criteria criteria) - throws TorqueException; + ResultSet resultSet, + int rowOffset, + Criteria criteria) + throws TorqueException; } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java Mon Aug 27 09:48:33 2018 @@ -67,11 +67,12 @@ public class StringMapper implements Rec * * @return the String retrieved from the result set. */ + @Override public String processRow( - final ResultSet resultSet, - final int rowOffset, - final Criteria criteria) - throws TorqueException + final ResultSet resultSet, + final int rowOffset, + final Criteria criteria) + throws TorqueException { try { Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java Mon Aug 27 09:48:33 2018 @@ -62,9 +62,9 @@ public final class JoinBuilder * @throws TorqueException if the Joins can not be processed */ public static void processJoins( - final Criteria criteria, - final Query query) - throws TorqueException + final Criteria criteria, + final Query query) + throws TorqueException { if (criteria.isComposite()) { @@ -118,9 +118,9 @@ public final class JoinBuilder { throw new TorqueException( "join condition is composite " - + "and there is no leftTable defined " - + "in the join. " - + "Please define a leftTable in the join"); + + "and there is no leftTable defined " + + "in the join. " + + "Please define a leftTable in the join"); } Object lValue = joinCondition.getLValue(); leftExpression = SqlBuilder.getExpressionForFromClause( @@ -138,9 +138,9 @@ public final class JoinBuilder { throw new TorqueException( "join condition is composite " - + "and there is no rightTable defined " - + "in the join. " - + "Please define a rightTable in the join"); + + "and there is no rightTable defined " + + "in the join. " + + "Please define a rightTable in the join"); } Object rValue = joinCondition.getRValue(); rightExpression = SqlBuilder.getExpressionForFromClause( @@ -156,18 +156,18 @@ public final class JoinBuilder // rightTableName if (!SqlBuilder.fromClauseContainsExpression( - queryFromClause, - rightExpression)) + queryFromClause, + rightExpression)) { if (!SqlBuilder.fromClauseContainsExpression( - queryFromClause, - leftExpression)) + queryFromClause, + leftExpression)) { FromElement fromElement = new FromElement( - leftExpression.getSqlAsString(), - null, - null, - leftExpression.getPreparedStatementReplacements()); + leftExpression.getSqlAsString(), + null, + null, + leftExpression.getPreparedStatementReplacements()); queryFromClause.add(fromElement); } @@ -181,8 +181,8 @@ public final class JoinBuilder else { if (SqlBuilder.fromClauseContainsExpression( - queryFromClause, - leftExpression)) + queryFromClause, + leftExpression)) { // We cannot add an explicit join if both tables // are already present in the from clause @@ -198,9 +198,9 @@ public final class JoinBuilder // rightTableName must not be added // because it is already present FromElement fromElement = new FromElement( - leftExpression.getSqlAsString(), - reverseJoinType(joinType), - buildJoinCondition(joinCondition, criteria, query)); + leftExpression.getSqlAsString(), + reverseJoinType(joinType), + buildJoinCondition(joinCondition, criteria, query)); queryFromClause.add(fromElement); } } @@ -248,10 +248,10 @@ public final class JoinBuilder * @throws TorqueException if the join condition cannot be built. */ private static PreparedStatementPart buildJoinCondition( - final Criterion joinCondition, - final Criteria criteria, - final Query query) - throws TorqueException + final Criterion joinCondition, + final Criteria criteria, + final Query query) + throws TorqueException { PreparedStatementPartImpl joinPart = new PreparedStatementPartImpl(); appendJoinCondition(joinCondition, criteria, joinPart, query); @@ -271,11 +271,11 @@ public final class JoinBuilder * @throws TorqueException if the join condition cannot be built. */ private static void appendJoinCondition( - final Criterion joinCondition, - final Criteria criteria, - final PreparedStatementPartImpl joinPart, - final Query query) - throws TorqueException + final Criterion joinCondition, + final Criteria criteria, + final PreparedStatementPartImpl joinPart, + final Query query) + throws TorqueException { if (joinCondition.isComposite()) { @@ -298,7 +298,7 @@ public final class JoinBuilder return; } PreparedStatementPart joinConditionStatementPart - = SqlBuilder.processCriterion(joinCondition, criteria, query); + = SqlBuilder.processCriterion(joinCondition, criteria, query); joinPart.append(joinConditionStatementPart); } @@ -313,8 +313,8 @@ public final class JoinBuilder { String tableName = tableNamePart.getSqlAsString(); if (tableName.indexOf('.') != -1 // table name is already qualified - || tableName.indexOf(' ') != -1 // table name is no simple table name - || tableName.indexOf('(') != -1) // table name is no simple table name + || tableName.indexOf(' ') != -1 // table name is no simple table name + || tableName.indexOf('(') != -1) // table name is no simple table name { return tableNamePart; } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/OrderBy.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/OrderBy.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/OrderBy.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/OrderBy.java Mon Aug 27 09:48:33 2018 @@ -109,13 +109,13 @@ public class OrderBy implements Serializ public int hashCode() { return new HashCodeBuilder() - .append(this.column.getSqlExpression()) - .append(this.column.getSchemaName()) - .append(this.column.getTableName()) - .append(this.column.getColumnName()) - .append(this.order) - .append(this.ignoreCase) - .toHashCode(); + .append(this.column.getSqlExpression()) + .append(this.column.getSchemaName()) + .append(this.column.getTableName()) + .append(this.column.getColumnName()) + .append(this.order) + .append(this.ignoreCase) + .toHashCode(); } /** @@ -145,16 +145,16 @@ public class OrderBy implements Serializ } OrderBy other = (OrderBy) obj; return new EqualsBuilder() - .append(this.column.getSqlExpression(), - other.column.getSqlExpression()) - .append(this.column.getSchemaName(), - other.column.getSchemaName()) - .append(this.column.getTableName(), - other.column.getTableName()) - .append(this.column.getColumnName(), - other.column.getColumnName()) - .append(this.order, other.order) - .append(this.ignoreCase, other.ignoreCase) - .isEquals(); + .append(this.column.getSqlExpression(), + other.column.getSqlExpression()) + .append(this.column.getSchemaName(), + other.column.getSchemaName()) + .append(this.column.getTableName(), + other.column.getTableName()) + .append(this.column.getColumnName(), + other.column.getColumnName()) + .append(this.order, other.order) + .append(this.ignoreCase, other.ignoreCase) + .isEquals(); } } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/Query.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/Query.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/Query.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/Query.java Mon Aug 27 09:48:33 2018 @@ -91,12 +91,12 @@ public class Query /** * The select modifiers. E.g. DISTINCT. */ - private final UniqueList<String> selectModifiers = new UniqueList<String>(); + private final UniqueList<String> selectModifiers = new UniqueList<>(); /** * The select columns for a select statement. */ - private final UniqueList<String> columns = new UniqueList<String>(); + private final UniqueList<String> columns = new UniqueList<>(); /** * The columns to update and the values to update to @@ -109,25 +109,25 @@ public class Query * a select clause, or the tables to update or delete for update * or delete statements. */ - private final UniqueList<FromElement> fromClause = new UniqueList<FromElement>(); + private final UniqueList<FromElement> fromClause = new UniqueList<>(); /** * The where clause identifying the rows to select/update/delete. */ - private final UniqueList<String> whereClause = new UniqueList<String>(); + private final UniqueList<String> whereClause = new UniqueList<>(); /** * Contains all replacement objects which are inserted into the prepared * statement ? placeholders for the where Clause. */ private final List<Object> whereClausePreparedStatementReplacements - = new ArrayList<Object>(); + = new ArrayList<>(); /** The order by columns, possibly including direction (ASC or DESC). */ - private final UniqueList<String> orderByColumns = new UniqueList<String>(); + private final UniqueList<String> orderByColumns = new UniqueList<>(); /** The group by columns. */ - private final UniqueList<String> groupByColumns = new UniqueList<String>(); + private final UniqueList<String> groupByColumns = new UniqueList<>(); /** The having clause, or null for none. */ private String having; @@ -173,7 +173,7 @@ public class Query /** * The parts of this query. */ - private final List<Query> parts = new ArrayList<Query>(); + private final List<Query> parts = new ArrayList<>(); /** * The Operator connecting the parts of the query. @@ -257,7 +257,7 @@ public class Query */ public List<Object> getPreparedStatementReplacements() { - ArrayList<Object> result = new ArrayList<Object>(); + ArrayList<Object> result = new ArrayList<>(); for (FromElement fromElement : fromClause) { result.addAll(fromElement.getPreparedStatementReplacements()); @@ -561,8 +561,8 @@ public class Query if (rowcount != null) { stringBuilder.append(SET_ROWCOUNT) - .append(rowcount) - .append(" "); + .append(rowcount) + .append(" "); } if (parts.isEmpty()) @@ -570,9 +570,9 @@ public class Query if (Type.SELECT == type) { stringBuilder.append(SELECT) - .append(StringUtils.join(selectModifiers.iterator(), " ")) - .append(StringUtils.join(columns.iterator(), ", ")) - .append(FROM); + .append(StringUtils.join(selectModifiers.iterator(), " ")) + .append(StringUtils.join(columns.iterator(), ", ")) + .append(FROM); } else if (Type.UPDATE == type) { @@ -629,7 +629,7 @@ public class Query { Column sqlExpression = entry.getValue().getSqlExpression(); stringBuilder.append("=") - .append(sqlExpression.getSqlExpression()); + .append(sqlExpression.getSqlExpression()); } first = false; } @@ -638,17 +638,17 @@ public class Query if (!whereClause.isEmpty()) { stringBuilder.append(WHERE) - .append(StringUtils.join(whereClause.iterator(), AND)); + .append(StringUtils.join(whereClause.iterator(), AND)); } if (!groupByColumns.isEmpty()) { stringBuilder.append(GROUP_BY) - .append(StringUtils.join(groupByColumns.iterator(), ", ")); + .append(StringUtils.join(groupByColumns.iterator(), ", ")); } if (having != null) { stringBuilder.append(HAVING) - .append(having); + .append(having); } } else @@ -669,22 +669,22 @@ public class Query if (!orderByColumns.isEmpty()) { stringBuilder.append(ORDER_BY) - .append(StringUtils.join(orderByColumns.iterator(), ", ")); + .append(StringUtils.join(orderByColumns.iterator(), ", ")); } if (limit != null) { stringBuilder.append(LIMIT) - .append(limit); + .append(limit); } if (offset != null) { stringBuilder.append(OFFSET) - .append(offset); + .append(offset); } if (rowcount != null) { stringBuilder.append(SET_ROWCOUNT) - .append("0"); + .append("0"); } if (postLimit != null) { @@ -708,7 +708,7 @@ public class Query * @exception TorqueException Trouble creating the query string. */ public String getDisplayString() - throws TorqueException + throws TorqueException { StringBuilder stringBuilder = new StringBuilder(); toStringBuilder(stringBuilder); 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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018 @@ -69,13 +69,13 @@ public final class SqlBuilder /** Delimiters for SQL functions. */ public static final String[] FUNCTION_DELIMITERS - = {" ", ",", "(", ")", "<", ">"}; + = {" ", ",", "(", ")", "<", ">"}; /** * The list of WhereClausePsPartBuilders which can build the where clause. */ private static List<WhereClausePsPartBuilder> whereClausePsPartBuilders - = new ArrayList<WhereClausePsPartBuilder>(); + = new ArrayList<>(); static { @@ -151,9 +151,9 @@ public final class SqlBuilder * @throws TorqueException if the select columns can not be processed. */ private static void processSelectColumns( - final Criteria criteria, - final Query query) - throws TorqueException + final Criteria criteria, + final Query query) + throws TorqueException { if (criteria.isComposite()) { @@ -191,9 +191,9 @@ public final class SqlBuilder * @throws TorqueException if the as columns can not be processed. */ private static void processAsColumns( - final Criteria criteria, - final Query query) - throws TorqueException + final Criteria criteria, + final Query query) + throws TorqueException { if (criteria.isComposite()) { @@ -207,8 +207,8 @@ public final class SqlBuilder Column column = entry.getValue(); querySelectClause.add( column.getSqlExpression() - + SqlEnum.AS - + entry.getKey()); + + SqlEnum.AS + + entry.getKey()); addTableToFromClause( column, criteria, @@ -251,7 +251,7 @@ public final class SqlBuilder private static void processCriterions( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { if (criteria.isComposite()) { @@ -271,11 +271,11 @@ public final class SqlBuilder } static void appendCriterion( - final Criterion criterion, - final Criteria criteria, - final StringBuilder where, - final Query query) - throws TorqueException + final Criterion criterion, + final Criteria criteria, + final StringBuilder where, + final Query query) + throws TorqueException { if (criterion.isComposite()) { @@ -311,7 +311,7 @@ public final class SqlBuilder query); PreparedStatementPart whereClausePartOutput - = processCriterion(criterion, criteria, query); + = processCriterion(criterion, criteria, query); where.append(whereClausePartOutput.getSqlAsString()); query.getWhereClausePreparedStatementReplacements().addAll( @@ -319,25 +319,25 @@ public final class SqlBuilder } static PreparedStatementPart processCriterion( - final Criterion criterion, - final Criteria criteria, - final Query query) - throws TorqueException + final Criterion criterion, + final Criteria criteria, + final Query query) + throws TorqueException { final String dbName = criteria.getDbName(); final Database database = Torque.getDatabase(dbName); final Adapter adapter = Torque.getAdapter(dbName); boolean ignoreCase - = isIgnoreCase(criterion, criteria, database); + = isIgnoreCase(criterion, criteria, database); WhereClauseExpression whereClausePartInput - = new WhereClauseExpression( - criterion.getLValue(), - criterion.getComparison(), - criterion.getRValue(), - criterion.getSql(), - criterion.getPreparedStatementReplacements()); + = new WhereClauseExpression( + criterion.getLValue(), + criterion.getComparison(), + criterion.getRValue(), + criterion.getSql(), + criterion.getPreparedStatementReplacements()); PreparedStatementPart whereClausePartOutput = null; for (WhereClausePsPartBuilder builder : whereClausePsPartBuilders) { @@ -371,7 +371,7 @@ public final class SqlBuilder private static void processOrderBy( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { UniqueList<String> orderByClause = query.getOrderByClause(); UniqueList<String> selectClause = query.getSelectClause(); @@ -394,14 +394,14 @@ public final class SqlBuilder // which do not have a function around them if (columnMap == null || (columnMap.getType() instanceof String - && sqlExpression.indexOf('(') == -1)) + && sqlExpression.indexOf('(') == -1)) { if (orderBy.isIgnoreCase() || criteria.isIgnoreCase()) { final Adapter adapter = Torque.getAdapter(criteria.getDbName()); orderByClause.add( adapter.ignoreCaseInOrderBy(sqlExpression) - + ' ' + orderBy.getOrder()); + + ' ' + orderBy.getOrder()); selectClause.add( adapter.ignoreCaseInOrderBy(sqlExpression)); } @@ -423,9 +423,9 @@ public final class SqlBuilder } } addTableToFromClause( - column, - criteria, - query); + column, + criteria, + query); } } @@ -440,7 +440,7 @@ public final class SqlBuilder private static void processGroupBy( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { if (criteria.isComposite()) { @@ -474,7 +474,7 @@ public final class SqlBuilder private static void processHaving( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { if (criteria.isComposite()) { @@ -499,7 +499,7 @@ public final class SqlBuilder private static void processLimits( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { int limit = criteria.getLimit(); long offset = criteria.getOffset(); @@ -547,7 +547,7 @@ public final class SqlBuilder private static void processForUpdate( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { if (criteria.isForUpdate()) { @@ -567,7 +567,7 @@ public final class SqlBuilder private static void processSetOperations( final Criteria criteria, final Query query) - throws TorqueException + throws TorqueException { if (!criteria.isComposite()) { @@ -616,7 +616,7 @@ public final class SqlBuilder static PreparedStatementPart getExpressionForFromClause( final Object toAddToFromClause, final Criteria criteria) - throws TorqueException + throws TorqueException { if (!(toAddToFromClause instanceof Column)) { @@ -625,9 +625,9 @@ public final class SqlBuilder } Column column = (Column) toAddToFromClause; Column resolvedColumn - = resolveAliasAndAsColumnAndSchema(column, criteria); + = resolveAliasAndAsColumnAndSchema(column, criteria); String fullTableName - = resolvedColumn.getFullTableName(); + = resolvedColumn.getFullTableName(); if (!StringUtils.equals( resolvedColumn.getTableName(), @@ -637,9 +637,9 @@ public final class SqlBuilder // <xxx> AS <yyy> causes problems on oracle PreparedStatementPartImpl result = new PreparedStatementPartImpl(); result.getSql() - .append(fullTableName) - .append(" ") - .append(column.getTableName()); + .append(fullTableName) + .append(" ") + .append(column.getTableName()); return result; } Object resolvedAlias = criteria.getAliases().get( @@ -652,9 +652,9 @@ public final class SqlBuilder Query renderedSubquery = SqlBuilder.buildQuery(subquery); PreparedStatementPartImpl result = new PreparedStatementPartImpl(); result.getSql().append("(") - .append(renderedSubquery.toString()) - .append(") ") - .append(resolvedColumn.getTableName()); + .append(renderedSubquery.toString()) + .append(") ") + .append(resolvedColumn.getTableName()); result.getPreparedStatementReplacements().addAll( renderedSubquery.getPreparedStatementReplacements()); return result; @@ -662,9 +662,9 @@ public final class SqlBuilder else { throw new TorqueException("Table name " - + resolvedColumn.getTableName() - + " resolved to an unhandleable class " - + resolvedAlias.getClass().getName()); + + resolvedColumn.getTableName() + + " resolved to an unhandleable class " + + resolvedAlias.getClass().getName()); } } @@ -686,7 +686,7 @@ public final class SqlBuilder public static String getFullTableName( final String table, final String dbName) - throws TorqueException + throws TorqueException { if (table == null) { @@ -698,20 +698,20 @@ public final class SqlBuilder { String targetDBName = (dbName == null) ? Torque.getDefaultDB() - : dbName; + : dbName; - String targetSchema = Torque.getSchema(targetDBName); + String targetSchema = Torque.getSchema(targetDBName); - // If we have a default schema, fully qualify the - // table and return. - if (StringUtils.isNotEmpty(targetSchema)) - { - return new StringBuilder() - .append(targetSchema) - .append(".") - .append(table) - .toString(); - } + // If we have a default schema, fully qualify the + // table and return. + if (StringUtils.isNotEmpty(targetSchema)) + { + return new StringBuilder() + .append(targetSchema) + .append(".") + .append(table) + .toString(); + } } return table; @@ -728,7 +728,7 @@ public final class SqlBuilder public static String getUnqualifiedName( final String name, final String dbName) - throws TorqueException + throws TorqueException { if (name == null) { @@ -758,7 +758,7 @@ public final class SqlBuilder throws TorqueException { org.apache.torque.criteria.Criterion criterion - = criteria.getTopLevelCriterion(); + = criteria.getTopLevelCriterion(); if (criterion == null) { throw new TorqueException("Could not determine table name " @@ -834,7 +834,7 @@ public final class SqlBuilder static Column resolveAliasAndAsColumnAndSchema( final Column columnToResolve, final Criteria criteria) - throws TorqueException + throws TorqueException { String columnNameToResolve = columnToResolve.getColumnName(); Column resolvedColumn = criteria.getAsColumns().get(columnNameToResolve); @@ -929,10 +929,10 @@ public final class SqlBuilder * to the from clause */ static void addTableToFromClause( - final Object possibleColumn, - final Criteria criteria, - final Query query) - throws TorqueException + final Object possibleColumn, + final Criteria criteria, + final Query query) + throws TorqueException { if (possibleColumn == null) { @@ -956,8 +956,8 @@ public final class SqlBuilder // it is important that this piece of code is executed AFTER // the joins are processed if (!fromClauseContainsExpression( - queryFromClause, - fromClauseExpression)) + queryFromClause, + fromClauseExpression)) { FromElement fromElement = new FromElement( fromClauseExpression.getSqlAsString(), @@ -982,13 +982,13 @@ public final class SqlBuilder * @throws TorqueException in the case of an error. */ static boolean isIgnoreCase( - final Criterion criterion, - final Criteria criteria, - final Database database) - throws TorqueException + final Criterion criterion, + final Criteria criteria, + final Database database) + throws TorqueException { boolean ignoreCase - = criteria.isIgnoreCase() || criterion.isIgnoreCase(); + = criteria.isIgnoreCase() || criterion.isIgnoreCase(); ignoreCase = ignoreCase && ignoreCaseApplicable( criterion.getLValue(), @@ -1016,10 +1016,10 @@ public final class SqlBuilder * @throws TorqueException in the case of an error. */ private static boolean ignoreCaseApplicable( - final Object value, - final Criteria criteria, - final Database database) - throws TorqueException + final Object value, + final Criteria criteria, + final Database database) + throws TorqueException { if (value == null) { Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/WhereClauseExpression.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/WhereClauseExpression.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/WhereClauseExpression.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/WhereClauseExpression.java Mon Aug 27 09:48:33 2018 @@ -200,11 +200,11 @@ public class WhereClauseExpression public int hashCode() { HashCodeBuilder hashCodeBuilder = new HashCodeBuilder() - .append(lValue) - .append(operator) - .append(rValue) - .append(sql) - .append(preparedStatementReplacements); + .append(lValue) + .append(operator) + .append(rValue) + .append(sql) + .append(preparedStatementReplacements); return hashCodeBuilder.toHashCode(); } @@ -230,8 +230,8 @@ public class WhereClauseExpression .append(rValue, other.rValue) .append(sql, other.sql) .append( - preparedStatementReplacements, - other.preparedStatementReplacements); + preparedStatementReplacements, + other.preparedStatementReplacements); return equalsBuilder.isEquals(); } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java Mon Aug 27 09:48:33 2018 @@ -51,12 +51,13 @@ public class ObjectOrColumnPsPartBuilder * * @throws TorqueException when rendering fails. */ + @Override public PreparedStatementPart buildPs( Object toBuildFrom, final boolean ignoreCase, final Query query, final Adapter adapter) - throws TorqueException + throws TorqueException { PreparedStatementPartImpl result = new PreparedStatementPartImpl(); // check column Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectPsPartBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectPsPartBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectPsPartBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectPsPartBuilder.java Mon Aug 27 09:48:33 2018 @@ -52,5 +52,5 @@ public interface ObjectPsPartBuilder final boolean ignoreCase, final Query query, final Adapter adapter) - throws TorqueException; + throws TorqueException; } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/PreparedStatementPartForSubselect.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/PreparedStatementPartForSubselect.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/PreparedStatementPartForSubselect.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/PreparedStatementPartForSubselect.java Mon Aug 27 09:48:33 2018 @@ -82,7 +82,7 @@ public class PreparedStatementPartForSub } // assume that table names which are in the outer from clause are references to the outer from clause // But only do this if any tables are remaining - UniqueList<FromElement> remainingTableNames = new UniqueList<FromElement>(subquery.getFromClause()); + UniqueList<FromElement> remainingTableNames = new UniqueList<>(subquery.getFromClause()); remainingTableNames.removeAll(outerQuery.getFromClause()); if (remainingTableNames.size() > 0) { @@ -98,6 +98,7 @@ public class PreparedStatementPartForSub /** * {@inheritDoc} */ + @Override public String getSqlAsString() { if (wrapped == null) @@ -110,6 +111,7 @@ public class PreparedStatementPartForSub /** * {@inheritDoc} */ + @Override public List<Object> getPreparedStatementReplacements() { if (wrapped == null) Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/AbstractWhereClausePsPartBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/AbstractWhereClausePsPartBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/AbstractWhereClausePsPartBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/AbstractWhereClausePsPartBuilder.java Mon Aug 27 09:48:33 2018 @@ -28,11 +28,11 @@ import org.apache.torque.sql.objectbuild * @version $Id$ */ public abstract class AbstractWhereClausePsPartBuilder - implements WhereClausePsPartBuilder +implements WhereClausePsPartBuilder { /** The ObjectPsPartBuilder to use for single values or columns. */ private static ObjectPsPartBuilder objectOrColumnPsPartBuilder - = new ObjectOrColumnPsPartBuilder(); + = new ObjectOrColumnPsPartBuilder(); /** * Returns the ObjectPsPartBuilder to use for single values or columns. Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java Mon Aug 27 09:48:33 2018 @@ -32,7 +32,7 @@ import org.apache.torque.criteria.Prepar public class CombinedPreparedStatementPart implements PreparedStatementPart { /** The list of PreparedStatementParts of which this PreparedStatementPart is made. */ - private final List<PreparedStatementPart> parts = new ArrayList<PreparedStatementPart>(); + private final List<PreparedStatementPart> parts = new ArrayList<>(); /** * Constructor. @@ -93,6 +93,7 @@ public class CombinedPreparedStatementPa /** * {@inheritDoc} */ + @Override public String getSqlAsString() { StringBuilder result = new StringBuilder(); @@ -106,9 +107,10 @@ public class CombinedPreparedStatementPa * * @return the list of prepared statement replacements, not null. */ + @Override public List<Object> getPreparedStatementReplacements() { - List<Object> result = new ArrayList<Object>(); + List<Object> result = new ArrayList<>(); parts.forEach(part -> result.addAll(part.getPreparedStatementReplacements())); return Collections.unmodifiableList(result); } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CurrentDateTimePsPartBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CurrentDateTimePsPartBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CurrentDateTimePsPartBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CurrentDateTimePsPartBuilder.java Mon Aug 27 09:48:33 2018 @@ -33,25 +33,26 @@ import org.apache.torque.sql.WhereClause * @version $Id$ */ public class CurrentDateTimePsPartBuilder - extends AbstractWhereClausePsPartBuilder +extends AbstractWhereClausePsPartBuilder { /** * {@inheritDoc} */ + @Override public PreparedStatementPart buildPs( final WhereClauseExpression whereClauseExpression, final boolean ignoreCase, final Query query, final Adapter adapter) - throws TorqueException + throws TorqueException { CombinedPreparedStatementPart result - = new CombinedPreparedStatementPart( + = new CombinedPreparedStatementPart( getObjectOrColumnPsPartBuilder().buildPs( - whereClauseExpression.getLValue(), - ignoreCase, - query, - adapter)); + whereClauseExpression.getLValue(), + ignoreCase, + query, + adapter)); result.appendSql(whereClauseExpression.getOperator().toString()); result.append(getObjectOrColumnPsPartBuilder().buildPs( whereClauseExpression.getRValue(), @@ -64,19 +65,20 @@ public class CurrentDateTimePsPartBuilde /** * {@inheritDoc} */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) { if (whereClauseExpression.getOperator().equals( - SqlEnum.CURRENT_DATE) + SqlEnum.CURRENT_DATE) || whereClauseExpression.getOperator().equals( SqlEnum.CURRENT_TIME) || whereClauseExpression.getOperator().equals( SqlEnum.CURRENT_TIMESTAMP)) - { - return true; - } - return false; + { + return true; + } + return false; } } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/EnumValueBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/EnumValueBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/EnumValueBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/EnumValueBuilder.java Mon Aug 27 09:48:33 2018 @@ -48,12 +48,13 @@ public class EnumValueBuilder extends Ab * @param adapter The adapter for the database for which the SQL * should be created, not null. */ + @Override public PreparedStatementPart buildPs( - final WhereClauseExpression whereClausePart, - final boolean ignoreCase, - final Query query, - final Adapter adapter) - throws TorqueException + final WhereClauseExpression whereClausePart, + final boolean ignoreCase, + final Query query, + final Adapter adapter) + throws TorqueException { if (whereClausePart.getLValue() instanceof Enum) { @@ -95,12 +96,12 @@ public class EnumValueBuilder extends Ab catch (NoSuchMethodException e) { throw new TorqueException("An enum is used as Criterion value but its class, " + clazz.getName() - + ", does not have a parameterless getValue() method"); + + ", does not have a parameterless getValue() method"); } if (getValueMethod.getReturnType().equals(Void.class)) { throw new TorqueException("An enum is given as Criterion value but its class, " + clazz.getName() - + ", has a parameterless getValue() method which retirsns void. It should return the wrapped type instead."); + + ", has a parameterless getValue() method which retirsns void. It should return the wrapped type instead."); } try { @@ -110,24 +111,25 @@ public class EnumValueBuilder extends Ab { // should not happen throw new TorqueException("Could not invoke the getValue() method of the class of an enum value, " + clazz.getName(), - e); + e); } catch (IllegalAccessException e) { throw new TorqueException("Could not access the getValue() method of the class of an enum value, " + clazz.getName(), - e); + e); } catch (InvocationTargetException e) { throw new TorqueException("The getValue() method of the class of an enum value, " + clazz.getName() - + " threw an exception", - e); + + " threw an exception", + e); } } /** * {@inheritDoc} */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java Mon Aug 27 09:48:33 2018 @@ -54,17 +54,18 @@ public class InBuilder extends AbstractW * @param adapter The adapter for the database for which the SQL * should be created, not null. */ + @Override public PreparedStatementPart buildPs( - final WhereClauseExpression whereClausePart, - final boolean ignoreCase, - final Query query, - final Adapter adapter) - throws TorqueException + final WhereClauseExpression whereClausePart, + final boolean ignoreCase, + final Query query, + final Adapter adapter) + throws TorqueException { CombinedPreparedStatementPart result = new CombinedPreparedStatementPart(); boolean ignoreCaseApplied = false; - List<String> inClause = new ArrayList<String>(); + List<String> inClause = new ArrayList<>(); boolean nullContained = false; if (whereClausePart.getRValue() instanceof Iterable) { @@ -112,9 +113,9 @@ public class InBuilder extends AbstractW { throw new IllegalArgumentException( "Unknown rValue type " - + whereClausePart.getRValue().getClass().getName() - + ". rValue must be an instance of " - + " Iterable or Array"); + + whereClausePart.getRValue().getClass().getName() + + ". rValue must be an instance of " + + " Iterable or Array"); } if (nullContained) @@ -162,6 +163,7 @@ public class InBuilder extends AbstractW /** * {@inheritDoc} */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) 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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018 @@ -58,18 +58,19 @@ public class LikeBuilder extends Abstrac * * @return the rendered SQL for the WhereClauseExpression */ + @Override public PreparedStatementPart buildPs( - final WhereClauseExpression whereClausePart, - final boolean ignoreCase, - final Query query, - final Adapter adapter) - throws TorqueException + final WhereClauseExpression whereClausePart, + final boolean ignoreCase, + final Query query, + final Adapter adapter) + throws TorqueException { if (!(whereClausePart.getRValue() instanceof String)) { throw new TorqueException( - "rValue must be a String for the operator " - + whereClausePart.getOperator()); + "rValue must be a String for the operator " + + whereClausePart.getOperator()); } String value = (String) whereClausePart.getRValue(); // If selection criteria contains wildcards use LIKE otherwise @@ -226,14 +227,15 @@ public class LikeBuilder extends Abstrac /** * {@inheritDoc} */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) { if (whereClauseExpression.getOperator().equals(SqlEnum.LIKE) - || whereClauseExpression.getOperator().equals(SqlEnum.NOT_LIKE) - || whereClauseExpression.getOperator().equals(SqlEnum.ILIKE) - || whereClauseExpression.getOperator().equals(SqlEnum.NOT_ILIKE)) + || whereClauseExpression.getOperator().equals(SqlEnum.NOT_LIKE) + || whereClauseExpression.getOperator().equals(SqlEnum.ILIKE) + || whereClauseExpression.getOperator().equals(SqlEnum.NOT_ILIKE)) { return true; } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NoReplacementsPreparedStatementPart.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NoReplacementsPreparedStatementPart.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NoReplacementsPreparedStatementPart.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NoReplacementsPreparedStatementPart.java Mon Aug 27 09:48:33 2018 @@ -47,6 +47,7 @@ public class NoReplacementsPreparedState /** * {@inheritDoc} */ + @Override public String getSqlAsString() { return sql; @@ -58,6 +59,7 @@ public class NoReplacementsPreparedState * * @return the list of prepared statement replacements, not null. */ + @Override public List<Object> getPreparedStatementReplacements() { return Collections.emptyList(); Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java Mon Aug 27 09:48:33 2018 @@ -52,16 +52,17 @@ public class NullValueBuilder extends Ab * * @return the rendered SQL for the WhereClauseExpression */ + @Override public PreparedStatementPart buildPs( - final WhereClauseExpression whereClausePart, - final boolean ignoreCase, - final Query query, - final Adapter adapter) - throws TorqueException + final WhereClauseExpression whereClausePart, + final boolean ignoreCase, + final Query query, + final Adapter adapter) + throws TorqueException { CombinedPreparedStatementPart result; if (whereClausePart.getOperator().equals(SqlEnum.ISNULL) - || whereClausePart.getOperator().equals(SqlEnum.ISNOTNULL)) + || whereClausePart.getOperator().equals(SqlEnum.ISNOTNULL)) { result = new CombinedPreparedStatementPart( getObjectOrColumnPsPartBuilder().buildPs( @@ -87,8 +88,8 @@ public class NullValueBuilder extends Ab return result; } if (whereClausePart.getOperator().equals(SqlEnum.NOT_EQUAL) - || whereClausePart.getOperator().equals( - SqlEnum.ALT_NOT_EQUAL)) + || whereClausePart.getOperator().equals( + SqlEnum.ALT_NOT_EQUAL)) { result = new CombinedPreparedStatementPart( getObjectOrColumnPsPartBuilder().buildPs( @@ -113,12 +114,13 @@ public class NullValueBuilder extends Ab * * @return true if applicable, false otherwise. */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) { if (whereClauseExpression.getOperator().equals(SqlEnum.ISNULL) - || whereClauseExpression.getOperator().equals(SqlEnum.ISNOTNULL)) + || whereClauseExpression.getOperator().equals(SqlEnum.ISNOTNULL)) { return true; } @@ -130,8 +132,8 @@ public class NullValueBuilder extends Ab return false; } if (whereClauseExpression.getOperator().equals(SqlEnum.EQUAL) - || whereClauseExpression.getOperator().equals(SqlEnum.NOT_EQUAL) - || whereClauseExpression.getOperator().equals( + || whereClauseExpression.getOperator().equals(SqlEnum.NOT_EQUAL) + || whereClauseExpression.getOperator().equals( SqlEnum.ALT_NOT_EQUAL)) { return true; Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/OnlyReplacementsPreparedStatementPart.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/OnlyReplacementsPreparedStatementPart.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/OnlyReplacementsPreparedStatementPart.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/OnlyReplacementsPreparedStatementPart.java Mon Aug 27 09:48:33 2018 @@ -32,7 +32,7 @@ import org.apache.torque.criteria.Prepar public class OnlyReplacementsPreparedStatementPart implements PreparedStatementPart { /** The contained replacements. */ - private final List<Object> replacements = new ArrayList<Object>(); + private final List<Object> replacements = new ArrayList<>(); /** * Constructor. @@ -49,6 +49,7 @@ public class OnlyReplacementsPreparedSta * * @return the empty sql, not null. */ + @Override public String getSqlAsString() { return ""; @@ -61,6 +62,7 @@ public class OnlyReplacementsPreparedSta * * @return the list of prepared statement replacements, not null. */ + @Override public List<Object> getPreparedStatementReplacements() { return replacements; Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/StandardBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/StandardBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/StandardBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/StandardBuilder.java Mon Aug 27 09:48:33 2018 @@ -48,12 +48,13 @@ public class StandardBuilder extends Abs * * @return the rendered SQL for the WhereClauseExpression */ + @Override public PreparedStatementPart buildPs( - final WhereClauseExpression whereClausePart, - final boolean ignoreCase, - final Query query, - final Adapter adapter) - throws TorqueException + final WhereClauseExpression whereClausePart, + final boolean ignoreCase, + final Query query, + final Adapter adapter) + throws TorqueException { CombinedPreparedStatementPart result = new CombinedPreparedStatementPart( getObjectOrColumnPsPartBuilder().buildPs( @@ -80,6 +81,7 @@ public class StandardBuilder extends Abs * * @return true if applicable, false otherwise. */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java Mon Aug 27 09:48:33 2018 @@ -47,12 +47,13 @@ public class VerbatimSqlConditionBuilder * * @return the rendered SQL for the WhereClauseExpression */ + @Override public PreparedStatementPart buildPs( - final WhereClauseExpression whereClausePart, - final boolean ignoreCase, - final Query query, - final Adapter adapter) - throws TorqueException + final WhereClauseExpression whereClausePart, + final boolean ignoreCase, + final Query query, + final Adapter adapter) + throws TorqueException { PreparedStatementPartImpl result = new PreparedStatementPartImpl( whereClausePart.getSql(), @@ -70,6 +71,7 @@ public class VerbatimSqlConditionBuilder * * @return true if applicable, false otherwise. */ + @Override public boolean isApplicable( final WhereClauseExpression whereClauseExpression, final Adapter adapter) Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java Mon Aug 27 09:48:33 2018 @@ -53,7 +53,7 @@ public interface WhereClausePsPartBuilde final boolean ignoreCase, final Query query, final Adapter adapter) - throws TorqueException; + throws TorqueException; /** * Returns whether this WhereClausePsPartBuilder is applicable for Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java Mon Aug 27 09:48:33 2018 @@ -137,7 +137,7 @@ public abstract class AbstractPeerImpl<T if (omList.size() > 1) { throw new TooManyRowsException("Object " + obj - + " matched more than one record"); + + " matched more than one record"); } if (!omList.isEmpty()) { @@ -161,7 +161,7 @@ public abstract class AbstractPeerImpl<T */ @Override public ObjectKey doInsert(ColumnValues columnValues, Connection con) - throws TorqueException + throws TorqueException { correctBooleans(columnValues); return super.doInsert(columnValues, con); @@ -195,7 +195,7 @@ public abstract class AbstractPeerImpl<T * rethrown wrapped into a TorqueException. */ public void doInsert(T obj, Connection con) - throws TorqueException + throws TorqueException { ObjectKey primaryKey = doInsert(buildColumnValues(obj), con); if (primaryKey != null) @@ -240,7 +240,7 @@ public abstract class AbstractPeerImpl<T * rethrown wrapped into a TorqueException. */ public int doUpdate(T obj, Connection con) - throws TorqueException + throws TorqueException { ColumnValues columnValues = buildColumnValues(obj); int result = doUpdate(columnValues, con); @@ -282,7 +282,7 @@ public abstract class AbstractPeerImpl<T * rethrown wrapped into a TorqueException. */ public int doDelete(ObjectKey pk, Connection con) - throws TorqueException + throws TorqueException { return doDelete(buildCriteria(pk), con); } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
