Jenkins build is still unstable: Torque4-trunk #592

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator #592

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is back to stable : Torque4-trunk » Torque Generator Maven 2 Plugin #592

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839308 - /db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java

[tv]

Author: tv
Date: Mon Aug 27 12:43:59 2018
New Revision: 1839308

URL: http://svn.apache.org/viewvc?rev=1839308&view=rev
Log:
Try to fix Jenkins test failure

Modified:

db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java

Modified: 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java?rev=1839308&r1=1839307&r2=1839308&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
 Mon Aug 27 12:43:59 2018
@@ -53,20 +53,20 @@ public class PackageResourcesTest
 this.getClass().getClassLoader());
 List jarFiles = packageResources.getJarFiles();
 boolean foundCommonsBeanutils = false;
-boolean foundCommonsCollections = false;
+boolean foundCommonsLang = false;
 for (JarFile jarFile : jarFiles)
 {
 String name = jarFile.getName();
-if (name.contains("commons-collections"))
+if (name.contains("commons-lang"))
 {
-foundCommonsCollections = true;
+foundCommonsLang = true;
 }
 if (name.contains("commons-beanutils"))
 {
 foundCommonsBeanutils = true;
 }
 }
-assertTrue(foundCommonsCollections);
+assertTrue(foundCommonsLang);
 assertTrue(foundCommonsBeanutils);
 
 List directories = packageResources.getDirectories();
@@ -105,20 +105,20 @@ public class PackageResourcesTest
 this.getClass().getClassLoader());
 List jarFiles = packageResources.getJarFiles();
 boolean foundCommonsBeanutils = false;
-boolean foundCommonsCollections = false;
+boolean foundCommonsLang = false;
 for (JarFile jarFile : jarFiles)
 {
 String name = jarFile.getName();
-if (name.contains("commons-collections"))
+if (name.contains("commons-lang"))
 {
-foundCommonsCollections = true;
+foundCommonsLang = true;
 }
 if (name.contains("commons-beanutils"))
 {
 foundCommonsBeanutils = true;
 }
 }
-assertTrue(foundCommonsCollections);
+assertTrue(foundCommonsLang);
 assertTrue(foundCommonsBeanutils);
 
 List directories = packageResources.getDirectories();



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839307 - /db/torque/torque4/trunk/torque-maven-plugin/pom.xml

[tv]

Author: tv
Date: Mon Aug 27 12:35:05 2018
New Revision: 1839307

URL: http://svn.apache.org/viewvc?rev=1839307&view=rev
Log:
Update maven dependency to 3.5.4

Modified:
db/torque/torque4/trunk/torque-maven-plugin/pom.xml

Modified: db/torque/torque4/trunk/torque-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1839307&r1=1839306&r2=1839307&view=diff
==
--- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Mon Aug 27 12:35:05 2018
@@ -111,7 +111,7 @@
   
   
   
-2.2.1
+3.5.4
   
 
 
\ No newline at end of file



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk #591

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is back to stable : Torque4-trunk » Torque Runtime #591

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is back to stable : Torque4-trunk » Torque Generator Ant tasks #591

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator Maven 2 Plugin #591

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is back to stable : Torque4-trunk » Torque Templates #591

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator #591

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839304 - in /db/torque/torque4/trunk/torque-runtime: pom.xml src/main/java/org/apache/torque/TorqueException.java

[tv]

Author: tv
Date: Mon Aug 27 12:19:46 2018
New Revision: 1839304

URL: http://svn.apache.org/viewvc?rev=1839304&view=rev
Log:
Housekeeping

Modified:
db/torque/torque4/trunk/torque-runtime/pom.xml

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java

Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1839304&r1=1839303&r2=1839304&view=diff
==
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Mon Aug 27 12:19:46 2018
@@ -112,9 +112,10 @@
 org.apache.maven.plugins
 maven-surefire-plugin
 
-  
+  
   
-  pertest
+  1
+  false
   
 **/BaseTestCase.java
   

Modified: 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java?rev=1839304&r1=1839303&r2=1839304&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java
 Mon Aug 27 12:19:46 2018
@@ -1,7 +1,5 @@
 package org.apache.torque;
 
-import java.sql.SQLException;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import java.sql.SQLException;
  * under the License.
  */
 
+import java.sql.SQLException;
+
 /**
  * The base class of all checked exceptions thrown by Torque.
  *



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839300 - in /db/torque/torque4/trunk: ./ torque-ant-tasks/ torque-generator/ torque-maven-plugin/ torque-runtime/ torque-site/ torque-site/src/site/xdoc/documentation/orm-reference/ torq

[tv]

Author: tv
Date: Mon Aug 27 11:52:07 2018
New Revision: 1839300

URL: http://svn.apache.org/viewvc?rev=1839300&view=rev
Log:
Housekeeping

Modified:
db/torque/torque4/trunk/NOTICE
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-ant-tasks/NOTICE
db/torque/torque4/trunk/torque-generator/NOTICE
db/torque/torque4/trunk/torque-maven-plugin/NOTICE
db/torque/torque4/trunk/torque-maven-plugin/pom.xml
db/torque/torque4/trunk/torque-runtime/NOTICE
db/torque/torque4/trunk/torque-site/NOTICE

db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml
db/torque/torque4/trunk/torque-templates/NOTICE
db/torque/torque4/trunk/torque-test/NOTICE

Modified: db/torque/torque4/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/NOTICE?rev=1839300&r1=1839299&r2=1839300&view=diff
==
--- db/torque/torque4/trunk/NOTICE (original)
+++ db/torque/torque4/trunk/NOTICE Mon Aug 27 11:52:07 2018
@@ -1,5 +1,5 @@
 Apache DB Torque
-Copyright 2001-2012 The Apache Software Foundation.
+Copyright 2001-2018 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: db/torque/torque4/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1839300&r1=1839299&r2=1839300&view=diff
==
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Mon Aug 27 11:52:07 2018
@@ -34,7 +34,7 @@
   Torque Maven Parent
   4.1-SNAPSHOT
   Torque parent project
-  http://db.apache.org/torque/releases/torque-4.0
+  http://db.apache.org/torque/releases/torque-4.1
 
   
 torque-runtime
@@ -426,20 +426,8 @@
 
   
 org.apache.maven.plugins
-maven-source-plugin
-
-  
-attach-sources
-package
-
-  jar-no-fork
-
-  
-
-  
-  
-org.apache.maven.plugins
 maven-eclipse-plugin
+2.9
 
   ..
   true
@@ -478,7 +466,7 @@
   
 org.codehaus.mojo
 cobertura-maven-plugin
-2.3
+2.7
 
   
 html
@@ -536,14 +524,6 @@
   
 
   org.apache.maven.plugins
-  maven-eclipse-plugin
-  2.9
-  
-true
-  
-
-
-  org.apache.maven.plugins
   maven-pmd-plugin
   3.2
   
@@ -554,12 +534,12 @@
 
   org.apache.maven.plugins
   maven-jxr-plugin
-  2.4
+  2.5
 
 
   org.codehaus.mojo
   findbugs-maven-plugin
-  3.0.3
+  3.0.5
 
 
   org.apache.maven.plugins
@@ -583,11 +563,6 @@
   
 
   
-org.apache.maven.plugins
-maven-javadoc-plugin
-2.10.1
-  
-  
 org.codehaus.mojo
 taglist-maven-plugin
 2.4
@@ -600,6 +575,7 @@
   
 org.apache.rat
 apache-rat-plugin
+0.12
   
 
   

Modified: db/torque/torque4/trunk/torque-ant-tasks/NOTICE
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/NOTICE?rev=1839300&r1=1839299&r2=1839300&view=diff
==
--- db/torque/torque4/trunk/torque-ant-tasks/NOTICE (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/NOTICE Mon Aug 27 11:52:07 2018
@@ -1,5 +1,5 @@
 Apache DB Torque
-Copyright 2001-2012 The Apache Software Foundation.
+Copyright 2001-2018 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: db/torque/torque4/trunk/torque-generator/NOTICE
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/NOTICE?rev=1839300&r1=1839299&r2=1839300&view=diff
==
--- db/torque/torque4/trunk/torque-generator/NOTICE (original)
+++ db/torque/torque4/trunk/torque-generator/NOTICE Mon Aug 27 11:52:07 2018
@@ -1,5 +1,5 @@
 Apache DB Torque
-Copyright 2001-2012 The Apache Software Foundation.
+Copyright 2001-2018 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: db/torque/torque4/trunk/torque-maven-plugin/NOTICE
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/NOTICE?rev=1839300&r1=1839299&r2=1839300&view=diff
==
--- db/torque/torque4/trunk/torque-maven-plugin/NOTICE (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/NOTICE Mon Aug 27

Jenkins build is still unstable: Torque4-trunk #590

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator #590

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator Ant tasks #590

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Templates #590

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Runtime #590

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator Maven 2 Plugin #590

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839291 - /db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java

[tv]

Author: tv
Date: Mon Aug 27 10:00:13 2018
New Revision: 1839291

URL: http://svn.apache.org/viewvc?rev=1839291&view=rev
Log:
Checkstyle is unhappy

Modified:

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java

Modified: 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java?rev=1839291&r1=1839290&r2=1839291&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java
 Mon Aug 27 10:00:13 2018
@@ -189,9 +189,8 @@ public class TorqueConnectionImpl implem
 {
 try
 {
-if (this.committed == false &&
-this.rolledBack == false &&
-connection.getAutoCommit() == false)
+if (!this.committed && !this.rolledBack
+&& !connection.getAutoCommit())
 {
 // calls close on the connection
 Transaction.safeRollback(connection);



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
 (original)
+++ 
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
 Mon Aug 27 09:48:33 2018
@@ -62,7 +62,7 @@ public class SQLModelTransformer impleme
  * @see LoadExternalSchemaTransformer
  */
 private static final LoadExternalSchemaTransformer 
loadExternalSchemaTransformer
-= new LoadExternalSchemaTransformer();
+= new LoadExternalSchemaTransformer();
 
 /**
  * The transformer which includes the included schemata.
@@ -70,21 +70,22 @@ public class SQLModelTransformer impleme
  * @see LoadExternalSchemaTransformer
  */
 private static final IncludeSchemaTransformer includeSchemaTransformer
-= new IncludeSchemaTransformer();
+= new IncludeSchemaTransformer();
 
