Author: gk
Date: Mon Oct 21 12:10:24 2019
New Revision: 1868702
URL: http://svn.apache.org/viewvc?rev=1868702&view=rev
Log:
- update dependency dbcp2 to 2.7.0
Torque Templates:
- update static package refs ObjectUtils to lang3 instead of lang.
- fix reference bug of velocity variable foreignPrimaryKeyColumnElement, which
is already a column.
- fix method call from save to toupdate if saveMethodsInDbObjects is not true
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObjectForView.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
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/peer/impl/base/imports.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
Modified: db/torque/torque4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Mon Oct 21 12:10:24 2019
@@ -355,7 +355,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.5.0</version>
+ <version>2.7.0</version>
</dependency>
<dependency>
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
Mon Oct 21 12:10:24 2019
@@ -38,7 +38,7 @@
#if ($foreignColumnElement.getAttribute("primitive") == "true")
if ($localReferenceFieldName != null &&
${localReferenceFieldName}.${foreignColumnGetter}() != v)
#else
- if ($localReferenceFieldName != null &&
!org.apache.commons.lang.ObjectUtils.equals(${localReferenceFieldName}.${foreignColumnGetter}(),
v))
+ if ($localReferenceFieldName != null &&
!org.apache.commons.lang3.ObjectUtils.equals(${localReferenceFieldName}.${foreignColumnGetter}(),
v))
#end
{
$localReferenceFieldName = null;
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObjectForView.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObjectForView.vm?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObjectForView.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObjectForView.vm
Mon Oct 21 12:10:24 2019
@@ -60,7 +60,7 @@ import $torqueGen.option("torque.om.crit
#if ($torqueGen.booleanOption("torque.om.addSaveMethods") &&
$saveMethodsInDbObjects == "true")
import org.apache.torque.util.Transaction;
#end
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
#foreach ($columnElement in
$torqueGen.getSourceElement().getChildren("column"))
#set ($colEnumPackage = $columnElement.getAttribute("enumPackage"))
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
Mon Oct 21 12:10:24 2019
@@ -48,7 +48,7 @@
#elseif ($localColumnFieldType == "char")
#set ( $conditional = "$conditional${and}this.${localColumnField} != '\0'"
)
#else
- #set ( $conditional =
"$conditional${and}!org.apache.commons.lang.ObjectUtils.equals(this.${localColumnField},
null)" )
+ #set ( $conditional =
"$conditional${and}!org.apache.commons.lang3.ObjectUtils.equals(this.${localColumnField},
null)" )
#end
#if ($arglist != "" )
#if (${useManagers} == "true")
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm
Mon Oct 21 12:10:24 2019
@@ -62,7 +62,7 @@ import $torqueGen.option("torque.om.crit
import org.apache.torque.util.TorqueConnection;
import org.apache.torque.util.Transaction;
#end
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
#foreach ($columnElement in
$torqueGen.getSourceElement().getChildren("column"))
#set ($colEnumPackage = $columnElement.getAttribute("enumPackage"))
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/imports.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/imports.vm?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/imports.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/imports.vm
Mon Oct 21 12:10:24 2019
@@ -53,7 +53,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.stream.Collectors;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.torque.NoRowsException;
import org.apache.torque.OptimisticLockingFailedException;
import org.apache.torque.TooManyRowsException;
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm?rev=1868702&r1=1868701&r2=1868702&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
Mon Oct 21 12:10:24 2019
@@ -150,10 +150,10 @@
${foreignTablePeerClassName}.${peerColumnName},
localKey);
#else
- SimpleKey<?>[] keys = (SimpleKey[]) localKey.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[]) localKey.getValue(); // more than
one foreign key reference
#set ( $i = 0 )
#foreach ($referenceElement in $foreignKeyReferences)
- #set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
+ #set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
#set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
Criterion c$i = new Criterion(
${foreignTablePeerClassName}.${peerColumnName}, keys[$i]);
@@ -198,8 +198,9 @@
{
SimpleKey<?>[] toSavePrimaryKeys = (SimpleKey[])
toSaveKey.getValue();
#set ( $i = 0 )
- #foreach ($columnElement in $foreignPrimaryKeyColumnElements)
- #set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
+ ## more than one foreign primary key
+ #foreach ($referenceElement in $foreignPrimaryKeyColumnElements)
+ #set ( $columnElement = $referenceElement ) ##
foreignPrimaryKeyColumnElement is already column
#set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
Criterion p$i = new Criterion(
${foreignTablePeerClassName}.${peerColumnName},
@@ -240,7 +241,7 @@
{
toLinkTo.${adder}(toSaveElement);
#if ($saveMethodsInDbObjects != "true")
- ${foreignTablePeerClassName}.save(toSaveElement, connection);
+ ${foreignTablePeerClassName}.doUpdate(toSaveElement,
connection);
#else
toSaveElement.save(connection);
#end
@@ -259,7 +260,7 @@
}
#end
#if ($saveMethodsInDbObjects != "true")
- ${foreignTablePeerClassName}.save(toSaveElement, connection);
+ ${foreignTablePeerClassName}.doUpdate(toSaveElement,
connection);
#else
toSaveElement.save(connection);
#end
@@ -285,8 +286,8 @@
{
SimpleKey<?>[] toSavePrimaryKeys = (SimpleKey[])
toSaveKey.getValue();
#set ( $i = 0 )
- #foreach ($columnElement in $foreignPrimaryKeyColumnElements)
- #set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
+ #foreach ($referenceElement in $foreignPrimaryKeyColumnElements)
+ #set ( $columnElement = $referenceElement ) ##
.getChild("local-column").getChild("column") foreignPrimaryKeyColumnElement is
aready column
#set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
Criterion p$i = new Criterion(
${foreignTablePeerClassName}.${peerColumnName},
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
