svn commit: r1839288 [10/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/...

classic Classic list List threaded Threaded
1 message Options
tv
Reply | Threaded
Open this post in threaded view
|

svn commit: r1839288 [10/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/...

tv
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java Mon Aug 27 09:48:33 2018
@@ -46,14 +46,14 @@ import org.apache.torque.TorqueInstance;
  * @version $Id$
  */
 public class TorqueComponent
-        extends TorqueInstance
-        implements Torque,
-                   LogEnabled,
-                   Configurable,
-                   Initializable,
-                   Contextualizable,
-                   Disposable,
-                   ThreadSafe
+extends TorqueInstance
+implements Torque,
+LogEnabled,
+Configurable,
+Initializable,
+Contextualizable,
+Disposable,
+ThreadSafe
 {
     /** The Avalon Application Root */
     private String appRoot = null;
@@ -75,6 +75,7 @@ public class TorqueComponent
     /**
      * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
      */
+    @Override
     public void enableLogging(Logger aLogger)
     {
         this.logger = aLogger;
@@ -92,13 +93,14 @@ public class TorqueComponent
      * @see
      * org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
      */
+    @Override
     public void configure(Configuration configuration)
             throws ConfigurationException
     {
         getLogger().debug("configure(" + configuration + ")");
 
         String configurationFile
-                = configuration.getChild("configfile").getValue();
+        = configuration.getChild("configfile").getValue();
 
         if (StringUtils.isNotEmpty(appRoot))
         {
@@ -125,6 +127,7 @@ public class TorqueComponent
     /**
      * @see org.apache.avalon.framework.context.Contextualizable
      */
+    @Override
     public void contextualize(Context context)
             throws ContextException
     {
@@ -154,6 +157,7 @@ public class TorqueComponent
     /**
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
+    @Override
     public void initialize()
             throws Exception
     {
@@ -195,6 +199,7 @@ public class TorqueComponent
     /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
+    @Override
     public void dispose()
     {
         getLogger().debug("dispose()");

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java Mon Aug 27 09:48:33 2018
@@ -208,15 +208,15 @@ public class Criteria implements Seriali
      */
     public Criteria()
     {
-        selectModifiers = new UniqueList<String>();
+        selectModifiers = new UniqueList<>();
         selectColumns = new UniqueColumnList();
-        orderByColumns = new UniqueList<OrderBy>();
+        orderByColumns = new UniqueList<>();
         groupByColumns = new UniqueColumnList();
-        fromElements = new UniqueList<FromElement>();
-        asColumns = new LinkedHashMap<String, Column>();
-        joins = new ArrayList<Join>();
-        aliases = new HashMap<String, Object>();
-        setCriteriaParts = new ArrayList<Criteria>();
+        fromElements = new UniqueList<>();
+        asColumns = new LinkedHashMap<>();
+        joins = new ArrayList<>();
+        aliases = new HashMap<>();
+        setCriteriaParts = new ArrayList<>();
     }
 
     /**
@@ -241,11 +241,11 @@ public class Criteria implements Seriali
     {
         ignoreCase = toCopy.ignoreCase;
         singleRecord = toCopy.singleRecord;
-        selectModifiers = new UniqueList<String>(toCopy.selectModifiers);
+        selectModifiers = new UniqueList<>(toCopy.selectModifiers);
         selectColumns = new UniqueColumnList(toCopy.selectColumns);
-        orderByColumns = new UniqueList<OrderBy>(toCopy.orderByColumns);
+        orderByColumns = new UniqueList<>(toCopy.orderByColumns);
         groupByColumns = new UniqueColumnList(toCopy.groupByColumns);
-        fromElements = new UniqueList<FromElement>(toCopy.fromElements);
+        fromElements = new UniqueList<>(toCopy.fromElements);
         if (toCopy.having != null)
         {
             having = new Criterion(toCopy.having);
@@ -255,17 +255,17 @@ public class Criteria implements Seriali
         {
             topLevelCriterion = new Criterion(toCopy.topLevelCriterion);
         }
-        asColumns = new HashMap<String, Column>(toCopy.asColumns);
-        joins = new ArrayList<Join>(toCopy.joins);
+        asColumns = new HashMap<>(toCopy.asColumns);
+        joins = new ArrayList<>(toCopy.joins);
         dbName = toCopy.dbName;
         limit = toCopy.limit;
         offset = toCopy.offset;
-        aliases = new HashMap<String, Object>(toCopy.aliases);
+        aliases = new HashMap<>(toCopy.aliases);
         fetchSize = toCopy.fetchSize;
         setOperator = toCopy.setOperator;
-        setCriteriaParts = new ArrayList<Criteria>(toCopy.setCriteriaParts.size());
+        setCriteriaParts = new ArrayList<>(toCopy.setCriteriaParts.size());
         toCopy.setCriteriaParts.forEach(setCriteriaPart ->
-            setCriteriaParts.add(new Criteria(setCriteriaPart)));
+        setCriteriaParts.add(new Criteria(setCriteriaPart)));
     }
 
     /**
@@ -1087,7 +1087,7 @@ public class Criteria implements Seriali
         {
             Query query = SqlBuilder.buildQuery(this);
             sb.append("Current Query SQL (may not be complete or applicable): ")
-                    .append(query.getDisplayString());
+            .append(query.getDisplayString());
         }
         catch (Exception exc)
         {
@@ -1510,7 +1510,7 @@ public class Criteria implements Seriali
             final Object[] replacements)
     {
         Criterion criterion
-                = new Criterion(null, null, null, sql, replacements);
+        = new Criterion(null, null, null, sql, replacements);
         and(criterion);
         return this;
     }
@@ -1871,7 +1871,7 @@ public class Criteria implements Seriali
     public Criteria orVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
-                = new Criterion(null, null, null, sql, replacements);
+        = new Criterion(null, null, null, sql, replacements);
         or(criterion);
         return this;
     }
@@ -2192,7 +2192,7 @@ public class Criteria implements Seriali
             final Object[] replacements)
     {
         Criterion criterion
-                = new Criterion(null, null, null, sql, replacements);
+        = new Criterion(null, null, null, sql, replacements);
         and(criterion);
         return this;
     }
@@ -2404,10 +2404,10 @@ public class Criteria implements Seriali
         {
             throw new TorqueRuntimeException(
                     "This operation cannot be performed "
-                    + "on a composite Criteria, which is composed "
-                    + "of several set operations."
-                    + " Try to perform the operation on the single parts"
-                    + " of this Criteria");
+                            + "on a composite Criteria, which is composed "
+                            + "of several set operations."
+                            + " Try to perform the operation on the single parts"
+                            + " of this Criteria");
         }
     }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java Mon Aug 27 09:48:33 2018
@@ -193,11 +193,11 @@ public class Criterion implements Serial
         this.rValue = toCopy.rValue;
         this.sql = toCopy.sql;
         this.preparedStatementReplacements
-                = toCopy.preparedStatementReplacements;
+        = toCopy.preparedStatementReplacements;
         this.ignoreCase = toCopy.ignoreCase;
         if (toCopy.parts != null)
         {
-            this.parts = new ArrayList<Criterion>(toCopy.parts.size());
+            this.parts = new ArrayList<>(toCopy.parts.size());
             toCopy.parts.forEach(part -> this.parts.add(new Criterion(part)));
         }
         this.conjunction = toCopy.conjunction;
@@ -422,7 +422,7 @@ public class Criterion implements Serial
         else
         {
             Criterion copy = new Criterion(this);
-            parts = new ArrayList<Criterion>();
+            parts = new ArrayList<>();
             parts.add(copy);
             parts.add(new Criterion(criterion));
             this.conjunction = conjunction;
@@ -457,7 +457,7 @@ public class Criterion implements Serial
                 part.appendTo(sb);
                 if (part.isComposite())
                 {
-                      sb.append(')');
+                    sb.append(')');
                 }
                 first = false;
             }
@@ -497,8 +497,8 @@ public class Criterion implements Serial
                     rValueDisplay = "";
                 }
                 sb.append(lValueDisplay)
-                    .append(comparison)
-                    .append(rValueDisplay);
+                .append(comparison)
+                .append(rValueDisplay);
             }
         }
     }
@@ -539,14 +539,14 @@ public class Criterion implements Serial
         Criterion criterion = (Criterion) obj;
         EqualsBuilder equalsBuilder = new EqualsBuilder();
         equalsBuilder.append(criterion.lValue, this.lValue)
-                .append(criterion.comparison, this.comparison)
-                .append(criterion.rValue, this.rValue)
-                .append(criterion.sql, this.sql)
-                .append(criterion.preparedStatementReplacements,
-                        this.preparedStatementReplacements)
-                .append(criterion.ignoreCase, this.ignoreCase)
-                .append(criterion.parts, this.parts)
-                .append(criterion.conjunction, this.conjunction);
+        .append(criterion.comparison, this.comparison)
+        .append(criterion.rValue, this.rValue)
+        .append(criterion.sql, this.sql)
+        .append(criterion.preparedStatementReplacements,
+                this.preparedStatementReplacements)
+        .append(criterion.ignoreCase, this.ignoreCase)
+        .append(criterion.parts, this.parts)
+        .append(criterion.conjunction, this.conjunction);
         return equalsBuilder.isEquals();
     }
 
@@ -558,13 +558,13 @@ public class Criterion implements Serial
     {
         HashCodeBuilder hashCodeBuilder = new HashCodeBuilder();
         hashCodeBuilder.append(this.lValue)
-                .append(this.comparison)
-                .append(this.rValue)
-                .append(this.sql)
-                .append(this.preparedStatementReplacements)
-                .append(this.ignoreCase)
-                .append(this.parts)
-                .append(this.conjunction);
+        .append(this.comparison)
+        .append(this.rValue)
+        .append(this.sql)
+        .append(this.preparedStatementReplacements)
+        .append(this.ignoreCase)
+        .append(this.parts)
+        .append(this.conjunction);
         return hashCodeBuilder.toHashCode();
     }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java Mon Aug 27 09:48:33 2018
@@ -52,7 +52,7 @@ public class FromElement implements Seri
 
     /** The replacements which might occur in the fromExpression. */
     private final List<Object> preparedStatementReplacements
-            = new ArrayList<Object>();
+    = new ArrayList<>();
 
     /**
      * Constructor with join type null and joinCondition null.
@@ -251,11 +251,11 @@ public class FromElement implements Seri
         }
         FromElement other = (FromElement) obj;
         return new EqualsBuilder()
-            .append(joinCondition, other.joinCondition)
-            .append(joinType, other.joinType)
-            .append(fromExpression, other.fromExpression)
-            .append(preparedStatementReplacements,
-                    other.preparedStatementReplacements)
-            .isEquals();
+                .append(joinCondition, other.joinCondition)
+                .append(joinType, other.joinType)
+                .append(fromExpression, other.fromExpression)
+                .append(preparedStatementReplacements,
+                        other.preparedStatementReplacements)
+                .isEquals();
     }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java Mon Aug 27 09:48:33 2018
@@ -166,7 +166,7 @@ public class Join implements Serializabl
     {
 
         return joinType + "(" + leftTable + ", " + rightTable + "): "
-            + joinCondition.toString();
+                + joinCondition.toString();
     }
 
     /**
@@ -188,11 +188,11 @@ public class Join implements Serializabl
 
         Join join = (Join) obj;
         return new EqualsBuilder()
-            .append(leftTable, join.leftTable)
-            .append(rightTable, join.rightTable)
-            .append(joinCondition, join.joinCondition)
-            .append(joinType, join.getJoinType())
-            .isEquals();
+                .append(leftTable, join.leftTable)
+                .append(rightTable, join.rightTable)
+                .append(joinCondition, join.joinCondition)
+                .append(joinType, join.getJoinType())
+                .isEquals();
     }
 
     /**
@@ -204,10 +204,10 @@ public class Join implements Serializabl
     public int hashCode()
     {
         return new HashCodeBuilder()
-            .append(leftTable)
-            .append(rightTable)
-            .append(joinCondition)
-            .append(joinType)
-            .toHashCode();
+                .append(leftTable)
+                .append(rightTable)
+                .append(joinCondition)
+                .append(joinType)
+                .toHashCode();
     }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/JoinType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/JoinType.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/JoinType.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/JoinType.java Mon Aug 27 09:48:33 2018
@@ -51,6 +51,7 @@ public enum JoinType
      *
      * @return the SQL expression, not null.
      */
+    @Override
     public String toString()
     {
         return sql;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPart.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPart.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPart.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPart.java Mon Aug 27 09:48:33 2018
@@ -32,7 +32,7 @@ public interface PreparedStatementPart
      *
      * @return the SQL, not null.
      */
-    public String getSqlAsString();
+    String getSqlAsString();
 
     /**
      * Returns the list of prepared statement replacements.
@@ -42,5 +42,5 @@ public interface PreparedStatementPart
      *
      * @return the list of prepared statement replacements, not null.
      */
-    public List<Object> getPreparedStatementReplacements();
+    List<Object> getPreparedStatementReplacements();
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java Mon Aug 27 09:48:33 2018
@@ -46,7 +46,7 @@ public class PreparedStatementPartImpl i
      * The replacements for the prepared statement, not null.
      */
     private final List<Object> preparedStatementReplacements
-        = new ArrayList<Object>();
+    = new ArrayList<>();
 
     /**
      * Default constructor, creates an empty PreparedStatementPart.
@@ -110,6 +110,7 @@ public class PreparedStatementPartImpl i
      *
      * @return the SQL, not null.
      */
+    @Override
     public String getSqlAsString()
     {
         return sql.toString();
@@ -120,6 +121,7 @@ public class PreparedStatementPartImpl i
      *
      * @return the modifiable list of prepared statement replacements, not null.
      */
+    @Override
     public List<Object> getPreparedStatementReplacements()
     {
         return preparedStatementReplacements;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java Mon Aug 27 09:48:33 2018
@@ -72,85 +72,85 @@ public final class SqlEnum implements ja
 
     /** SQL Expression "=". */
     public static final SqlEnum EQUAL =
-        new SqlEnum("=", 2);
+            new SqlEnum("=", 2);
     /** SQL Expression "<>". */
     public static final SqlEnum NOT_EQUAL =
             new SqlEnum("<>", 2);
     /** SQL Expression "!=". */
     public static final SqlEnum ALT_NOT_EQUAL =
-        new SqlEnum("!=", 2);
+            new SqlEnum("!=", 2);
     /** SQL Expression ">". */
     public static final SqlEnum GREATER_THAN =
-        new SqlEnum(">", 2);
+            new SqlEnum(">", 2);
     /** SQL Expression "<". */
     public static final SqlEnum LESS_THAN =
-        new SqlEnum("<", 2);
+            new SqlEnum("<", 2);
     /** SQL Expression ">=". */
     public static final SqlEnum GREATER_EQUAL =
-        new SqlEnum(">=", 2);
+            new SqlEnum(">=", 2);
     /** SQL Expression "<=". */
     public static final SqlEnum LESS_EQUAL =
-        new SqlEnum("<=", 2);
+            new SqlEnum("<=", 2);
     /** SQL Expression " LIKE ". */
     public static final SqlEnum LIKE =
-        new SqlEnum(" LIKE ", 2);
+            new SqlEnum(" LIKE ", 2);
     /** SQL Expression " NOT LIKE ". */
     public static final SqlEnum NOT_LIKE =
-        new SqlEnum(" NOT LIKE ", 2);
+            new SqlEnum(" NOT LIKE ", 2);
     /** SQL Expression " ILIKE ". */
     public static final SqlEnum ILIKE =
-        new SqlEnum(" ILIKE ", 2);
+            new SqlEnum(" ILIKE ", 2);
     /** SQL Expression " NOT ILIKE ". */
     public static final SqlEnum NOT_ILIKE =
-        new SqlEnum(" NOT ILIKE ", 2);
+            new SqlEnum(" NOT ILIKE ", 2);
     /** SQL Expression " IN ". */
     public static final SqlEnum IN =
-        new SqlEnum(" IN ", 2);
+            new SqlEnum(" IN ", 2);
     /** SQL Expression " NOT IN ". */
     public static final SqlEnum NOT_IN =
-        new SqlEnum(" NOT IN ", 2);
+            new SqlEnum(" NOT IN ", 2);
     /** SQL Expression "JOIN". */
     public static final SqlEnum JOIN =
-        new SqlEnum("JOIN", -1);
+            new SqlEnum("JOIN", -1);
     /** SQL Expression "DISTINCT ". */
     public static final SqlEnum DISTINCT =
-        new SqlEnum("DISTINCT ", -1);
+            new SqlEnum("DISTINCT ", -1);
     /** SQL Expression "ALL ". */
     public static final SqlEnum ALL =
-        new SqlEnum("ALL ", -1);
+            new SqlEnum("ALL ", -1);
     /** SQL Expression "ASC". */
     public static final SqlEnum ASC =
-        new SqlEnum("ASC", -1);
+            new SqlEnum("ASC", -1);
     /** SQL Expression "DESC". */
     public static final SqlEnum DESC =
-        new SqlEnum("DESC", -1);
+            new SqlEnum("DESC", -1);
     /** SQL Expression " IS NULL". */
     public static final SqlEnum ISNULL =
-        new SqlEnum(" IS NULL", 1);
+            new SqlEnum(" IS NULL", 1);
     /** SQL Expression " IS NOT NULL". */
     public static final SqlEnum ISNOTNULL =
-        new SqlEnum(" IS NOT NULL", 1);
+            new SqlEnum(" IS NOT NULL", 1);
     /** SQL Expression "CURRENT_DATE". */
     public static final SqlEnum CURRENT_DATE =
-        new SqlEnum("CURRENT_DATE", -1);
+            new SqlEnum("CURRENT_DATE", -1);
     /** SQL Expression "CURRENT_TIME". */
     public static final SqlEnum CURRENT_TIME =
-        new SqlEnum("CURRENT_TIME", -1);
+            new SqlEnum("CURRENT_TIME", -1);
     /** SQL Expression "CURRENT_TIMESTAMP". */
     public static final SqlEnum CURRENT_TIMESTAMP =
             new SqlEnum("CURRENT_TIMESTAMP", -1);
     /** SQL Expression " ON ". */
     public static final SqlEnum ON =
-        new SqlEnum(" ON ", -1);
+            new SqlEnum(" ON ", -1);
     /** SQL Expression " AS ". */
     public static final SqlEnum AS =
-        new SqlEnum(" AS ", -1);
+            new SqlEnum(" AS ", -1);
     /** SQL Expression " ESCAPE ". */
     public static final SqlEnum ESCAPE =
-        new SqlEnum(" ESCAPE ", -1);
+            new SqlEnum(" ESCAPE ", -1);
     /** SQL Expression " UNION ". */
     public static final SqlEnum UNION =
-        new SqlEnum(" UNION ", -1);
+            new SqlEnum(" UNION ", -1);
     /** SQL Expression " UNION ALL ". */
     public static final SqlEnum UNION_ALL =
             new SqlEnum(" UNION ALL ", -1);
@@ -199,7 +199,7 @@ public final class SqlEnum implements ja
         // else compare
         return (otherEnum.s == null)
                 ? (s == null)
-                : otherEnum.s.equals(s);
+                        : otherEnum.s.equals(s);
     }
 
     /**
@@ -210,6 +210,6 @@ public final class SqlEnum implements ja
     {
         return (s == null)
                 ? 0
-                : s.hashCode();
+                        : s.hashCode();
     }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -43,7 +43,7 @@ import org.apache.torque.TorqueRuntimeEx
  * @version $Id$
  */
 public abstract class AbstractDataSourceFactory
-        implements DataSourceFactory
+implements DataSourceFactory
 {
     /** "pool" Key for the configuration */
     public static final String POOL_KEY = "pool";
@@ -56,11 +56,11 @@ public abstract class AbstractDataSource
 
     /** "defaults.pool" Key for the configuration */
     public static final String DEFAULT_POOL_KEY
-            = DEFAULTS_KEY + "." + POOL_KEY;
+    = DEFAULTS_KEY + "." + POOL_KEY;
 
     /** "defaults.connection" Key for the configuration */
     public static final String DEFAULT_CONNECTION_KEY
-            = DEFAULTS_KEY + "." + CONNECTION_KEY;
+    = DEFAULTS_KEY + "." + CONNECTION_KEY;
 
     /** The log */
     private static Log log = LogFactory.getLog(AbstractDataSourceFactory.class);
@@ -75,7 +75,7 @@ public abstract class AbstractDataSource
      * @throws Exception if anything goes wrong
      */
     protected void setProperty(String property, final Configuration c, final Object ds)
-        throws Exception
+            throws Exception
     {
         if (c == null || c.isEmpty())
         {
@@ -92,7 +92,7 @@ public abstract class AbstractDataSource
                 property = property.substring(0, dot);
 
                 MappedPropertyDescriptor mappedPD =
-                    new MappedPropertyDescriptor(property, dsClass);
+                        new MappedPropertyDescriptor(property, dsClass);
                 Class<?> propertyType = mappedPD.getMappedPropertyType();
                 Configuration subProps = c.subset(property);
                 // use reflection to set properties
@@ -103,16 +103,16 @@ public abstract class AbstractDataSource
                     String propVal = subProps.getString(subProp);
                     Object value = ConvertUtils.convert(propVal, propertyType);
                     PropertyUtils
-                        .setMappedProperty(ds, property, subProp, value);
+                    .setMappedProperty(ds, property, subProp, value);
 
                     if (log.isDebugEnabled())
                     {
                         log.debug("setMappedProperty("
-                                       + ds + ", "
-                                       + property + ", "
-                                       + subProp + ", "
-                                       + value
-                                       + ")");
+                                + ds + ", "
+                                + property + ", "
+                                + subProp + ", "
+                                + value
+                                + ")");
                     }
                 }
             }
@@ -129,27 +129,27 @@ public abstract class AbstractDataSource
                     if (log.isDebugEnabled())
                     {
                         log.debug("setSimpleProperty("
-                                       + ds + ", "
-                                       + property + ", "
-                                       + " (value not logged)"
-                                       + ")");
+                                + ds + ", "
+                                + property + ", "
+                                + " (value not logged)"
+                                + ")");
                     }
                 }
                 else
                 {
                     Class<?> propertyType =
-                        PropertyUtils.getPropertyType(ds, property);
+                            PropertyUtils.getPropertyType(ds, property);
                     Object value =
-                        ConvertUtils.convert(c.getString(property), propertyType);
+                            ConvertUtils.convert(c.getString(property), propertyType);
                     PropertyUtils.setSimpleProperty(ds, property, value);
 
                     if (log.isDebugEnabled())
                     {
                         log.debug("setSimpleProperty("
-                                       + ds + ", "
-                                       + property + ", "
-                                       + value
-                                       + ")");
+                                + ds + ", "
+                                + property + ", "
+                                + value
+                                + ")");
                     }
                 }
             }
@@ -157,17 +157,17 @@ public abstract class AbstractDataSource
         catch (RuntimeException e)
         {
             throw new TorqueRuntimeException(
-                "Runtime error setting property " + property, e);
+                    "Runtime error setting property " + property, e);
         }
         catch (Exception e)
         {
             log.error(
-                "Property: "
-                + property
-                + " value: "
-                + c.getString(key)
-                + " is not supported by DataSource: "
-                + ds.getClass().getName());
+                    "Property: "
+                            + property
+                            + " value: "
+                            + c.getString(key)
+                            + " is not supported by DataSource: "
+                            + ds.getClass().getName());
         }
     }
 
@@ -181,7 +181,7 @@ public abstract class AbstractDataSource
      * @throws TorqueException if a property set fails
      */
     protected void applyConfiguration(final Configuration c, final Object o)
-        throws TorqueException
+            throws TorqueException
     {
         log.debug("applyConfiguration(" + c + ", " + o + ")");
 
@@ -211,7 +211,7 @@ public abstract class AbstractDataSource
      * @throws TorqueException if a property set fails
      */
     protected void initCPDS(final Configuration configuration, final ConnectionPoolDataSource cpds)
-        throws TorqueException
+            throws TorqueException
     {
         log.debug("Starting initCPDS");
         Configuration c = Torque.getConfiguration();
@@ -242,7 +242,7 @@ public abstract class AbstractDataSource
     protected void initJdbc2Pool(
             final DataSource dataSource,
             final Configuration configuration)
-        throws TorqueException
+                    throws TorqueException
     {
         log.debug("Starting initJdbc2Pool");
         Configuration c = Torque.getConfiguration();
@@ -280,5 +280,5 @@ public abstract class AbstractDataSource
      */
     @Override
     public abstract void initialize(Configuration configuration)
-        throws TorqueException;
+            throws TorqueException;
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/DataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/DataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/DataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -58,7 +58,7 @@ public interface DataSourceFactory
      *         rethrown wrapped into a TorqueException.
      */
     void initialize(Configuration configuration)
-        throws TorqueException;
+            throws TorqueException;
 
     /**
      * A hook which is called when the resources of the associated DataSource
@@ -73,5 +73,5 @@ public interface DataSourceFactory
      *         rethrown wrapped into a TorqueException.
      */
     void close()
-        throws TorqueException;
+            throws TorqueException;
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -48,7 +48,7 @@ import org.apache.torque.TorqueException
  * @version $Id$
  */
 public class JndiDataSourceFactory
-    extends AbstractDataSourceFactory
+extends AbstractDataSourceFactory
 {
     /**
      * Key for the configuration which contains jndi properties.
@@ -98,6 +98,7 @@ public class JndiDataSourceFactory
     /**
      * @see org.apache.torque.dsfactory.DataSourceFactory#getDataSource
      */
+    @Override
     public DataSource getDataSource() throws TorqueException
     {
         long time = System.currentTimeMillis();
@@ -124,6 +125,7 @@ public class JndiDataSourceFactory
     /**
      * @see org.apache.torque.dsfactory.DataSourceFactory#initialize
      */
+    @Override
     public void initialize(Configuration configuration) throws TorqueException
     {
         initJNDI(configuration);
@@ -144,13 +146,13 @@ public class JndiDataSourceFactory
         if (c == null || c.isEmpty())
         {
             throw new TorqueException(
-                "JndiDataSourceFactory requires a jndi "
-                    + "path property to lookup the DataSource in JNDI.");
+                    "JndiDataSourceFactory requires a jndi "
+                            + "path property to lookup the DataSource in JNDI.");
         }
 
         try
         {
-            Hashtable<String, Object> env = new Hashtable<String, Object>();
+            Hashtable<String, Object> env = new Hashtable<>();
             for (Iterator<?> i = c.getKeys(); i.hasNext();)
             {
                 String key = (String) i.next();
@@ -199,7 +201,7 @@ public class JndiDataSourceFactory
      * @throws TorqueException if a property set fails
      */
     private void initDataSource(Configuration configuration)
-        throws TorqueException
+            throws TorqueException
     {
         log.debug("Starting initDataSource");
         try
@@ -261,6 +263,7 @@ public class JndiDataSourceFactory
      * Does nothing. We do not want to close a dataSource retrieved from Jndi,
      * because other applications might use it as well.
      */
+    @Override
     public void close()
     {
         // do nothing
@@ -288,7 +291,7 @@ public class JndiDataSourceFactory
      * @throws Exception
      */
     private void bindDStoJndi(Context ctx, String path, Object ds)
-        throws Exception
+            throws Exception
     {
         debugCtx(ctx);
 
@@ -317,8 +320,8 @@ public class JndiDataSourceFactory
                 catch (NamingException ne)
                 {
                     log.debug("Naming exception caught "
-                                + "when creating subcontext"
-                                + subctx,
+                            + "when creating subcontext"
+                            + subctx,
                             ne);
                     // even though there is a specific exception
                     // for this condition, some implementations

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPool2DataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPool2DataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPool2DataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPool2DataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -36,12 +36,12 @@ import org.apache.torque.TorqueException
  * @version $Id: PerUserPoolDataSourceFactory.java 1485956 2013-05-24 07:55:47Z tfischer $
  */
 public class PerUserPool2DataSourceFactory
-    extends AbstractDataSourceFactory
+extends AbstractDataSourceFactory
 {
 
     /** The log. */
     private static Log log
-            = LogFactory.getLog(PerUserPool2DataSourceFactory.class);
+    = LogFactory.getLog(PerUserPool2DataSourceFactory.class);
 
     /** The wrapped <code>DataSource</code>. */
     private PerUserPoolDataSource ds = null;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -37,12 +37,12 @@ import org.apache.torque.TorqueException
  * @version $Id$
  */
 public class PerUserPoolDataSourceFactory
-    extends AbstractDataSourceFactory
+extends AbstractDataSourceFactory
 {
 
     /** The log. */
     private static Log log
-            = LogFactory.getLog(PerUserPoolDataSourceFactory.class);
+    = LogFactory.getLog(PerUserPoolDataSourceFactory.class);
 
     /** The wrapped <code>DataSource</code>. */
     private PerUserPoolDataSource ds = null;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPool2DataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPool2DataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPool2DataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPool2DataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -36,12 +36,12 @@ import org.apache.torque.TorqueException
  * @version $Id: SharedPoolDataSourceFactory.java 1485956 2013-05-24 07:55:47Z tfischer $
  */
 public class SharedPool2DataSourceFactory
-    extends AbstractDataSourceFactory
+extends AbstractDataSourceFactory
 {
 
     /** The log. */
     private static Log log
-            = LogFactory.getLog(SharedPool2DataSourceFactory.class);
+    = LogFactory.getLog(SharedPool2DataSourceFactory.class);
 
     /** The wrapped <code>DataSource</code>. */
     private SharedPoolDataSource ds = null;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java Mon Aug 27 09:48:33 2018
@@ -37,12 +37,12 @@ import org.apache.torque.TorqueException
  * @version $Id$
  */
 public class SharedPoolDataSourceFactory
-    extends AbstractDataSourceFactory
+extends AbstractDataSourceFactory
 {
 
     /** The log. */
     private static Log log
-            = LogFactory.getLog(SharedPoolDataSourceFactory.class);
+    = LogFactory.getLog(SharedPoolDataSourceFactory.class);
 
     /** The wrapped <code>DataSource</code>. */
     private SharedPoolDataSource ds = null;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java Mon Aug 27 09:48:33 2018
@@ -53,7 +53,7 @@ import org.apache.torque.om.Persistent;
  * @version $Id$
  */
 public abstract class AbstractBaseManager<T extends Persistent>
-    implements Serializable
+implements Serializable
 {
     /** serial version */
     private static final long serialVersionUID = 509798299473481305L;
@@ -83,11 +83,11 @@ public abstract class AbstractBaseManage
     private boolean isNew = true;
 
     /** The fields which are valid fields of interest for a listener. */
-    private CopyOnWriteArraySet<Column> validFields = new CopyOnWriteArraySet<Column>();
+    private CopyOnWriteArraySet<Column> validFields = new CopyOnWriteArraySet<>();
 
     /** The listeners for this manager. */
     private ConcurrentMap<Column, CopyOnWriteArrayList<CacheListener<?>>> listenersMap =
-        new ConcurrentHashMap<Column, CopyOnWriteArrayList<CacheListener<?>>>();
+            new ConcurrentHashMap<>();
 
     /**
      * Get the Class instance
@@ -127,7 +127,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected T getOMInstance()
-        throws TorqueException
+            throws TorqueException
     {
         try
         {
@@ -161,7 +161,7 @@ public abstract class AbstractBaseManage
      */
     @SuppressWarnings("unchecked")
     public void setClassName(final String v)
-        throws TorqueException
+            throws TorqueException
     {
         this.className = v;
 
@@ -195,7 +195,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected T getOMInstance(final ObjectKey id)
-        throws TorqueException
+            throws TorqueException
     {
         return getOMInstance(id, true);
     }
@@ -210,7 +210,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected T getOMInstance(final ObjectKey key, final boolean fromCache)
-        throws TorqueException
+            throws TorqueException
     {
         T om = null;
         if (fromCache)
@@ -253,7 +253,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected void clearImpl()
-        throws TorqueException
+            throws TorqueException
     {
         if (cache != null)
         {
@@ -301,7 +301,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected T removeInstanceImpl(final ObjectKey key)
-        throws TorqueException
+            throws TorqueException
     {
         T oldOm = null;
         if (cache != null)
@@ -322,7 +322,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected T putInstanceImpl(final T om)
-        throws TorqueException
+            throws TorqueException
     {
         ObjectKey key = om.getPrimaryKey();
         return putInstanceImpl(key, om);
@@ -339,13 +339,13 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected T putInstanceImpl(final ObjectKey key, final T om)
-        throws TorqueException
+            throws TorqueException
     {
         if (getOMClass() != null && !getOMClass().isInstance(om))
         {
             throw new TorqueException(om + "; class=" + om.getClass().getName()
-                + "; id=" + om.getPrimaryKey() + " cannot be cached with "
-                + getOMClass().getName() + " objects");
+                    + "; id=" + om.getPrimaryKey() + " cannot be cached with "
+                    + getOMClass().getName() + " objects");
         }
 
         T oldOm = null;
@@ -366,7 +366,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected abstract T retrieveStoredOM(ObjectKey id)
-        throws TorqueException;
+            throws TorqueException;
 
     /**
      * Gets a list of om's based on id's.
@@ -377,7 +377,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected List<T> getOMs(final ObjectKey ...ids)
-        throws TorqueException
+            throws TorqueException
     {
         return getOMs(Arrays.asList(ids));
     }
@@ -391,7 +391,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected List<T> getOMs(final List<? extends ObjectKey>  ids)
-        throws TorqueException
+            throws TorqueException
     {
         return getOMs(ids, true);
     }
@@ -409,14 +409,14 @@ public abstract class AbstractBaseManage
     protected List<T> getOMs(
             final List<? extends ObjectKey> ids,
             final boolean fromCache)
-        throws TorqueException
+                    throws TorqueException
     {
-        List<T> oms = new ArrayList<T>();
+        List<T> oms = new ArrayList<>();
         if (ids != null && ids.size() > 0)
         {
             // start a new list where we will replace the id's with om's
-            Map<ObjectKey, T> omsMap = new HashMap<ObjectKey, T>();
-            List<ObjectKey> newIds = new ArrayList<ObjectKey>(ids.size());
+            Map<ObjectKey, T> omsMap = new HashMap<>();
+            List<ObjectKey> newIds = new ArrayList<>(ids.size());
             ids.forEach(key ->
             {
                 T om = null;
@@ -462,7 +462,7 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     protected abstract List<T> retrieveStoredOMs(List<? extends ObjectKey> ids)
-        throws TorqueException;
+            throws TorqueException;
 
     /**
      * Get the cache region used for JCS.
@@ -482,21 +482,21 @@ public abstract class AbstractBaseManage
      *         rethrown wrapped into a TorqueException.
      */
     public void setRegion(final String v)
-        throws TorqueException
+            throws TorqueException
     {
         this.region = v;
         try
         {
             if (Torque.getConfiguration().getBoolean(Torque.CACHE_KEY, false))
             {
-             if (cache != null)
-             {
-             cache.dispose();
-             }
-             if (groupCache != null)
-             {
-             groupCache.dispose();
-             }
+                if (cache != null)
+                {
+                    cache.dispose();
+                }
+                if (groupCache != null)
+                {
+                    groupCache.dispose();
+                }
                 cache = JCS.getInstance(getRegion());
                 // FIXME: This is actually the same cache instance which will cause cross-effects
                 groupCache = JCS.getGroupCacheInstance(getRegion());
@@ -554,7 +554,7 @@ public abstract class AbstractBaseManage
             // Peer.column names are the fields
             if (validFields.contains(key))
             {
-                CopyOnWriteArrayList<CacheListener<?>> newList = new CopyOnWriteArrayList<CacheListener<?>>();
+                CopyOnWriteArrayList<CacheListener<?>> newList = new CopyOnWriteArrayList<>();
                 CopyOnWriteArrayList<CacheListener<?>> listeners = listenersMap.putIfAbsent(key, newList);
 
                 if (listeners == null)
@@ -614,7 +614,7 @@ public abstract class AbstractBaseManage
      * @throws IOException
      */
     private void writeObject(final java.io.ObjectOutputStream out)
-        throws IOException
+            throws IOException
     {
         out.defaultWriteObject();
     }
@@ -627,7 +627,7 @@ public abstract class AbstractBaseManage
      * @throws ClassNotFoundException
      */
     private void readObject(final ObjectInputStream in)
-        throws IOException, ClassNotFoundException
+            throws IOException, ClassNotFoundException
     {
         in.defaultReadObject();
         // initialize the cache
@@ -641,7 +641,7 @@ public abstract class AbstractBaseManage
         catch (TorqueException e)
         {
             log.error("Cache could not be initialized for region '"
-                      + region + "' after deserialization");
+                    + region + "' after deserialization");
         }
     }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodCacheKey.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodCacheKey.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodCacheKey.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodCacheKey.java Mon Aug 27 09:48:33 2018
@@ -114,8 +114,8 @@ public class MethodCacheKey implements S
         MethodCacheKey methodCacheKey = (MethodCacheKey) obj;
         EqualsBuilder equalsBuilder = new EqualsBuilder();
         equalsBuilder.append(methodCacheKey.method, method)
-                .append(methodCacheKey.instanceOrClass, instanceOrClass)
-                .append(methodCacheKey.args, args);
+        .append(methodCacheKey.instanceOrClass, instanceOrClass)
+        .append(methodCacheKey.args, args);
         return equalsBuilder.isEquals();
     }
 
@@ -124,8 +124,8 @@ public class MethodCacheKey implements S
     {
         HashCodeBuilder hashCodeBuilder = new HashCodeBuilder();
         hashCodeBuilder.append(method)
-                .append(instanceOrClass)
-                .append(args);
+        .append(instanceOrClass)
+        .append(args);
         return hashCodeBuilder.toHashCode();
     }
 

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java Mon Aug 27 09:48:33 2018
@@ -76,7 +76,7 @@ public class MethodResultCache
             catch (CacheException ce)
             {
                 log.error(new TorqueException(
-                    "Could not clear cache due to internal JCS error.", ce));
+                        "Could not clear cache due to internal JCS error.", ce));
             }
         }
     }
@@ -99,7 +99,7 @@ public class MethodResultCache
 
 
     protected Object putImpl(MethodCacheKey key, Object value)
-        throws TorqueException
+            throws TorqueException
     {
         String group = key.getGroupKey();
 
@@ -114,7 +114,7 @@ public class MethodResultCache
             catch (CacheException ce)
             {
                 throw new TorqueException
-                    ("Could not cache due to internal JCS error", ce);
+                ("Could not cache due to internal JCS error", ce);
             }
         }
         return old;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java Mon Aug 27 09:48:33 2018
@@ -31,7 +31,7 @@ import org.apache.torque.TorqueException
  * @version $Id$
  */
 public class NoOpMethodResultCache
-    extends MethodResultCache
+extends MethodResultCache
 {
     public NoOpMethodResultCache(final GroupCacheAccess<MethodCacheKey, Object> cache)
     {
@@ -44,7 +44,7 @@ public class NoOpMethodResultCache
     @Override
     public void clear()
     {
-       //empty
+        //empty
     }
 
     /**

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java Mon Aug 27 09:48:33 2018
@@ -104,8 +104,8 @@ public class ColumnMap extends OptionSup
 
     /** Associated of inheritance maps. */
     private final Map<String, InheritanceMap> inheritanceMaps
-            = Collections.synchronizedMap(
-                   new LinkedHashMap<String, InheritanceMap>());
+    = Collections.synchronizedMap(
+            new LinkedHashMap<String, InheritanceMap>());
 
     /** Java naming method the generator used. */
     private String javaNamingMethod;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java Mon Aug 27 09:48:33 2018
@@ -62,30 +62,30 @@ public class DatabaseMap extends OptionS
      * specific map
      */
     public static final String INIT_CLASS_NAME_FORMAT =
-                                "org.apache.torque.linkage.{0}DatabaseMapInit";
+            "org.apache.torque.linkage.{0}DatabaseMapInit";
 
     /** Error Message for class not found. */
     private static final String ERROR_MESSAGES_CLASS_NOT_FOUND
-        = "Invalid Torque OM setup for Database \"{0}\".\n"
+    = "Invalid Torque OM setup for Database \"{0}\".\n"
             + "Database Map initialization class, \"{1}\"," + " "
             + "could not be found in your classpath.";
 
     /** Error Message for dependent class not found. */
     private static final String ERROR_MESSAGES_DEPENDENT_CLASS_NOT_FOUND
-        = "Invalid Torque OM setup for Database \"{0}\".\n"
+    = "Invalid Torque OM setup for Database \"{0}\".\n"
             + "A class that the Database Map initialization class, \"{1}\", "
             + "depends on could not be found.";
 
     /** Error Message for class for name error. */
     private static final String ERROR_MESSAGES_CLASS_FOR_NAME =
-        "Invalid Torque OM setup for Database \"{0}\".\n"
-        + "Something unexpected happened doing Class.forName(\"{1}\").  "
-        + "See the nested exception for details.";
+            "Invalid Torque OM setup for Database \"{0}\".\n"
+                    + "Something unexpected happened doing Class.forName(\"{1}\").  "
+                    + "See the nested exception for details.";
 
     /** Error Message for class for init error. */
     private static final String ERROR_MESSAGES_INIT =
-        "Invalid Torque OM setup for Database \"{0}\".\n"
-        + "An error occured invoking the init() method in class, \"{1}\"";
+            "Invalid Torque OM setup for Database \"{0}\".\n"
+                    + "An error occured invoking the init() method in class, \"{1}\"";
 
     /**
      * The name of the database where this databaseMap belongs to,
@@ -95,7 +95,7 @@ public class DatabaseMap extends OptionS
 
     /** Name of the tables in the database. */
     private final Map<String, TableMap> tables
-        = Collections.synchronizedMap(new LinkedHashMap<String, TableMap>());
+    = Collections.synchronizedMap(new LinkedHashMap<String, TableMap>());
 
     /** The id Table. */
     private TableMap idTable = null;
@@ -274,8 +274,8 @@ public class DatabaseMap extends OptionS
         }
         String initClassName = MessageFormat.format(INIT_CLASS_NAME_FORMAT,
                 new Object[] {
-                    javanameMethod(name)
-                });
+                        javanameMethod(name)
+        });
 
         Class<?> initClass = null;
         try
@@ -344,7 +344,7 @@ public class DatabaseMap extends OptionS
     {
         StringBuilder result = new StringBuilder();
         StringTokenizer tok = new StringTokenizer
-            (schemaName, String.valueOf(STD_SEPARATOR_CHAR));
+                (schemaName, String.valueOf(STD_SEPARATOR_CHAR));
         while (tok.hasMoreTokens())
         {
             String namePart = (String) tok.nextElement();
@@ -357,7 +357,7 @@ public class DatabaseMap extends OptionS
         result = new StringBuilder();
 
         tok = new StringTokenizer
-            (schemaName, String.valueOf(SCHEMA_SEPARATOR_CHAR));
+                (schemaName, String.valueOf(SCHEMA_SEPARATOR_CHAR));
         while (tok.hasMoreTokens())
         {
             String namePart = (String) tok.nextElement();
@@ -387,8 +387,8 @@ public class DatabaseMap extends OptionS
     {
         StringBuilder result = new StringBuilder();
         result.append("DatabaseMap[name=")
-             .append(name)
-             .append(", tables=(");
+        .append(name)
+        .append(", tables=(");
         boolean first = true;
         for (TableMap table : tables.values())
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ForeignKeyMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ForeignKeyMap.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ForeignKeyMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ForeignKeyMap.java Mon Aug 27 09:48:33 2018
@@ -52,7 +52,7 @@ public class ForeignKeyMap implements Se
     private String foreignTableName;
 
     /** The column pairs for the foreign key, not null, not empty, */
-    private final List<ColumnPair> columns = new ArrayList<ColumnPair>();
+    private final List<ColumnPair> columns = new ArrayList<>();
 
     /**
      * Constructor.
@@ -138,9 +138,9 @@ public class ForeignKeyMap implements Se
             if (foreignTable == null)
             {
                 throw new IllegalStateException(
-                    "Map builder for "
-                        + foreignTableName
-                        + " was not yet built.");
+                        "Map builder for "
+                                + foreignTableName
+                                + " was not yet built.");
             }
             foreignTableName = null;
         }
@@ -304,7 +304,7 @@ public class ForeignKeyMap implements Se
                 {
                     throw new IllegalStateException(
                             "Table " + foreignKeyMap.getForeignTableName()
-                                + " has no column named " + foreignName);
+                            + " has no column named " + foreignName);
                 }
             }
             return foreign;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java Mon Aug 27 09:48:33 2018
@@ -56,10 +56,10 @@ public final class MapHelper
      * @throws TorqueException possibly if Torque is not initialized.
      */
     public static TableMap getTableMap(
-                final Object possibleColumn,
-                final Criteria criteria,
-                final TableMap defaultTableMap)
-            throws TorqueException
+            final Object possibleColumn,
+            final Criteria criteria,
+            final TableMap defaultTableMap)
+                    throws TorqueException
     {
         if (!(possibleColumn instanceof Column))
         {
@@ -121,9 +121,9 @@ public final class MapHelper
      *         databaseName is null.
      */
     public static ColumnMap getColumnMap(
-                Column column,
-                final Criteria criteria)
-            throws TorqueException
+            Column column,
+            final Criteria criteria)
+                    throws TorqueException
     {
         String tableName = column.getTableName();
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/OptionSupport.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/OptionSupport.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/OptionSupport.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/OptionSupport.java Mon Aug 27 09:48:33 2018
@@ -39,7 +39,7 @@ public abstract class OptionSupport impl
     private static final long serialVersionUID = 1L;
 
     /** Associated options. */
-    private final Map<String, String> optionsMap = new ConcurrentHashMap<String, String>();
+    private final Map<String, String> optionsMap = new ConcurrentHashMap<>();
 
     /**
      * Returns an unmodifiable map of all options.

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java Mon Aug 27 09:48:33 2018
@@ -57,11 +57,11 @@ public class TableMap extends OptionSupp
 
     /** The columns in the table. XML Order is preserved. */
     private final Map<String, ColumnMap> columns
-            = Collections.synchronizedMap(
-                new LinkedHashMap<String, ColumnMap>());
+    = Collections.synchronizedMap(
+            new LinkedHashMap<String, ColumnMap>());
 
     /** The foreign keys in the table. XML Order is preserved. */
-    private final List<ForeignKeyMap> foreignKeys = new ArrayList<ForeignKeyMap>();
+    private final List<ForeignKeyMap> foreignKeys = new ArrayList<>();
 
     /** The database this table belongs to. */
     private DatabaseMap dbMap;
@@ -111,7 +111,7 @@ public class TableMap extends OptionSupp
      * different for different id methods.
      */
     private final Map<IDMethod, Object> pkInfoMap
-            = new HashMap<IDMethod, Object>();
+    = new HashMap<>();
 
     /**
      * Constructor.
@@ -136,8 +136,8 @@ public class TableMap extends OptionSupp
      * @param containingDB A DatabaseMap that this table belongs to.
      */
     public TableMap(String tableName,
-                    String prefix,
-                    DatabaseMap containingDB)
+            String prefix,
+            DatabaseMap containingDB)
     {
         setTableName(tableName);
         this.prefix = prefix;
@@ -635,7 +635,7 @@ public class TableMap extends OptionSupp
     public ColumnMap getPrimaryKey()
             throws TorqueException
     {
-        Set<ColumnMap> result = new HashSet<ColumnMap>();
+        Set<ColumnMap> result = new HashSet<>();
 
         columns.values().forEach(column ->
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java Mon Aug 27 09:48:33 2018
@@ -73,8 +73,9 @@ public abstract class AbstractIdGenerato
      *
      * @throws TorqueException if a database error occurs.
      */
+    @Override
     public int getIdAsInt(final Connection connection, final Object keyInfo)
-        throws TorqueException
+            throws TorqueException
     {
         return getId(connection, keyInfo, new IntegerMapper());
     }
@@ -89,8 +90,9 @@ public abstract class AbstractIdGenerato
      *
      * @throws TorqueException if a database error occurs.
      */
+    @Override
     public long getIdAsLong(final Connection connection, final Object keyInfo)
-        throws TorqueException
+            throws TorqueException
     {
         return getId(connection, keyInfo, new LongMapper());
     }
@@ -105,8 +107,9 @@ public abstract class AbstractIdGenerato
      *
      * @throws TorqueException if a database error occurs.
      */
+    @Override
     public BigDecimal getIdAsBigDecimal(final Connection connection, final Object keyInfo)
-        throws TorqueException
+            throws TorqueException
     {
         return getId(connection, keyInfo, new BigDecimalMapper());
     }
@@ -122,8 +125,9 @@ public abstract class AbstractIdGenerato
      *
      * @throws TorqueException if a database error occurs.
      */
+    @Override
     public String getIdAsString(final Connection connection, final Object keyInfo)
-        throws TorqueException
+            throws TorqueException
     {
         return getId(connection, keyInfo, new StringMapper());
     }
@@ -133,6 +137,7 @@ public abstract class AbstractIdGenerato
      *
      * @return a <code>boolean</code> value
      */
+    @Override
     public abstract boolean isPriorToInsert();
 
     /**
@@ -140,6 +145,7 @@ public abstract class AbstractIdGenerato
      *
      * @return a <code>boolean</code> value
      */
+    @Override
     public abstract boolean isPostInsert();
 
     /**
@@ -148,6 +154,7 @@ public abstract class AbstractIdGenerato
      *
      * @return a <code>boolean</code> value
      */
+    @Override
     public abstract boolean isConnectionRequired();
 
     /**
@@ -162,14 +169,14 @@ public abstract class AbstractIdGenerato
      * @throws TorqueException if a database error occurs.
      */
     protected <T> T getId(
-                final Connection connection,
-                final Object keyInfo,
-                final RecordMapper<T> mapper)
-            throws TorqueException
+            final Connection connection,
+            final Object keyInfo,
+            final RecordMapper<T> mapper)
+                    throws TorqueException
     {
         String idSql = getIdSql(keyInfo);
 
-        BasePeerImpl<T> peer = new BasePeerImpl<T>(mapper, null, databaseName);
+        BasePeerImpl<T> peer = new BasePeerImpl<>(mapper, null, databaseName);
         List<T> result = peer.doSelect(idSql, connection);
         return result.get(0);
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java Mon Aug 27 09:48:33 2018
@@ -126,7 +126,7 @@ public class IDBroker implements Runnabl
      * Value: List of Integer IDs.
      */
     private final ConcurrentMap<String, List<BigDecimal>> ids
-            = new ConcurrentHashMap<String, List<BigDecimal>>(DEFAULT_SIZE);
+    = new ConcurrentHashMap<>(DEFAULT_SIZE);
 
     /**
      * The quantity of ids to grab for each table.
@@ -135,7 +135,7 @@ public class IDBroker implements Runnabl
      * Value: Integer quantity.
      */
     private final ConcurrentMap<String, BigDecimal> quantityStore
-        = new ConcurrentHashMap<String, BigDecimal>(DEFAULT_SIZE);
+    = new ConcurrentHashMap<>(DEFAULT_SIZE);
 
     /**
      * The last time this IDBroker queried the database for ids.
@@ -144,7 +144,7 @@ public class IDBroker implements Runnabl
      * Value: Date of last id request.
      */
     private final ConcurrentMap<String, java.util.Date> lastQueryTime
-            = new ConcurrentHashMap<String, java.util.Date>(DEFAULT_SIZE);
+    = new ConcurrentHashMap<>(DEFAULT_SIZE);
 
     /**
      * Amount of time for the thread to sleep
@@ -174,19 +174,19 @@ public class IDBroker implements Runnabl
 
     /** property name */
     private static final String DB_IDBROKER_CLEVERQUANTITY =
-        "idbroker.clever.quantity";
+            "idbroker.clever.quantity";
 
     /** property name */
     private static final String DB_IDBROKER_CLEVERQUANTITY_MAX =
-        "idbroker.clever.quantity.max";
+            "idbroker.clever.quantity.max";
 
     /** property name */
     private static final String DB_IDBROKER_PREFETCH =
-        "idbroker.prefetch";
+            "idbroker.prefetch";
 
     /** property name */
     private static final String DB_IDBROKER_USENEWCONNECTION =
-        "idbroker.usenewconnection";
+            "idbroker.usenewconnection";
 
     /** the log */
     private final Log log = LogFactory.getLog(IDBroker.class);
@@ -313,8 +313,8 @@ public class IDBroker implements Runnabl
      */
     @Override
     public BigDecimal getIdAsBigDecimal(Connection connection,
-                                        Object tableName)
-            throws TorqueException
+            Object tableName)
+                    throws TorqueException
     {
         BigDecimal[] id = getNextIds((String) tableName, 1, connection);
         return id[0];
@@ -392,8 +392,8 @@ public class IDBroker implements Runnabl
      * @exception Exception Database error.
      */
     public BigDecimal[] getNextIds(String tableName,
-                                                int numOfIdsToReturn)
-        throws Exception
+            int numOfIdsToReturn)
+                    throws Exception
     {
         return getNextIds(tableName, numOfIdsToReturn, null);
     }
@@ -412,9 +412,9 @@ public class IDBroker implements Runnabl
      * @exception TorqueException on a database error.
      */
     public synchronized BigDecimal[] getNextIds(String tableName,
-                                                int numOfIdsToReturn,
-                                                Connection connection)
-            throws TorqueException
+            int numOfIdsToReturn,
+            Connection connection)
+                    throws TorqueException
     {
         if (tableName == null)
         {
@@ -444,7 +444,7 @@ public class IDBroker implements Runnabl
                 else
                 {
                     log.debug("Forced id retrieval - " + availableIds.size()
-                            + " ids still available for table " + tableName);
+                    + " ids still available for table " + tableName);
                 }
             }
             storeIDs(tableName, true, connection);
@@ -478,14 +478,14 @@ public class IDBroker implements Runnabl
      * @exception Exception if another error occurs.
      */
     public boolean exists(String tableName)
-        throws Exception
+            throws Exception
     {
         String query = new StringBuilder()
-            .append("select ")
-            .append(TABLE_NAME)
-            .append(" where ")
-            .append(TABLE_NAME).append("='").append(tableName).append('\'')
-            .toString();
+                .append("select ")
+                .append(TABLE_NAME)
+                .append(" where ")
+                .append(TABLE_NAME).append("='").append(tableName).append('\'')
+                .toString();
 
         boolean exists = false;
         try (TorqueConnection dbCon = Transaction.begin(databaseName))
@@ -543,13 +543,13 @@ public class IDBroker implements Runnabl
                         if (log.isDebugEnabled())
                         {
                             log.debug("Retrieved more ids for table: "
-                                + tableName);
+                                    + tableName);
                         }
                     }
                     catch (Exception exc)
                     {
                         log.error("There was a problem getting new IDs "
-                                     + "for table: " + tableName, exc);
+                                + "for table: " + tableName, exc);
                     }
                 }
             });
@@ -592,7 +592,7 @@ public class IDBroker implements Runnabl
         // Check if quantity changing is switched on.
         // If prefetch is turned off, changing quantity does not make sense
         if (!configuration.getBoolean(DB_IDBROKER_CLEVERQUANTITY, true)
-            || !configuration.getBoolean(DB_IDBROKER_PREFETCH, true))
+                || !configuration.getBoolean(DB_IDBROKER_PREFETCH, true))
         {
             return;
         }
@@ -607,11 +607,11 @@ public class IDBroker implements Runnabl
             long nowLong = now.getTime();
             long timeLapse = nowLong - thenLong;
             log.debug("checkTiming(): sleep time was "
-                + timeLapse + " milliseconds for table " + tableName);
+                    + timeLapse + " milliseconds for table " + tableName);
             if (timeLapse < SLEEP_PERIOD)
             {
                 log.debug("checkTiming(): Unscheduled retrieval of ids "
-                            + "for table " + tableName);
+                        + "for table " + tableName);
                 // Increase quantity, so that hopefully this does not
                 // happen again.
                 BigDecimal quantity = getQuantity(tableName, null);
@@ -620,7 +620,7 @@ public class IDBroker implements Runnabl
                 {
                     float rate = quantity.floatValue() / timeLapse;
                     newQuantity
-                            = Math.ceil(SLEEP_PERIOD * rate * SAFETY_MARGIN);
+                    = Math.ceil(SLEEP_PERIOD * rate * SAFETY_MARGIN);
                     log.debug("checkTiming(): calculated new quantity "
                             + newQuantity + " from rate " + rate);
                 }
@@ -668,9 +668,9 @@ public class IDBroker implements Runnabl
      * @exception on a database error.
      */
     private synchronized void storeIDs(String tableName,
-                          boolean adjustQuantity,
-                          Connection connection)
-            throws TorqueException
+            boolean adjustQuantity,
+            Connection connection)
+                    throws TorqueException
     {
         log.debug("storeIDs(): Start retrieving ids from database.");
         BigDecimal nextId = null;
@@ -736,7 +736,7 @@ public class IDBroker implements Runnabl
             throw e;
         }
 
-        List<BigDecimal> newAvailableIds = new ArrayList<BigDecimal>();
+        List<BigDecimal> newAvailableIds = new ArrayList<>();
         List<BigDecimal> availableIds = ids.putIfAbsent(tableName, newAvailableIds);
         if (availableIds == null)
         {
@@ -847,14 +847,14 @@ public class IDBroker implements Runnabl
     {
         StringBuilder stmt = new StringBuilder();
         stmt.append("SELECT ")
-            .append(COL_NEXT_ID)
-            .append(", ")
-            .append(COL_QUANTITY)
-            .append(" FROM ")
-            .append(ID_TABLE)
-            .append(" WHERE ")
-            .append(COL_TABLE_NAME)
-            .append(" = ?");
+        .append(COL_NEXT_ID)
+        .append(", ")
+        .append(COL_QUANTITY)
+        .append(" FROM ")
+        .append(ID_TABLE)
+        .append(" WHERE ")
+        .append(COL_TABLE_NAME)
+        .append(" = ?");
 
         BigDecimal[] results = new BigDecimal[2];
 
@@ -897,21 +897,21 @@ public class IDBroker implements Runnabl
      * @exception TorqueException Database error.
      */
     private void updateNextId(Connection con, String tableName, String id)
-        throws TorqueException
+            throws TorqueException
     {
 
 
         StringBuilder stmt = new StringBuilder();
         stmt.append("UPDATE " + ID_TABLE)
-            .append(" SET ")
-            .append(COL_NEXT_ID)
-            .append(" = ")
-            .append(id)
-            .append(" WHERE ")
-            .append(COL_TABLE_NAME)
-            .append(" = '")
-            .append(tableName)
-            .append('\'');
+        .append(" SET ")
+        .append(COL_NEXT_ID)
+        .append(" = ")
+        .append(id)
+        .append(" WHERE ")
+        .append(COL_TABLE_NAME)
+        .append(" = '")
+        .append(tableName)
+        .append('\'');
 
         if (log.isDebugEnabled())
         {
@@ -938,23 +938,23 @@ public class IDBroker implements Runnabl
      * @exception TorqueException Database error.
      */
     protected void updateQuantity(Connection con, String tableName,
-                                BigDecimal quantity)
-            throws TorqueException
+            BigDecimal quantity)
+                    throws TorqueException
     {
         log.debug("updateQuantity(): start for table " + tableName
                 + " and quantity " + quantity);
         StringBuilder stmt = new StringBuilder();
         stmt.append("UPDATE ")
-            .append(ID_TABLE)
-            .append(" SET ")
-            .append(COL_QUANTITY)
-            .append(" = ")
-            .append(quantity)
-            .append(" WHERE ")
-            .append(COL_TABLE_NAME)
-            .append(" = '")
-            .append(tableName)
-            .append('\'');
+        .append(ID_TABLE)
+        .append(" SET ")
+        .append(COL_QUANTITY)
+        .append(" = ")
+        .append(quantity)
+        .append(" WHERE ")
+        .append(COL_TABLE_NAME)
+        .append(" = '")
+        .append(tableName)
+        .append('\'');
 
         if (log.isDebugEnabled())
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDGeneratorFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDGeneratorFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDGeneratorFactory.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDGeneratorFactory.java Mon Aug 27 09:48:33 2018
@@ -43,7 +43,7 @@ public final class IDGeneratorFactory
 
     static
     {
-        List<IDMethod> idGeneratorMethods = new ArrayList<IDMethod>();
+        List<IDMethod> idGeneratorMethods = new ArrayList<>();
         idGeneratorMethods.add(IDMethod.NATIVE);
         idGeneratorMethods.add(IDMethod.AUTO_INCREMENT);
         idGeneratorMethods.add(IDMethod.SEQUENCE);

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IdGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IdGenerator.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IdGenerator.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IdGenerator.java Mon Aug 27 09:48:33 2018
@@ -51,7 +51,7 @@ public interface IdGenerator
      * @exception TorqueException if a Database error occurs.
      */
     int getIdAsInt(Connection connection, Object keyInfo)
-        throws TorqueException;
+            throws TorqueException;
 
     /**
      * Returns an id as a primitive long.
@@ -77,7 +77,7 @@ public interface IdGenerator
      * @exception TorqueException if a Database error occurs.
      */
     BigDecimal getIdAsBigDecimal(Connection connection, Object keyInfo)
-        throws TorqueException;
+            throws TorqueException;
 
     /**
      * Returns an id as a String.
@@ -90,7 +90,7 @@ public interface IdGenerator
      * @exception TorqueException if a Database error occurs.
      */
     String getIdAsString(Connection connection, Object keyInfo)
-        throws TorqueException;
+            throws TorqueException;
 
     /**
      * A flag to determine the timing of the id generation

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/SequenceIdGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/SequenceIdGenerator.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/SequenceIdGenerator.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/SequenceIdGenerator.java Mon Aug 27 09:48:33 2018
@@ -47,6 +47,7 @@ public class SequenceIdGenerator extends
      *
      * @return a <code>boolean</code> value
      */
+    @Override
     public boolean isPriorToInsert()
     {
         return true;
@@ -57,6 +58,7 @@ public class SequenceIdGenerator extends
      *
      * @return a <code>boolean</code> value
      */
+    @Override
     public boolean isPostInsert()
     {
         return false;
@@ -68,6 +70,7 @@ public class SequenceIdGenerator extends
      *
      * @return a <code>boolean</code> value
      */
+    @Override
     public boolean isConnectionRequired()
     {
         return true;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/BooleanKey.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/BooleanKey.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/BooleanKey.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/BooleanKey.java Mon Aug 27 09:48:33 2018
@@ -77,6 +77,7 @@ public class BooleanKey extends SimpleKe
      *
      * @param key the key value
      */
+    @Override
     public void setValue(String key)
     {
         if (key == null)
@@ -132,6 +133,7 @@ public class BooleanKey extends SimpleKe
      *
      * @return <code>Types.BIT</code>.
      */
+    @Override
     public int getJdbcType()
     {
         return Types.BIT;



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]