-   public Database transform(
+@Override
+public Database transform(
 final Object databaseModel,
 final ControllerState controllerState)
-throws SourceTransformerException
+throws SourceTransformerException
 {
-   final Database database = (Database) databaseModel;
-   OMTransformer.setRootDatabaseName(database);
-   // include included schemata
-   includeSchemaTransformer.transform(database, controllerState);
-   // load referenced external schemata
-   loadExternalSchemaTransformer.transform(database, controllerState);
+final Database database = (Database) databaseModel;
+OMTransformer.setRootDatabaseName(database);
+// include included schemata
+includeSchemaTransformer.transform(database, controllerState);
+// load referenced external schemata
+loadExternalSchemaTransformer.transform(database, controllerState);
 
-   TemplateOptionName.checkRequiredOptions(
+TemplateOptionName.checkRequiredOptions(
 controllerState,
 TemplateOptionName.DATABASE);
 
@@ -100,13 +101,13 @@ public class SQLModelTransformer impleme
 final Table table,
 final Database database,
 final ControllerState controllerState)
-throws SourceTransformerException
+throws SourceTransformerException
 {
 table.unqualifiedName = table.name;
 if (StringUtils.contains(table.name, "."))
 {
 table.unqualifiedName
-= table.name.substring(table.name.indexOf(".") + 1);
+= table.name.substring(table.name.indexOf(".") + 1);
 }
 
 if (table.idMethod == null)
@@ -247,7 +248,7 @@ public class SQLModelTransformer impleme
 private String getDdlSql(
 final Column column,
 final ControllerState controllerState)
-throws SourceTransformerException
+throws SourceTransformerException
 {
 final SchemaType schemaType = SchemaTypeHelper.getSchemaType(
 column,
@@ -264,7 +265,7 @@ public class SQLModelTransformer impleme
 column._default);
 final Platform platform = getPlatform(controllerState);
 
-final List resultList = new ArrayList();
+final List resultList = new ArrayList<>();
 
 String sqlTypeName = sqlType.getSqlTypeName();
 
@@ -291,8 +292,8 @@ public class SQLModelTransformer impleme
 else
 {
 final Date defaultDate
-= OMColumnTransformer.getDefaultValueAsDate(
-sqlType.getDefaultValue());
+= OMColumnTransformer.getDefaultValueAsDate(
+sqlType.getDefaultValue());
 if (SchemaType.DATE == schemaType)
 {
 resultList.add(platform.getDateString(defaultDate));
@@ -325,7 +326,7 @@ public class SQLModelTransformer impleme
 final String isNotNullString = platform.getNullString(isNotNull);
 
 if (platform.createNotNullBeforeAutoincrement()
-&& StringUtils.isNotEmpty(isNotNullString))
+&& StringUtils.isNotEmpty(isNotNullString))
 {
 resultList.add(isNotNullString);
 }
@@ -408,7 +409,7 @@ public class SQLModelTransformer impleme
 if (StringUtils.contains(table.name, '.'))
 {
 final String databaseSchema
-= table.name.substrin

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
 Mon Aug 27 09:48:33 2018
@@ -109,13 +109,13 @@ public class VelocityOutlet extends Temp
 ConfigurationProvider configurationProvider,
 String path,
 String encoding)
-throws ConfigurationException
+throws ConfigurationException
 {
 super(name,
-  configurationProvider,
-  path,
-  encoding,
-  new VelocityTemplateFilter());
+configurationProvider,
+path,
+encoding,
+new VelocityTemplateFilter());
 }
 
 /**
@@ -202,7 +202,7 @@ public class VelocityOutlet extends Temp
  */
 @Override
 public OutletResult execute(ControllerState controllerState)
-throws GeneratorException
+throws GeneratorException
 
 {
 if (log.isDebugEnabled())
@@ -244,15 +244,15 @@ public class VelocityOutlet extends Temp
 catch (Exception e)
 {
 log.error("error during execution of outlet "
-+ getName()
-+ " : " + e.getMessage(),
++ getName()
++ " : " + e.getMessage(),
 e);
 throw new GeneratorException(
 "Error during execution of outlet "
-+ getName()
-+ " : "
-+ e.getMessage(),
-e);
++ getName()
++ " : "
++ e.getMessage(),
+e);
 }
 
 return new OutletResult(writer.toString());
@@ -287,7 +287,7 @@ public class VelocityOutlet extends Temp
 {
 // Only consider options visible from the current namespace.
 Options visibleOptions
-= controllerState.getVisibleOptions();
+= controllerState.getVisibleOptions();
 for (Option option : visibleOptions.values())
 {
 QualifiedName qualifiedName = option.getQualifiedName();
@@ -341,11 +341,11 @@ public class VelocityOutlet extends Temp
 // only consider the most significant name.
 Namespace namespace = getName().getNamespace();
 VariableStore variableStore
-= controllerState.getVariableStore();
+= controllerState.getVariableStore();
 QualifiedNameMap visibleVariables
-= variableStore
-.getContent()
-.getInHierarchy(namespace);
+= variableStore
+.getContent()
+.getInHierarchy(namespace);
 for (Variable variable : visibleVariables.values())
 {
 QualifiedName qualifiedName = variable.getName();

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java
 Mon Aug 27 09:48:33 2018
@@ -55,6 +55,7 @@ public class VelocityTemplateFilter impl
  *
  * @throws IOException if creating, reading or writing to a stream fails.
  */
+@Override
 public InputStream filter(InputStream resource, String encoding)
 throws IOException
 {
@@ -135,7 +136,7 @@ public class VelocityTemplateFilter impl
 outputStreamWriter.write(readChar);
 onlySpacesInLineSoFar = false;
 
- }
+}
 }
 }
 outputStreamWriter.write(startLineBuffer.toString());

Modified: 
db/torque/torque4/trunk/torque-g

svn commit: r1839288 [12/20] - in /db/torque/torque4/trunk: torque-ant-tasks/src/main/java/org/apache/torque/ant/task/ torque-generator/src/main/java/org/apache/torque/generator/configuration/ torque-

[tv]

Modified: 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
 Mon Aug 27 09:48:33 2018
@@ -207,9 +207,9 @@ public class BasePeerImpl implements
  * @throws TorqueException Any exceptions caught during processing will be
  * rethrown wrapped into a TorqueException.
  */
- public int doDelete(final Criteria criteria)
- throws TorqueException
- {
+public int doDelete(final Criteria criteria)
+throws TorqueException
+{
 setDbName(criteria);
 try (TorqueConnection connection = 
Transaction.begin(criteria.getDbName()))
 {
@@ -217,12 +217,12 @@ public class BasePeerImpl implements
 Transaction.commit(connection);
 return deletedRows;
 }
- }
+}
 
 /**
  * Deletes rows from a table.  This method is to be used
  * during a transaction, otherwise use the doDelete(Criteria) method.
-  *
+ *
  * @param criteria defines the rows to be deleted, not null.
  * @param connection the connection to use, not null.
  *
@@ -231,11 +231,11 @@ public class BasePeerImpl implements
  * @throws TorqueException Any exceptions caught during processing will be
  * rethrown wrapped into a TorqueException.
  */
- public int doDelete(
- final Criteria criteria,
- final Connection connection)
-throws TorqueException
- {
+public int doDelete(
+final Criteria criteria,
+final Connection connection)
+throws TorqueException
+{
 correctBooleans(criteria);
 setDbName(criteria);
 
@@ -292,7 +292,7 @@ public class BasePeerImpl implements
 {
 throw ExceptionMapper.getInstance().toTorqueException(e);
 }
- }
+}
 
 /**
  * Inserts a record into a database table.
@@ -316,7 +316,7 @@ public class BasePeerImpl implements
  * @throws TorqueException if a database error occurs.
  */
 public ObjectKey doInsert(final ColumnValues insertValues)
-  throws TorqueException
+throws TorqueException
 {
 String databaseNameFromInsertValues = insertValues.getDbName();
 if (databaseNameFromInsertValues == null)
@@ -354,9 +354,9 @@ public class BasePeerImpl implements
  * @throws TorqueException if a database error occurs.
  */
 public ObjectKey doInsert(
-final ColumnValues insertValues,
-final Connection connection)
-throws TorqueException
+final ColumnValues insertValues,
+final Connection connection)
+throws TorqueException
 {
 if (insertValues == null)
 {
@@ -398,21 +398,21 @@ public class BasePeerImpl implements
 }
 }
 
-List columnNames = new ArrayList();
+List columnNames = new ArrayList<>();
 insertValues.keySet().forEach((column) -> 
columnNames.add(column.getColumnName()));
 
 String fullTableName = SqlBuilder.getFullTableName(
 getTableMap().getFullyQualifiedTableName(),
 databaseNameFromInsertValues);
 StringBuilder query = new StringBuilder("INSERT INTO ")
-.append(fullTableName)
-.append("(")
-.append(StringUtils.join(columnNames, ","))
-.append(") VALUES (");
+.append(fullTableName)
+.append("(")
+.append(StringUtils.join(columnNames, ","))
+.append(") VALUES (");
 
 boolean first = true;
 List replacementObjects
-= new ArrayList();
+= new ArrayList<>();
 for (Map.Entry columnValue
 : insertValues.entrySet())
 {
@@ -428,7 +428,7 @@ public class BasePeerImpl implements
 else
 {
 Column sqlExpression
-= columnValue.getValue().getSqlExpression();
+= columnValue.getValue().getSqlExpression();
 query.append(sqlExpression.getSqlExpression());
 }
 first = false;
@@ -468,7 +468,7 @@ public class BasePeerImpl implements
 }
 long startTime = System.currentTimeMillis();
 log.debug("Executing insert " + query.toString()
-+ " using parameters " + replacementObjects);
++ " using parameters " + replacementObjects);
 
 p

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java
 Mon Aug 27 09:48:33 2018
@@ -66,49 +66,49 @@ import org.apache.torque.util.functions.
 public class ForeignKeySchemaData
 {
 private final List pIntegerPkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List nullablePIntegerFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List requiredPIntegerFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List nonPkPIntegerFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List oIntegerPkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List nullableOIntegerFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List requiredOIntegerFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List nonPkOIntegerFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List compositePkOtherFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List compositePkContainsFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List compositeIntegerVarcharPkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List compositeIntegerVarcharFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List compositeNonpkFkList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List multiRefList
-= new ArrayList();
+= new ArrayList<>();
 
 private final List multiRefSameTableList
-= new ArrayList();
+= new ArrayList<>();
 
 /**
  * Creates the default Test data for the foreign key schema.
@@ -235,7 +235,7 @@ public class ForeignKeySchemaData
 throws TorqueException
 {
 NullablePIntegerFk nullablePIntegerFk2
-= new NullablePIntegerFk();
+= new NullablePIntegerFk();
 nullablePIntegerFk2.setName(
 "nullablePIntegerFk2");
 result.getPIntegerPkList().get(1).addNullablePIntegerFk(
@@ -244,7 +244,7 @@ public class ForeignKeySchemaData
 nullablePIntegerFk2);
 
 NullablePIntegerFk nullablePIntegerFk3a
-= new NullablePIntegerFk();
+= new NullablePIntegerFk();
 nullablePIntegerFk3a.setName(
 "nullablePIntegerFk3a");
 result.getPIntegerPkList().get(2).addNullablePIntegerFk(
@@ -253,7 +253,7 @@ public class ForeignKeySchemaData
 nullablePIntegerFk3a);
 
 NullablePIntegerFk nullablePIntegerFk3b
-= new NullablePIntegerFk();
+= new NullablePIntegerFk();
 nullablePIntegerFk3b.setName(
 "nullablePIntegerFk3b");
 result.getPIntegerPkList().get(2).addNullablePIntegerFk(
@@ -266,7 +266,7 @@ public class ForeignKeySchemaData
 throws TorqueException
 {
 RequiredPIntegerFk requiredPIntegerFk2
-= new RequiredPIntegerFk();
+= new RequiredPIntegerFk();
 requiredPIntegerFk2.setName(
 "requiredPIntegerFk2");
 result.getPIntegerPkList().get(1).addRequiredPIntegerFk(
@@ -275,7 +275,7 @@ public class ForeignKeySchemaData
 requiredPIntegerFk2);
 
 RequiredPIntegerFk requiredPIntegerFk3a
-= new RequiredPIntegerFk();
+= new RequiredPIntegerFk();
 requiredPIntegerFk3a.setName(
 "requiredPIntegerFk3a");
 result.getPIntegerPkList().get(2).addRequiredPIntegerFk(
@@ -284,7 +284,7 @@ public class ForeignKeySchemaData
 requiredPIntegerFk3a);
 
 RequiredPIntegerFk requiredPIntegerFk3b
-= new RequiredPIntegerFk();
+= new RequiredPIntegerFk();
 requiredPIntegerFk3b.setName(
 "requiredPIntegerFk3b");
 result.getPIntegerPkList().get(2).addRequiredPIntegerFk(
@@ -297,7 +297,7 @@ public class ForeignKeySchemaData
 throws TorqueException
 {
 NonPkPIntegerFk nonPkPIntegerFk1a
-= new NonPkPIntegerFk();
+= new NonPkPIntegerFk();
 nonPkPIntegerFk1a.setName(
 "nonPkPIntegerFk1a");
 result.getPIntegerPkList().get(0).addNonPkPIntegerFk(
@@ -306,7 +306,7 @@ public class ForeignKeySchemaData
 nonPkPIntegerFk1a);
 
 NonPkPIntegerFk

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
 (original)
+++ 
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
 Mon Aug 27 09:48:33 2018
@@ -61,7 +61,7 @@ public class OMColumnTransformer
 
 /** The transformer for inheritance elements. */
 private static OMInheritanceTransformer inheritanceTransformer
-= new OMInheritanceTransformer();
+= new OMInheritanceTransformer();
 
 /** Names which cannot be used as constants for column names. */
 private static final Set RESERVED_CONSTANT_NAMES;
@@ -86,27 +86,27 @@ public class OMColumnTransformer
 
 /** Constant for the getDefaultTimestamp method name. */
 static final String GET_DEFAULT_TIMESTAMP_METHOD_NAME
-= "getCurrentTimestamp";
+= "getCurrentTimestamp";
 
 /** Prevents reserved java words. */
 private static WrapReservedJavaWords reservedJavaWordsWrapper
-= new WrapReservedJavaWords();
+= new WrapReservedJavaWords();
 
 static
 {
-Set reservedConstantNames = new HashSet();
+Set reservedConstantNames = new HashSet<>();
 reservedConstantNames.add("DATABASE");
 reservedConstantNames.add("TABLE_NAME");
 reservedConstantNames.add("TABLE");
 RESERVED_CONSTANT_NAMES
-= Collections.unmodifiableSet(reservedConstantNames);
+= Collections.unmodifiableSet(reservedConstantNames);
 }
 
 public void transform(
 final SourceElement columnElement,
 final ControllerState controllerState,
 final int columnPosition)
-throws SourceTransformerException
+throws SourceTransformerException
 {
 checkElementName(columnElement);
 checkColumnNameExists(columnElement);
@@ -198,8 +198,8 @@ public class OMColumnTransformer
 == null)
 {
 String idMethod
-= (String) columnElement.getParent().getAttribute(
-TorqueSchemaAttributeName.ID_METHOD);
+= (String) columnElement.getParent().getAttribute(
+TorqueSchemaAttributeName.ID_METHOD);
 // idMethod can not be null because it is already set by the
 // table transformer
 if (!"none".equals(idMethod))
@@ -211,29 +211,29 @@ public class OMColumnTransformer
 else
 {
 columnElement.setAttribute(
-TorqueSchemaAttributeName.AUTO_INCREMENT,
-Boolean.FALSE.toString());
+TorqueSchemaAttributeName.AUTO_INCREMENT,
+Boolean.FALSE.toString());
 }
 }
 
 // set protected attribute
 if (columnElement.getAttribute(
-TorqueSchemaAttributeName.PROTECTED)
+TorqueSchemaAttributeName.PROTECTED)
 == null)
 {
 columnElement.setAttribute(
-TorqueSchemaAttributeName.PROTECTED,
-Boolean.FALSE.toString());
+TorqueSchemaAttributeName.PROTECTED,
+Boolean.FALSE.toString());
 }
 
 // set inheritance attribute
 if (columnElement.getAttribute(
-TorqueSchemaAttributeName.INHERITANCE)
+TorqueSchemaAttributeName.INHERITANCE)
 == null)
 {
 columnElement.setAttribute(
-TorqueSchemaAttributeName.INHERITANCE,
-Boolean.FALSE.toString());
+TorqueSchemaAttributeName.INHERITANCE,
+Boolean.FALSE.toString());
 }
 
 // set required attribute
@@ -258,9 +258,9 @@ public class OMColumnTransformer
 }
 
 protected void setDomainAttributes(
-final SourceElement columnElement,
-final ControllerState controllerState)
-throws SourceTransformerException
+final SourceElement columnElement,
+final ControllerState controllerState)
+throws SourceTransformerException
 {
 SqlType domain = SchemaTypeHelper.getDomain(
 columnElement,
@@ -270,7 +270,7 @@ public class OMColumnTransformer
 return;
 }
 if (columnElement.getAttribute(TorqueSchemaAttributeName.TYPE)
-== null
+== null
 &&

svn commit: r1839288 [8/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
 Mon Aug 27 09:48:33 2018
@@ -85,7 +85,7 @@ public class TokenReplacerTest extends B
 public void testTokenWithNamespace() throws Exception
 {
 String input
-= 
"Prefix${option:org.apache.torque.generator.optionWithNamespace}Postfix";
+= 
"Prefix${option:org.apache.torque.generator.optionWithNamespace}Postfix";
 String output = tokenReplacer.process(input);
 assertEquals("PrefixValueWithNamespacePostfix", output);
 }
@@ -102,7 +102,7 @@ public class TokenReplacerTest extends B
 public void testEscapingInToken() throws Exception
 {
 String input
-= "Prefix${option:option\\W\\ithoutNamespace}Postfix";
+= "Prefix${option:option\\W\\ithoutNamespace}Postfix";
 String output = tokenReplacer.process(input);
 assertEquals("PrefixValueWithoutNamespacePostfix", output);
 }
@@ -119,7 +119,7 @@ public class TokenReplacerTest extends B
 public void testTokenWithSpecialChars() throws Exception
 {
 String input
-= "Prefix${option:opt${\\}ion}Postfix";
+= "Prefix${option:opt${\\}ion}Postfix";
 String output = tokenReplacer.process(input);
 assertEquals("PrefixValueWith${}Special\\CharsPostfix", output);
 }
@@ -128,7 +128,7 @@ public class TokenReplacerTest extends B
 public void testEscapingTokenStart1() throws Exception
 {
 String input
-= "Prefix\\${XXX}Postfix";
+= "Prefix\\${XXX}Postfix";
 String output = tokenReplacer.process(input);
 assertEquals("Prefix${XXX}Postfix", output);
 }
@@ -137,7 +137,7 @@ public class TokenReplacerTest extends B
 public void testEscapingTokenStart2() throws Exception
 {
 String input
-= "Prefix$\\{XXX}Postfix";
+= "Prefix$\\{XXX}Postfix";
 String output = tokenReplacer.process(input);
 assertEquals("Prefix${XXX}Postfix", output);
 }

Modified: 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java
 Mon Aug 27 09:48:33 2018
@@ -36,7 +36,7 @@ public class GettingStarted
 File target = new File("target/gettingStarted");
 FileUtils.deleteDirectory(target);
 Controller controller = new Controller();
-List unitDescriptors = new ArrayList();
+List unitDescriptors = new ArrayList<>();
 unitDescriptors.add(new UnitDescriptor(
 UnitDescriptor.Packaging.DIRECTORY,
 new Maven2DirectoryProjectPaths(

Modified: 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
 Mon Aug 27 09:48:33 2018
@@ -42,7 +42,7 @@ public class GettingStartedTest extends
 File targetDir = new File("target/test/site/gettingStarted");
 FileUtils.deleteDirectory(targetDir);
 Controller controller = new Controller();
-List unitDescriptors = new ArrayList();
+List unitDescriptors = new ArrayList<>();
 CustomProjectPaths projectPaths = new CustomProjectPaths(
 new Maven2DirectoryProjectPaths(
 

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
 Mon Aug 27 09:48:33 2018
@@ -61,20 +61,20 @@ public class SqlBuilderTest extends Base
 final String value2a = "2a";
 final String value2b = "2b";
 Criteria c = new Criteria().where(column1, value1a)
-.and(column1, value1b)
-.and(column2, value2a)
-.and(column2, value2b);
+.and(column1, value1b)
+.and(column2, value2a)
+.and(column2, value2b);
 
 Query query = SqlBuilder.buildQuery(c);
 
 assertEquals(
 "SELECT  FROM myTable "
-   + "WHERE (myTable.myColumn1=? "
-   + "AND myTable.myColumn1=? "
-   + "AND myTable.myColumn2=? "
-   + "AND myTable.myColumn2=?)",
-query.toString());
-List expectedReplacements = new ArrayList();
++ "WHERE (myTable.myColumn1=? "
++ "AND myTable.myColumn1=? "
++ "AND myTable.myColumn2=? "
++ "AND myTable.myColumn2=?)",
+query.toString());
+List expectedReplacements = new ArrayList<>();
 expectedReplacements.add(value1a);
 expectedReplacements.add(value1b);
 expectedReplacements.add(value2a);
@@ -96,20 +96,20 @@ public class SqlBuilderTest extends Base
 final String value2a = "2a";
 final String value2b = "2b";
 Criteria c = new Criteria().where(column1, value1a)
-.or(column1, value1b)
-.or(column2, value2a)
-.or(column2, value2b);
+.or(column1, value1b)
+.or(column2, value2a)
+.or(column2, value2b);
 
 Query query = SqlBuilder.buildQuery(c);
 
 assertEquals(
 "SELECT  FROM myTable "
-   + "WHERE (myTable.myColumn1=? "
-   + "OR myTable.myColumn1=? "
-   + "OR myTable.myColumn2=? "
-   + "OR myTable.myColumn2=?)",
-query.toString());
-List expectedReplacements = new ArrayList();
++ "WHERE (myTable.myColumn1=? "
++ "OR myTable.myColumn1=? "
++ "OR myTable.myColumn2=? "
++ "OR myTable.myColumn2=?)",
+query.toString());
+List expectedReplacements = new ArrayList<>();
 expectedReplacements.add(value1a);
 expectedReplacements.add(value1b);
 expectedReplacements.add(value2a);
@@ -139,11 +139,11 @@ public class SqlBuilderTest extends Base
 
 assertEquals(
 "SELECT  FROM myTable "
-   + "WHERE (myTable.myColumn1=? "
-   + "AND myTable.myColumn1=? "
-   + "AND myTable.myColumn2=?)",
-query.toString());
-List expectedReplacements = new ArrayList();
++ "WHERE (myTable.myColumn1=? "
++ "AND myTable.myColumn1=? "
++ "AND myTable.myColumn2=?)",
+query.toString());
+List expectedReplacements = new ArrayList<>();
 expectedReplacements.add(value1a);
 expectedReplacements.add(value1b);
 expectedReplacements.add(value2a);
@@ -172,11 +172,11 @@ public class SqlBuilderTest extends Base
 
 assertEquals(
 "SELECT  FROM myTable "
-   + "WHERE (myTable.myColumn1=? "
-   + "OR myTable.myColumn1=? "
-   + "OR myTable.myColumn2=?)",
-query.toString());
-List expectedReplacements = new ArrayList();
++ "WHERE (myTable.myColumn1=? "
++ "OR myTable.myColumn1=? "
++ "OR myTable.myColumn2=?)",
+query.toString());
+List expectedReplacements = new ArrayList<>();
 expectedReplacements.add(value1a);
 expectedReplacements.add(value1b);
 expectedReplacements.add(value2a);
@@ -191,19 +191,19 @@ public class SqlBuilderTest extends Base
 public void testAndVerbatimSqlReplacementNull() throws Exception
 {
 Criteria criteria = new Criteria()
-.where(new ColumnImpl("table1.a"), "a")
-.andVerbatimSql(
-"foo(table1.x) = bar(tab

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java
 Mon Aug 27 09:48:33 2018
@@ -63,7 +63,7 @@ public class AbstractFunctionTest extend
  */
 public void testGetSetArgumentList()
 {
-ArrayList arguments = new ArrayList();
+ArrayList arguments = new ArrayList<>();
 arguments.add(false);
 arguments.add(new ColumnImpl("fooColumn"));
 abstractFunction.setArgumentList(arguments);
@@ -103,9 +103,9 @@ public class AbstractFunctionTest extend
 public void testGetColumnName()
 {
 abstractFunction.setArguments(
-new Object[] {
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-true});
+new Object[] {
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+true});
 assertNull(abstractFunction.getColumnName());
 }
 
@@ -115,10 +115,10 @@ public class AbstractFunctionTest extend
 public void testGetTableName()
 {
 abstractFunction.setArguments(
-new Object[] {
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-true});
+new Object[] {
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+true});
 assertEquals("table", abstractFunction.getTableName());
 }
 
@@ -129,10 +129,10 @@ public class AbstractFunctionTest extend
 public void testGetTableNameDifferentTables()
 {
 abstractFunction.setArguments(
-new Object[] {
-new ColumnImpl(null, null, null, "sqlExpression"),
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-true});
+new Object[] {
+new ColumnImpl(null, null, null, "sqlExpression"),
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+true});
 assertNull(abstractFunction.getTableName());
 }
 
@@ -143,10 +143,10 @@ public class AbstractFunctionTest extend
 public void testGetFullTableName()
 {
 abstractFunction.setArguments(
-new Object[] {
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-true});
+new Object[] {
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+true});
 assertEquals("schema.table", abstractFunction.getFullTableName());
 }
 
@@ -157,10 +157,10 @@ public class AbstractFunctionTest extend
 public void testGetFullTableNameDifferentTables()
 {
 abstractFunction.setArguments(
-new Object[] {
-new ColumnImpl(null, null, null, "sqlExpression"),
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-true});
+new Object[] {
+new ColumnImpl(null, null, null, "sqlExpression"),
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+true});
 assertNull(abstractFunction.getFullTableName());
 }
 
@@ -171,10 +171,10 @@ public class AbstractFunctionTest extend
 public void testGetSchemaName()
 {
 abstractFunction.setArguments(
-new Object[] {
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-new ColumnImpl("schema", "table", "column", "sqlExpression"),
-true});
+new Object[] {
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+new ColumnImpl("schema", "table", "column", 
"sqlExpression"),
+true});
 assertEquals("schema", abstractFunction.getSchemaName());
 }
 
@@ -185,10 +185,10 @@ public class AbstractFunctionTest extend
 public void testGetSchemaNameDifferentTables()
 {
 abstract

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

[tv]

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 tmpKeys = new ArrayList();
+List 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 Types.ARRAY.
  */
+@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 int 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

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
 Mon Aug 27 09:48:33 2018
@@ -58,18 +58,18 @@ public class DeleteTest extends BaseData
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 // we want to avoid fk errors in MultiRef
 testData.getMultiRefList().clear();
 testData.save();
 
 NullableOIntegerFk toDelete
-= testData.getNullableOIntegerFkList().get(0);
+= testData.getNullableOIntegerFkList().get(0);
 int preDeleteId = toDelete.getId();
 
 // check that four entries are in the NullableOIntegerFk table
 List nullableOIntegerFkList
-= getNullableOIntegerFkList();
+= getNullableOIntegerFkList();
 assertEquals(4, nullableOIntegerFkList.size());
 assertTrue(nullableOIntegerFkList.contains(toDelete));
 
@@ -86,7 +86,7 @@ public class DeleteTest extends BaseData
 
 // check that no associated object has been deleted
 List oIntegerPkList
-= OIntegerPkPeer.doSelect(new Criteria());
+= OIntegerPkPeer.doSelect(new Criteria());
 assertEquals(3, oIntegerPkList.size());
 }
 
@@ -100,17 +100,17 @@ public class DeleteTest extends BaseData
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 testData.save();
 
 NullableOIntegerFk toDelete
-= testData.getNullableOIntegerFkList().get(0);
+= testData.getNullableOIntegerFkList().get(0);
 toDelete.setId(toDelete.getId() - 1);
 int preDeleteId = toDelete.getId();
 
 // check that four entries are in the NullableOIntegerFk table
 List nullableOIntegerFkList
-= getNullableOIntegerFkList();
+= getNullableOIntegerFkList();
 assertEquals(4, nullableOIntegerFkList.size());
 assertFalse(nullableOIntegerFkList.contains(toDelete));
 
@@ -134,13 +134,13 @@ public class DeleteTest extends BaseData
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 // we want to avoid fk errors in MultiRef
 testData.getMultiRefList().clear();
 testData.save();
 
 NullableOIntegerFk toDelete
-= testData.getNullableOIntegerFkList().get(0);
+= testData.getNullableOIntegerFkList().get(0);
 toDelete.setName("nullableOIntegerFk2Changed");
 int preDeleteId = toDelete.getId();
 
@@ -149,7 +149,7 @@ public class DeleteTest extends BaseData
 
 // check that four entries are in the NullableOIntegerFk table
 List nullableOIntegerFkList
-= getNullableOIntegerFkList();
+= getNullableOIntegerFkList();
 assertEquals(4, nullableOIntegerFkList.size());
 assertTrue(nullableOIntegerFkList.contains(toDelete));
 
@@ -249,16 +249,16 @@ public class DeleteTest extends BaseData
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 // we want to avoid fk errors in MultiRef
 testData.getMultiRefList().clear();
 testData.save();
 
 List toDelete
-= new ArrayList();
+= new ArrayList<>();
 toDelete.add(testData.getNullableOIntegerFkList().get(0));
 toDelete.add(testData.getNullableOIntegerFkList().get(2));
-List preDeleteIds = new ArrayList();
+List preDeleteIds = new ArrayList<>();
 preDeleteIds.add(toDelete.get(0).getId());
 preDeleteIds.add(toDelete.get(1).getId());
 
@@ -267,7 +267,7 @@ public class DeleteTest extends BaseData
 assertFalse(toDelete.get(1).isDeleted());
 // check that four entries are in the NullableOIntegerFk table
 List nullableOIntegerFkList
-= getNullableOIntegerFkList();
+= getNullableOIntegerFkList();
 assertEquals(4, nullableOIntegerFkList.size());
 assertTrue(nullableOInt

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
 Mon Aug 27 09:48:33 2018
@@ -54,11 +54,11 @@ public class SetAndSaveTest extends Base
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 testData.save();
 
 OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(2);
-List fkList = new ArrayList();
+List fkList = new ArrayList<>();
 // object already associated to this object
 fkList.add(testData.getNullableOIntegerFkList().get(1));
 // object already associated to another object
@@ -75,7 +75,7 @@ public class SetAndSaveTest extends Base
 fkList);
 
 List cachedFks
-= oIntegerPk.getNullableOIntegerFks();
+= oIntegerPk.getNullableOIntegerFks();
 assertEquals(4, cachedFks.size());
 assertEquals(
 testData.getNullableOIntegerFkList().get(1).getId(),
@@ -132,7 +132,7 @@ public class SetAndSaveTest extends Base
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 testData.save();
 
 OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(0);
@@ -146,7 +146,7 @@ public class SetAndSaveTest extends Base
 assertTrue(oIntegerPk.getNonPkOIntegerFks().contains(
 testData.getNonPkOIntegerFkList().get(1)));
 
-List fkList = new ArrayList();
+List fkList = new ArrayList<>();
 // object already associated to this object
 fkList.add(testData.getNonPkOIntegerFkList().get(1));
 // object already associated to another object
@@ -175,7 +175,7 @@ public class SetAndSaveTest extends Base
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 testData.save();
 
 OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(0);
@@ -213,10 +213,10 @@ public class SetAndSaveTest extends Base
 final ForeignKeySchemaData testData,
 final OIntegerPk oIntegerPk,
 final NonPkOIntegerFk newNonPkOIntegerFk)
-throws TorqueException
+throws TorqueException
 {
 List cachedFks
-= oIntegerPk.getNonPkOIntegerFks();
+= oIntegerPk.getNonPkOIntegerFks();
 assertEquals(4, cachedFks.size());
 assertEquals(
 testData.getNonPkOIntegerFkList().get(1).getId(),
@@ -272,13 +272,13 @@ public class SetAndSaveTest extends Base
 {
 ForeignKeySchemaData.clearTablesInDatabase();
 ForeignKeySchemaData testData
-= ForeignKeySchemaData.getDefaultTestData();
+= ForeignKeySchemaData.getDefaultTestData();
 testData.save();
 
 CompIntegerVarcharPk compIntegerVarcharPk
-= testData.getCompositeIntegerVarcharPkList().get(2);
+= testData.getCompositeIntegerVarcharPkList().get(2);
 List fkList
-= new ArrayList();
+= new ArrayList<>();
 // object already associated to this object
 fkList.add(testData.getCompositeIntegerVarcharFkList().get(1));
 // object already associated to another object
@@ -287,16 +287,16 @@ public class SetAndSaveTest extends Base
 fkList.add(testData.getCompositeIntegerVarcharFkList().get(3));
 // new object
 CompIntegerVarcharFk newCompIntegerVarcharFk
-= new CompIntegerVarcharFk();
+= new CompIntegerVarcharFk();
 newCompIntegerVarcharFk.setName("newCompositeIntegerVarcharFk");
 fkList.add(newCompIntegerVarcharFk);
 
 CompIntegerVarcharPkPeer.setAndSaveCompIntegerVarcharFks(
-compIntegerVarcharPk,
-fkList);
+compIntegerVarcharPk,
+fkList);
 
 List cachedFks
-= compIntegerVarcharPk.getCompIntegerVarcharFks();
+= compIntegerVarcharPk.getCompIntegerVarcharFks();
 assertEquals(4, cachedFks.size());
 assertEquals(
 testData.getC

svn commit: r1839288 [9/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
 Mon Aug 27 09:48:33 2018
@@ -84,7 +84,7 @@ public class PropertyAccessTest
 public void testSetPropertyNotExistentField() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "fieldDoesNotExist");
+= new PropertyAccess(testClass, "fieldDoesNotExist");
 try
 {
 propertyAccess.setProperty(2);
@@ -99,7 +99,7 @@ public class PropertyAccessTest
 + "_fieldDoesNotExist of class "
 + "org.apache.torque.generator.source.transform.model"
 + ".PropertyAccessTest$TestClass",
-e.getMessage());
+e.getMessage());
 }
 }
 
@@ -107,7 +107,7 @@ public class PropertyAccessTest
 public void testSetPropertyPrivateField() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "privateIntField");
+= new PropertyAccess(testClass, "privateIntField");
 try
 {
 propertyAccess.setProperty(2);
@@ -122,7 +122,7 @@ public class PropertyAccessTest
 + "_privateIntField of class "
 + "org.apache.torque.generator.source.transform.model"
 + ".PropertyAccessTest$TestClass",
-e.getMessage());
+e.getMessage());
 }
 }
 
@@ -130,7 +130,7 @@ public class PropertyAccessTest
 public void testSetPropertyProtectedField() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "protectedIntField");
+= new PropertyAccess(testClass, "protectedIntField");
 try
 {
 propertyAccess.setProperty(2);
@@ -145,7 +145,7 @@ public class PropertyAccessTest
 + "_protectedIntField of class "
 + "org.apache.torque.generator.source.transform.model"
 + ".PropertyAccessTest$TestClass",
-e.getMessage());
+e.getMessage());
 }
 }
 
@@ -153,7 +153,7 @@ public class PropertyAccessTest
 public void testSetPropertyField() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "intField");
+= new PropertyAccess(testClass, "intField");
 try
 {
 propertyAccess.setProperty(2);
@@ -168,7 +168,7 @@ public class PropertyAccessTest
 + "_intField of class "
 + "org.apache.torque.generator.source.transform.model"
 + ".PropertyAccessTest$TestClass",
-e.getMessage());
+e.getMessage());
 }
 }
 
@@ -176,7 +176,7 @@ public class PropertyAccessTest
 public void testSetPropertyPublicField() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "publicIntField");
+= new PropertyAccess(testClass, "publicIntField");
 propertyAccess.setProperty(2);
 assertEquals(2, testClass.publicIntField);
 }
@@ -191,7 +191,7 @@ public class PropertyAccessTest
 public void testSetPropertyPublicFieldEndingWithS() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "publicFieldEndingWith");
+= new PropertyAccess(testClass, "publicFieldEndingWith");
 propertyAccess.setProperty(2);
 assertEquals(2, testClass.publicFieldEndingWiths);
 }
@@ -217,7 +217,7 @@ public class PropertyAccessTest
 public void testAccessPublicFieldFromBaseClass() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "publicIntFieldFromBaseClass");
+= new PropertyAccess(testClass, "publicIntFieldFromBaseClass");
 propertyAccess.setProperty(2);
 assertEquals(2, testClass.publicIntFieldFromBaseClass);
 }
@@ -226,7 +226,7 @@ public class PropertyAccessTest
 public void testSetPropertyPublicFieldWrongClass() throws Exception
 {
 final PropertyAccess propertyAccess
-= new PropertyAccess(testClass, "publicIntFi

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

[tv]

Modified: 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
 Mon Aug 27 09:48:33 2018
@@ -204,9 +204,9 @@ public class CriteriaTest extends BaseTe
 
 // Add the string
 c.where(column1, value1a)
-.and(column1, value1b)
-.and(column2, value2a)
-.and(column2, value2b);
+.and(column1, value1b)
+.and(column2, value2a)
+.and(column2, value2b);
 
 // Verify that the Criterion is a composite
 assertTrue(c.getTopLevelCriterion().isComposite());
@@ -358,28 +358,28 @@ public class CriteriaTest extends BaseTe
 final String value5 = "myValue5";
 
 Criterion crit2 =
-new Criterion(column2, value2, Criteria.EQUAL);
+new Criterion(column2, value2, Criteria.EQUAL);
 Criterion crit3 =
-new Criterion(column3, value3, Criteria.EQUAL);
+new Criterion(column3, value3, Criteria.EQUAL);
 Criterion crit4 =
-new Criterion(column4, value4, Criteria.EQUAL);
+new Criterion(column4, value4, Criteria.EQUAL);
 Criterion crit5 =
-new Criterion(column5, value5, Criteria.EQUAL);
+new Criterion(column5, value5, Criteria.EQUAL);
 
 crit2.and(crit3).or(crit4.and(crit5));
 c.where(crit2);
 c.addSelectColumn(new ColumnImpl(null, "myTable2", null, "*"));
 
 String expect =
-"SELECT * FROM myTable2, myTable3, myTable4, myTable5 WHERE "
-+ "((myTable2.myColumn2=? "
-+ "AND myTable3.myColumn3=?) "
-+ "OR (myTable4.myColumn4=? "
-+ "AND myTable5.myColumn5=?))";
+"SELECT * FROM myTable2, myTable3, myTable4, myTable5 WHERE "
++ "((myTable2.myColumn2=? "
++ "AND myTable3.myColumn3=?) "
++ "OR (myTable4.myColumn4=? "
++ "AND myTable5.myColumn5=?))";
 Query result = SqlBuilder.buildQuery(c);
 assertEquals(expect, result.toString());
 List preparedStatementReplacements
-= result.getPreparedStatementReplacements();
+= result.getPreparedStatementReplacements();
 assertEquals(4, preparedStatementReplacements.size());
 assertEquals("myValue2", preparedStatementReplacements.get(0));
 assertEquals("myValue3", preparedStatementReplacements.get(1));
@@ -427,15 +427,15 @@ public class CriteriaTest extends BaseTe
 c.where(crit2);
 c.addSelectColumn(new ColumnImpl(null, "myTable2", null, "*"));
 String expect =
-"SELECT * FROM myTable2, myTable3, myTable4, myTable5 WHERE "
-+ "(((myTable2.myColumn2?) "
-+ "AND myTable5.myColumn5>=?)";
+"SELECT * FROM myTable2, myTable3, myTable4, myTable5 WHERE "
++ "(((myTable2.myColumn2?) "
++ "AND myTable5.myColumn5>=?)";
 Query result = SqlBuilder.buildQuery(c);
 assertEquals(expect, result.toString());
 List preparedStatementReplacements
-= result.getPreparedStatementReplacements();
+= result.getPreparedStatementReplacements();
 assertEquals(4, preparedStatementReplacements.size());
 assertEquals("myValue2", preparedStatementReplacements.get(0));
 assertEquals("myValue3", preparedStatementReplacements.get(1));
@@ -458,8 +458,8 @@ public class CriteriaTest extends BaseTe
 Criteria.LESS_EQUAL);
 c.where(cn1).and(cn2);
 String expect =
-"SELECT  FROM INVOICE WHERE "
-+ "(INVOICE.COST>=? AND INVOICE.COST<=?)";
+"SELECT  FROM INVOICE WHERE "
++ "(INVOICE.COST>=? AND INVOICE.COST<=?)";
 Query result = SqlBuilder.buildQuery(c);
 
 assertEquals(expect, result.toString());
@@ -490,9 +490,9 @@ public class CriteriaTest extends BaseTe
 Query result = SqlBuilder.buildQuery(c);
 
 String expect = "SELECT * FROM TABLE WHERE "
-+ "(UPPER(TABLE.COLUMN1)=UPPER(?)"
-+ " AND UPPER(TABLE.COLUMN2)=UPPER(?)"
-+ " AND TABLE.COLUMN3=? AND TABLE.COLUMN4=?)";
++ "(UPPER(TABLE.COLUMN1)=UPPER(?)"
++ " AND UPPER(TABLE.COLUMN2)=UPPER(?)"
++ " AND TABLE.COLUMN3=? AND TABLE.COLUMN4=?)";
 assertEquals(expect, result.t

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-

[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();
+selectModifiers = new UniqueList<>();
 selectColumns = new UniqueColumnList();
-orderByColumns = new UniqueList();
+orderByColumns = new UniqueList<>();
 groupByColumns = new UniqueColumnList();
-fromElements = new UniqueList();
-asColumns = new LinkedHashMap();
-joins = new ArrayList();
-aliases = new HashMap();
-setCriteriaParts = new ArrayList();
+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(toCopy.selectModifiers);
+selectModifiers = new UniqueList<>(toCopy.selectModifiers);
 selectColumns = new UniqueColumnList(toCopy.selectColumns);
-orderByColumns = new UniqueList(toCopy.orderByColumns);
+orderByColumns = new UniqueList<>(toCopy.orderByColumns);
 groupByColumns = new UniqueColumnList(toCopy.groupByColumns);
-fromElements = new UniqueList(toCopy.fromElements);
+fromElements = new UniqueList<>(toCopy.fromElements);
 if (toCopy.having != null)
 {
 having = new Criterion(toCopy.having);
@@ -255,17 +255,17 @@ publ

svn commit: r1839288 [6/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceTransformerDefinition.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceTransformerDefinition.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceTransformerDefinition.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceTransformerDefinition.java
 Mon Aug 27 09:48:33 2018
@@ -73,7 +73,7 @@ public final class SourceTransformerDefi
 public int hashCode()
 {
 HashCodeBuilder hashCodeBuilder = new HashCodeBuilder()
-.append(sourceTransformer);
+.append(sourceTransformer);
 return hashCodeBuilder.toHashCode();
 }
 
@@ -94,7 +94,7 @@ public final class SourceTransformerDefi
 }
 SourceTransformerDefinition other = (SourceTransformerDefinition) obj;
 EqualsBuilder equalsBuilder = new EqualsBuilder()
-.append(sourceTransformer, other.sourceTransformer);
+.append(sourceTransformer, other.sourceTransformer);
 return equalsBuilder.isEquals();
 }
 }

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java
 Mon Aug 27 09:48:33 2018
@@ -36,10 +36,10 @@ public class ForeignKeyMetadata
 private String foreignKeyName;
 
 /** The local columns of the foreign key. */
-private List localColumns = new ArrayList();
+private List localColumns = new ArrayList<>();
 
 /** The foreign columns of the foreign key. */
-private List foreignColumns = new ArrayList();
+private List foreignColumns = new ArrayList<>();
 
 /**
  * Returns the name of the referenced (foreign) table.

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
 Mon Aug 27 09:48:33 2018
@@ -102,7 +102,7 @@ public class JdbcMetadataSource extends
  * The position in foreign key metadata containing the foreign column name.
  */
 private static final int FOREIGN_COLUMN_NAME_POS_IN_FOREIGN_KEY_METADATA
-= 4;
+= 4;
 
 /**
  * The position in foreign key metadata containing the localcolumn name.
@@ -192,9 +192,9 @@ public class JdbcMetadataSource extends
 table.setAttribute("name", tableName);
 
 List columns
-= getColumns(dbMetaData, tableName, schema);
+= getColumns(dbMetaData, tableName, schema);
 Set primaryKeys
-= getPrimaryKeys(dbMetaData, tableName, schema);
+= getPrimaryKeys(dbMetaData, tableName, schema);
 
 for (ColumnMetadata col : columns)
 {
@@ -260,7 +260,7 @@ public class JdbcMetadataSource extends
 
 // Foreign keys for this table.
 Collection forgnKeys
-= getForeignKeys(dbMetaData, tableName, schema);
+= getForeignKeys(dbMetaData, tableName, schema);
 for (ForeignKeyMetadata foreignKeyMetadata : forgnKeys)
 {
 SourceElement fk = new SourceElement("foreign-key");
@@ -287,11 +287,13 @@ public class JdbcMetadataSource extends
 return rootElement;
 }
 
+@Override
 public String getDescription()
 {
 return "JdbcMetadataSource using url " + url;
 }
 
+@Override
 public File getSourceFile()
 {
 return null;
@@ -306,10 +308,10 @@ public class JdbcMetadataSource extends
  * @throws SQLException
  */
 Lis

svn commit: r1839288 [4/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
 Mon Aug 27 09:48:33 2018
@@ -77,8 +77,8 @@ public class EntityReferenceSaxHandler e
  */
 @Override
 public void startElement(String uri, String localName, String rawName,
- Attributes attributes)
-throws SAXException
+Attributes attributes)
+throws SAXException
 {
 if (rawName.equals(ENTITY_REFERENCE))
 {
@@ -142,10 +142,10 @@ public class EntityReferenceSaxHandler e
  * while reading the resource.
  */
 public byte[] readResource()
-throws ConfigurationException
+throws ConfigurationException
 {
 InputStream inputStream
-= configurationProvider.getResourceInputStream(resource);
+= configurationProvider.getResourceInputStream(resource);
 byte[] content;
 try
 {

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
 Mon Aug 27 09:48:33 2018
@@ -35,7 +35,7 @@ public class EntityReferences implements
 {
 /** All known entity references. */
 private Map entityReferences
-= new HashMap();
+= new HashMap<>();
 
 /**
  * Adds a new entity reference.
@@ -82,7 +82,7 @@ public class EntityReferences implements
  */
 public Map getEntityReferences()
 {
-return new HashMap(entityReferences);
+return new HashMap<>(entityReferences);
 }
 
 /**
@@ -97,6 +97,7 @@ public class EntityReferences implements
  * @return An InputSource for the entity if the
  * systemId is known, or null otherwise.
  */
+@Override
 public InputSource resolveEntity(String publicId, String systemId)
 throws IOException, SAXException
 {

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
 Mon Aug 27 09:48:33 2018
@@ -49,10 +49,10 @@ public class FileSourceSaxHandler extend
 private String format;
 
 /** The source file names which should be included in generation. */
-private Set includes = new HashSet();
+private Set includes = new HashSet<>();
 
 /** The source file names which should be excluded from generation. */
-private Set excludes = new HashSet();
+private Set excludes = new HashSet<>();
 
 /** Whether to combine all source files. */
 private Boolean combineFiles;
@@ -97,8 +97,8 @@ public class FileSourceSaxHandler extend
  */
 @Override
 public void startElement(String uri, String localName, String rawName,
- Attributes attributes)
-throws SAXException
+Attributes attributes)
+throws SAXException
 {
 if (rawName.equals(INCLUDE_TAG))
 {
@@ -131,7 +131,7 @@ public class FileSourceSaxHandler extend
  */
 @Override
 public void endElement(String uri, String localName, String rawName)
-throws SAXException
+throws SAXException
 {
 if (rawName.equals(INCLUDE_

svn commit: r1839288 [5/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java
 Mon Aug 27 09:48:33 2018
@@ -51,7 +51,7 @@ public interface Outlet
  *  for the given name already exists.
  */
 void addMergepointMapping(MergepointMapping mergepointMapping)
-throws ConfigurationException;
+throws ConfigurationException;
 
 /**
  * Sets an mergepoint mapping in the outlet. If a mergepoint
@@ -132,7 +132,7 @@ public interface Outlet
  * @throws GeneratorException if adjusting the controller state fails.
  */
 void beforeExecute(ControllerState controllerState)
-throws GeneratorException;
+throws GeneratorException;
 
 /**
  * Adjusts the state of the Controller after generation.
@@ -142,7 +142,7 @@ public interface Outlet
  * @throws GeneratorException if adjusting the controller state fails.
  */
 void afterExecute(ControllerState controllerState)
-throws GeneratorException;
+throws GeneratorException;
 
 /**
  * Generates the output for this template into the Generated object.
@@ -154,5 +154,5 @@ public interface Outlet
  * @throws GeneratorException if generation fails.
  */
 OutletResult execute(ControllerState controllerState)
-throws GeneratorException;
+throws GeneratorException;
 }

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
 Mon Aug 27 09:48:33 2018
@@ -51,7 +51,7 @@ public abstract class OutletImpl impleme
  * The mergepoint mappings configured for this outlet.
  */
 private final Map mergepointMappings
-= new HashMap();
+= new HashMap<>();
 
 /**
  * The name of the outlet. Is immutable.
@@ -87,26 +87,31 @@ public abstract class OutletImpl impleme
 this.name = name;
 }
 
+@Override
 public QualifiedName getName()
 {
 return name;
 }
 
+@Override
 public String getInputElementName()
 {
 return inputElementName;
 }
 
+@Override
 public void setInputElementName(String inputElementName)
 {
 this.inputElementName = inputElementName;
 }
 
+@Override
 public String getInputClass()
 {
 return inputClass;
 }
 
+@Override
 public void setInputClass(String inputClass)
 {
 this.inputClass = inputClass;
@@ -122,20 +127,21 @@ public abstract class OutletImpl impleme
  * @throws ConfigurationException if an mergepointMapping
  *  for the given name already exists.
  */
+@Override
 public void addMergepointMapping(MergepointMapping mergepointMapping)
-throws ConfigurationException
+throws ConfigurationException
 {
 MergepointMapping oldMapping
-= mergepointMappings.get(mergepointMapping.getName());
+= mergepointMappings.get(mergepointMapping.getName());
 if (oldMapping != null)
 {
 throw new ConfigurationException(
 "Attempted to add another mergepoint mapping for the name "
-+ mergepointMapping.getName()
-+ " : New mapping mapped to Actions "
-+ mergepointMapping.getActions()
-+ ", old mapping mapped to Actions "
-+ oldMapping.getActions());
++ mergepointMapping.getName()
++ " : New mapping mapped to Actions "
++ mergepointMapping.getActions()
++ ", old mapping mapped to Actions "
++ oldMapping.getActions());
 }
 mergepointMappings.put(mergepointMapping.getName(), mergepointMapping);
 }
@@ -150,6 +156,7 @@ public abstract class OutletImpl impleme
  *
  * @throws NullPointerException if mergepointMapping is null.
 

svn commit: r1839288 [1/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-g

[tv]

Author: tv
Date: Mon Aug 27 09:48:33 2018
New Revision: 1839288

URL: http://svn.apache.org/viewvc?rev=1839288&view=rev
Log:
Run Eclipse cleanup

Modified:

db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/AbstractConfigurationProvider.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java

db/torque/torqu

svn commit: r1839288 [3/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
 Mon Aug 27 09:48:33 2018
@@ -52,7 +52,7 @@ abstract class OptionsConfigurationBase
 protected Collection toOptions(
 Map optionsMap)
 {
-Set options = new HashSet();
+Set options = new HashSet<>();
 for (Entry entry
 : optionsMap.entrySet())
 {
@@ -63,7 +63,7 @@ abstract class OptionsConfigurationBase
 if (log.isTraceEnabled())
 {
 log.trace("Setting option " + entry.getKey()
-+ " to value " + entry.getValue());
++ " to value " + entry.getValue());
 }
 }
 return options;

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
 Mon Aug 27 09:48:33 2018
@@ -52,5 +52,5 @@ public abstract interface OptionsSaxHand
  * not be created from the given XML element.
  */
 OptionsSaxHandler getOptionsSaxHandler()
-throws SAXException;
+throws SAXException;
 }

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java
 Mon Aug 27 09:48:33 2018
@@ -46,9 +46,10 @@ public class PropertiesOptionConfigurati
  *
  * @throws ConfigurationException if the file cannot be accessed or parsed.
  */
+@Override
 public Collection getOptions(
-ConfigurationProvider configurationProvider)
-throws ConfigurationException
+ConfigurationProvider configurationProvider)
+throws ConfigurationException
 {
 Properties properties = new Properties();
 try (InputStream optionsInputStream = 
configurationProvider.getOptionsInputStream(getPath()))
@@ -58,7 +59,7 @@ public class PropertiesOptionConfigurati
 catch (IOException | RuntimeException e)
 {
 throw new ConfigurationException("Error reading options file "
-+ getPath(),
++ getPath(),
 e);
 }
 return toOptions(properties);

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java
 Mon Aug 27 09:48:33 2018
@@ -25,7 +25,7 @@ import org.xml.sax.SAXException;
  * A Factory which creates a SAX handler for properties options.
  */
 public 

svn commit: r1839288 [2/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-g

[tv]

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java
 Mon Aug 27 09:48:33 2018
@@ -36,11 +36,11 @@ import org.apache.torque.generator.confi
  * jar file.
  */
 public class JarConfigurationProvider
-extends AbstractConfigurationProvider
+extends AbstractConfigurationProvider
 {
 /** The logger. */
 private static Log log
-= LogFactory.getLog(JarConfigurationProvider.class);
+= LogFactory.getLog(JarConfigurationProvider.class);
 
 /**
  * The paths needed to interact with the enclosing project, not null.
@@ -72,7 +72,7 @@ public class JarConfigurationProvider
 public JarConfigurationProvider(
 final ProjectPaths projectPaths,
 final TorqueGeneratorPaths configurationPaths)
-throws ConfigurationException
+throws ConfigurationException
 {
 super(configurationPaths);
 if (projectPaths == null)
@@ -90,25 +90,26 @@ public class JarConfigurationProvider
 {
 log.error("Could not open jar File "
 + projectPaths.getConfigurationPath()
-.getAbsolutePath());
+.getAbsolutePath());
 throw new ConfigurationException(e);
 }
 }
 
+@Override
 public String getControlConfigurationLocation()
 throws ConfigurationException
 {
 return projectPaths.getConfigurationPath() + ":"
-+ configurationPaths.getConfigurationDirectory() + "/"
-+ configurationPaths.getControlConfigurationFile();
++ configurationPaths.getConfigurationDirectory() + "/"
++ configurationPaths.getControlConfigurationFile();
 }
 
 @Override
 protected InputStream getInputStream(
-   final String name,
-   final String directory,
-   final String description)
-throws ConfigurationException
+final String name,
+final String directory,
+final String description)
+throws ConfigurationException
 {
 String fileName = directory + "/" + name;
 
@@ -122,10 +123,10 @@ public class JarConfigurationProvider
 {
 throw new ConfigurationException(
 "Could not read " + description + " file "
-+ fileName
-+ " in jar file "
-+ projectPaths.getConfigurationPath(),
-e);
++ fileName
++ " in jar file "
++ projectPaths.getConfigurationPath(),
+e);
 }
 BufferedInputStream bis = new BufferedInputStream(inputStream);
 if (log.isDebugEnabled())
@@ -138,8 +139,9 @@ public class JarConfigurationProvider
 return bis;
 }
 
+@Override
 public Collection getOutletConfigurationNames()
-throws ConfigurationException
+throws ConfigurationException
 {
 return PackageResources.getFilesInJarDirectoryWithSuffix(
 configurationPaths.getOutletDirectory(),
@@ -151,6 +153,7 @@ public class JarConfigurationProvider
 /**
  * @see ConfigurationProvider#getTemplateNames()
  */
+@Override
 public Collection getTemplateNames()
 throws ConfigurationException
 {

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java
 Mon Aug 27 09:48:33 2018
@@ -43,15 +43,15 @@ public class OutletTypes
  * keyed by the type of the outlet.
  */
 private final Map
-typedOutletHandlerFactories
-= new HashMap();
+typedOutletHandlerFactories
+= new HashMap<>();
 
 /**
  * A Lis

svn commit: r1839287 - /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java

[tv]

Author: tv
Date: Mon Aug 27 09:39:49 2018
New Revision: 1839287

URL: http://svn.apache.org/viewvc?rev=1839287&view=rev
Log:
As LargeSelect now returns much faster, the assumption, we could check initial 
values before data is available proves to be wrong.

Modified:

db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java?rev=1839287&r1=1839286&r2=1839287&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
 Mon Aug 27 09:39:49 2018
@@ -73,7 +73,7 @@ public class LargeSelectTest extends Bas
 {
 // Delete the test data
 org.apache.torque.criteria.Criteria criteria
-= new org.apache.torque.criteria.Criteria();
+= new org.apache.torque.criteria.Criteria();
 criteria.where(AuthorPeer.NAME, LARGE_SELECT_AUTHOR);
 AuthorPeer.doDelete(criteria);
 criteria = null;
@@ -99,7 +99,7 @@ public class LargeSelectTest extends Bas
 criteria.setLimit(1);
 try
 {
-new LargeSelect(criteria, TEST_PAGE_SIZE,
+new LargeSelect<>(criteria, TEST_PAGE_SIZE,
 AuthorPeer.getAuthorPeerImpl());
 }
 catch (IllegalArgumentException success)
@@ -116,7 +116,7 @@ public class LargeSelectTest extends Bas
 criteria.setOffset(1);
 try
 {
-new LargeSelect(criteria, TEST_PAGE_SIZE,
+new LargeSelect<>(criteria, TEST_PAGE_SIZE,
 AuthorPeer.getAuthorPeerImpl());
 }
 catch (IllegalArgumentException success)
@@ -132,7 +132,7 @@ public class LargeSelectTest extends Bas
 {
 try
 {
-new LargeSelect(criteria, 0,
+new LargeSelect<>(criteria, 0,
 AuthorPeer.getAuthorPeerImpl());
 }
 catch (IllegalArgumentException success)
@@ -148,7 +148,7 @@ public class LargeSelectTest extends Bas
 {
 try
 {
-new LargeSelect(criteria, TEST_PAGE_SIZE, 0,
+new LargeSelect<>(criteria, TEST_PAGE_SIZE, 0,
 AuthorPeer.getAuthorPeerImpl());
 }
 catch (IllegalArgumentException success)
@@ -162,7 +162,7 @@ public class LargeSelectTest extends Bas
  */
 public void testSetterMethods()
 {
-LargeSelect ls = new LargeSelect(
+LargeSelect ls = new LargeSelect<>(
 criteria,
 TEST_PAGE_SIZE,
 AuthorPeer.getAuthorPeerImpl());
@@ -187,7 +187,7 @@ public class LargeSelectTest extends Bas
  */
 public void testLargeSelect() throws TorqueException
 {
-LargeSelect ls = new LargeSelect(
+LargeSelect ls = new LargeSelect<>(
 criteria,
 TEST_PAGE_SIZE,
 AuthorPeer.getAuthorPeerImpl());
@@ -305,7 +305,7 @@ public class LargeSelectTest extends Bas
 {
 // Alter criteria to retrieve only one row
 criteria.where(AuthorPeer.AUTHOR_ID, firstAuthorId);
-LargeSelect ls = new LargeSelect(
+LargeSelect ls = new LargeSelect<>(
 criteria,
 TEST_PAGE_SIZE,
 AuthorPeer.getAuthorPeerImpl());
@@ -333,7 +333,7 @@ public class LargeSelectTest extends Bas
  */
 public void testInvalidateResult() throws Exception
 {
-LargeSelect ls = new LargeSelect(
+LargeSelect ls = new LargeSelect<>(
 criteria,
 TEST_PAGE_SIZE,
 AuthorPeer.getAuthorPeerImpl());
@@ -341,19 +341,6 @@ public class LargeSelectTest extends Bas
 assertEquals("Page size", TEST_PAGE_SIZE, ls.getPageSize());
 assertTrue("Paginated", ls.getPaginated());
 
-// Page 0
-assertEquals("Current page number", 0, ls.getCurrentPageNumber());
-assertFalse("Previous results available", 
ls.getPreviousResultsAvailable());
-assertTrue("Next results available", ls.getNextResultsAvailable());
-assertEquals("Current page size", 0, ls.getCurrentPageSize());
-assertEquals("First record for page", 0, ls.getFirstRecordNoForPage());
-assertEquals("Last record for page", 0, ls.getLastRecordNoForPage());
-assertFalse("Totals finalised", ls.getTotalsFinalized());
-assertEquals("Total pages", 0, ls.getTotalPages());
-assertEquals("Total records", 0, ls.getTotalRecords());
-assertEquals("Page progress text", "0 of > 0", 
ls.getPageProgressText());
-assertEquals("Re

Jenkins build is still unstable: Torque4-trunk #589

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Templates #589

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator Ant tasks #589

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator #589

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Generator Maven 2 Plugin #589

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Jenkins build is still unstable: Torque4-trunk » Torque Runtime #589

[Apache Jenkins Server]

See 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839284 - in /db/torque/torque4/trunk: torque-runtime/src/main/java/org/apache/torque/ torque-runtime/src/main/java/org/apache/torque/oid/ torque-runtime/src/main/java/org/apache/torque/u

[tv]

Author: tv
Date: Mon Aug 27 08:57:56 2018
New Revision: 1839284

URL: http://svn.apache.org/viewvc?rev=1839284&view=rev
Log:
Implement and document TORQUE-350: Make use of try-with-resources possible with 
Torque transactions. 
IMPORTANT: TorqueException now inherits from SQLException

Added:

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnection.java
   (with props)

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java
   (with props)

db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java
   (with props)
Modified:

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManager.java

db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java

db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java

db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/joinGetterReferencingObject.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/saveMethods.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoin.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoinAllExcept.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/imports.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm

db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm

db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java

Modified: 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java?rev=1839284&r1=1839283&r2=1839284&view=diff
==
--- 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueException.java
 Mon Aug 27 08:57:56 2018
@@ -1,5 +1,7 @@
 package org.apache.torque;
 
+import java.sql.SQLException;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,7 +28,7 @@ package org.apache.torque;
  * @author mailto:j...@apache.org";>Jason van Zyl
  * @version $Id$
  */
-public class TorqueException extends Exception
+public class TorqueException extends SQLException
 {
 /**
  * Serial version.

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=1839284&r1=1839283&r2=1839284&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/torq

svn commit: r1839282 - /db/torque/torque4/trunk/pom.xml

[tv]

Author: tv
Date: Mon Aug 27 08:55:12 2018
New Revision: 1839282

URL: http://svn.apache.org/viewvc?rev=1839282&view=rev
Log:
Remove dependency on commons-collections
Derive from Apache parent 21

Modified:
db/torque/torque4/trunk/pom.xml

Modified: db/torque/torque4/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1839282&r1=1839281&r2=1839282&view=diff
==
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Mon Aug 27 08:55:12 2018
@@ -25,7 +25,7 @@
   
 org.apache
 apache
-18
+21
   
   
   org.apache.torque
@@ -361,12 +361,6 @@
   
   
   
-commons-collections
-commons-collections
-3.2.2
-  
-  
-  
 commons-io
 commons-io
 1.4



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839281 - /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java

[tv]

Author: tv
Date: Mon Aug 27 08:54:31 2018
New Revision: 1839281

URL: http://svn.apache.org/viewvc?rev=1839281&view=rev
Log:
Make execution sequence predictable

Modified:

db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java?rev=1839281&r1=1839280&r2=1839281&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
 Mon Aug 27 08:54:31 2018
@@ -21,8 +21,8 @@ package org.apache.torque;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1245,7 +1245,7 @@ public class DataTest extends BaseDataba
 = {"abc", "bbc", "a_c", "a%c", "a\\c",
"a\"c", "a'c", "a?c", "a*c" };
 
-Map likeResults = new HashMap();
+Map likeResults = new LinkedHashMap();
 
 likeResults.put("a\\_c", "a_c");
 likeResults.put("a\\_%", "a_c");
@@ -1303,6 +1303,7 @@ public class DataTest extends BaseDataba
 
 for (Map.Entry likeResult : likeResults.entrySet())
 {
+// System.out.println("Key: " + likeResult.getKey() + " - Value: " 
+ likeResult.getValue());
 Criteria criteria = new Criteria();
 criteria.where(
 AuthorPeer.NAME,
@@ -1316,7 +1317,7 @@ public class DataTest extends BaseDataba
 catch (Exception e)
 {
 throw new Exception(
-"error rxecuting select using like content "
+"error executing select using like content "
 + likeResult.getKey(),
 e);
 }



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839280 - in /db/torque/torque4/trunk/torque-test: pom.xml src/test/profile/mysql/Torque.properties

[tv]

Author: tv
Date: Mon Aug 27 08:53:35 2018
New Revision: 1839280

URL: http://svn.apache.org/viewvc?rev=1839280&view=rev
Log:
Adapt to latest mysql driver version

Modified:
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1839280&r1=1839279&r2=1839280&view=diff
==
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Mon Aug 27 08:53:35 2018
@@ -911,6 +911,7 @@
 false
   
   
+8.0.12
 mysql
 native
 bookstore
@@ -922,9 +923,9 @@
 
 
 
-org.gjt.mm.mysql.Driver
+com.mysql.cj.jdbc.Driver
 mysql
-
jdbc:mysql://localhost:3306/bookstore
+
jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false
 torque
 torque
 none
@@ -932,9 +933,9 @@
   
   
 
-  mysql-connector-java
   mysql
-  5.1.17
+  mysql-connector-java
+  ${torque.test.mysql.version}
   test
 
   
@@ -945,9 +946,9 @@
 sql-maven-plugin
 
   
-mysql-connector-java
 mysql
-5.0.4
+mysql-connector-java
+${torque.test.mysql.version}
   
 
   
@@ -955,9 +956,9 @@
 maven-antrun-plugin
 
   
-mysql-connector-java
 mysql
-5.0.4
+mysql-connector-java
+${torque.test.mysql.version}
   
 
   
@@ -1141,66 +1142,6 @@
   
 
   
-
-  
-
-
-
-  tv
-  
-false
-  
-  
-tv
-idbroker
-bookstore
-
onUpdate="cascade"
-
onUpdate="setnull"
-
onUpdate="restrict"
-
onDelete="restrict"
-BIT
-
default="CURRENT_DATE"
-
default="CURRENT_TIME"
-
default="CURRENT_TIMESTAMP"
-org.gjt.mm.mysql.Driver
-mysql
-
jdbc:mysql://gatekeeper.home.lan:3306/bookstore
-torque
-torque
-none
-true
-  
-  
-
-  mysql-connector-java
-  mysql
-  3.1.12
-  test
-
-  
-  
-
-  
-org.codehaus.mojo
-sql-maven-plugin
-
-  
-mysql-connector-java
-mysql
-3.1.12
-  
-
-  
-  
-maven-antrun-plugin
-
-  
-mysql-connector-java
-mysql
-3.1.12
-  
-
-  
 
   
 

Modified: 
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties?rev=1839280&r1=1839279&r2=1839280&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties 
(original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties 
Mon Aug 27 08:53:35 2018
@@ -26,8 +26,8 @@ torque.database.bookstore.adapter = mysq
 
 # Using commons-dbcp
 torque.dsfactory.bookstore.factory = 
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
-torque.dsfactory.bookstore.connection.url = 
jdbc:mysql://localhost:3306/bookstore
+torque.dsfactory.bookstore.connection.driver = com.mysql.cj.jdbc.Driver
+torque.dsfactory.bookstore.connection.url = 
jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false
 torque.dsfactory.bookstore.connection.user = torque
 torque.dsfactory.bookstore.connection.password = torque
 



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839278 - /db/torque/torque4/trunk/torque-test/src/test/profile/tv/

[tv]

Author: tv
Date: Mon Aug 27 08:52:51 2018
New Revision: 1839278

URL: http://svn.apache.org/viewvc?rev=1839278&view=rev
Log:
Remove tv profile

Removed:
db/torque/torque4/trunk/torque-test/src/test/profile/tv/


-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839277 - /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java

[tv]

Author: tv
Date: Mon Aug 27 08:52:18 2018
New Revision: 1839277

URL: http://svn.apache.org/viewvc?rev=1839277&view=rev
Log:
As LargeSelect now returns much faster, the assumption, we could check initial 
values before data is available proves to be wrong.

Modified:

db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java?rev=1839277&r1=1839276&r2=1839277&view=diff
==
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
 Mon Aug 27 08:52:18 2018
@@ -195,20 +195,6 @@ public class LargeSelectTest extends Bas
 assertEquals("Page size", TEST_PAGE_SIZE, ls.getPageSize());
 assertTrue("Paginated", ls.getPaginated());
 
-// Page 0, assuming that the asserts occur before the first records
-// have been read
-assertEquals("Current page number", 0, ls.getCurrentPageNumber());
-assertFalse("Previous results available", 
ls.getPreviousResultsAvailable());
-assertTrue("Next results available", ls.getNextResultsAvailable());
-assertEquals("Current page size", 0, ls.getCurrentPageSize());
-assertEquals("First record for page", 0, ls.getFirstRecordNoForPage());
-assertEquals("Last record for page", 0, ls.getLastRecordNoForPage());
-assertFalse("Totals finalised", ls.getTotalsFinalized());
-assertEquals("Total pages", 0, ls.getTotalPages());
-assertEquals("Total records", 0, ls.getTotalRecords());
-assertEquals("Page progress text", "0 of > 0", 
ls.getPageProgressText());
-assertEquals("Record progress text", "0 - 0 of > 0", 
ls.getRecordProgressText());
-
 long startTime = System.currentTimeMillis();
 List results = ls.getNextResults();
 long timeElapsed = System.currentTimeMillis() - startTime;



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

svn commit: r1839276 - in /db/torque/torque4/trunk/torque-generator: pom.xml src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java

[tv]

Author: tv
Date: Mon Aug 27 08:50:03 2018
New Revision: 1839276

URL: http://svn.apache.org/viewvc?rev=1839276&view=rev
Log:
Remove dependency on commons-collections

Modified:
db/torque/torque4/trunk/torque-generator/pom.xml

db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java

Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1839276&r1=1839275&r2=1839276&view=diff
==
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Mon Aug 27 08:50:03 2018
@@ -62,10 +62,6 @@
   commons-lang
 
 
-  commons-collections
-  commons-collections
-
-
   commons-beanutils
   commons-beanutils
 

Modified: 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java?rev=1839276&r1=1839275&r2=1839276&view=diff
==
--- 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java
 Mon Aug 27 08:50:03 2018
@@ -22,6 +22,7 @@ package org.apache.torque.generator.sour
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Properties;
 import java.util.Set;
 
@@ -195,8 +196,7 @@ public final class PropertiesSourceForma
 /**
  * The ordered set of keys.
  */
-@SuppressWarnings("unchecked")
-private final Set keySet = new ListOrderedSet();
+private final Set keySet = new LinkedHashSet();
 
 @Override
 public Object put(Object key, Object value)



-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

[jira] [Resolved] (TORQUE-350) Make use of try-with-resources possible with Torque transactions

[Thomas Vandahl (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TORQUE-350?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Thomas Vandahl resolved TORQUE-350.
---
Resolution: Implemented
  Assignee: Thomas Vandahl

I chose a wrapper instead of a proxy. TorqueException now extends SQLException!

> Make use of try-with-resources possible with Torque transactions
> 
>
> Key: TORQUE-350
> URL: https://issues.apache.org/jira/browse/TORQUE-350
> Project: Torque
>  Issue Type: Improvement
>  Components: Runtime, Templates
>Affects Versions: 4.0
>Reporter: Thomas Vandahl
>Assignee: Thomas Vandahl
>Priority: Major
> Fix For: 4.1
>
>
> We use the java.sql.Connection to wrap database operations into transactions. 
> As of Java7, Connection is AutoCloseable. I propose to introduce a dynamic 
> proxy to catch the close call and implement the pattern as described in 
> https://db.apache.org/torque/torque-4.0/documentation/orm-reference/connections-transactions.html
>  



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org