Author: tv
Date: Tue Oct 22 14:45:20 2019
New Revision: 1868761
URL: http://svn.apache.org/viewvc?rev=1868761&view=rev
Log:
Use JDK7 native methods
Modified:
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/dbObject/base/valueEquals.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/imports.vm
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=1868761&r1=1868760&r2=1868761&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
Tue Oct 22 14:45:20 2019
@@ -38,7 +38,7 @@
#if ($foreignColumnElement.getAttribute("primitive") == "true")
if ($localReferenceFieldName != null &&
${localReferenceFieldName}.${foreignColumnGetter}() != v)
#else
- if ($localReferenceFieldName != null &&
!org.apache.commons.lang3.ObjectUtils.equals(${localReferenceFieldName}.${foreignColumnGetter}(),
v))
+ if ($localReferenceFieldName != null &&
!Objects.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=1868761&r1=1868760&r2=1868761&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
Tue Oct 22 14:45:20 2019
@@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
#if ($torqueGen.booleanOption("torque.addIntakeRetrievable"))
import $torqueGen.option("torque.retrievableInterface");
@@ -60,7 +61,6 @@ 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.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=1868761&r1=1868760&r2=1868761&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
Tue Oct 22 14:45:20 2019
@@ -48,7 +48,7 @@
#elseif ($localColumnFieldType == "char")
#set ( $conditional = "$conditional${and}this.${localColumnField} != '\0'"
)
#else
- #set ( $conditional =
"$conditional${and}!org.apache.commons.lang3.ObjectUtils.equals(this.${localColumnField},
null)" )
+ #set ( $conditional =
"$conditional${and}!Objects.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=1868761&r1=1868760&r2=1868761&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
Tue Oct 22 14:45:20 2019
@@ -32,6 +32,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
#if ($torqueGen.booleanOption("torque.addIntakeRetrievable"))
@@ -62,7 +63,6 @@ import $torqueGen.option("torque.om.crit
import org.apache.torque.util.TorqueConnection;
import org.apache.torque.util.Transaction;
#end
-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/valueEquals.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/valueEquals.vm?rev=1868761&r1=1868760&r2=1868761&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/valueEquals.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/valueEquals.vm
Tue Oct 22 14:45:20 2019
@@ -48,7 +48,7 @@
#if ($primitive == "true")
if (this.${columnField} != toCompare.${getter}())
#else
- if (!ObjectUtils.equals(this.${columnField}, toCompare.${getter}()))
+ if (!Objects.equals(this.${columnField}, toCompare.${getter}()))
#end
{
return false;
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm?rev=1868761&r1=1868760&r2=1868761&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm
Tue Oct 22 14:45:20 2019
@@ -39,7 +39,7 @@
#if ($foreignColumnElement.getAttribute("primitive") == "true")
if ($localReferenceFieldName != null &&
${localReferenceFieldName}.${foreignColumnGetter}() != v)
#else
- if ($localReferenceFieldName != null &&
!ObjectUtils.equals(${localReferenceFieldName}.${foreignColumnGetter}(), v))
+ if ($localReferenceFieldName != null &&
!Objects.equals(${localReferenceFieldName}.${foreignColumnGetter}(), v))
#end
{
$localReferenceFieldName = null;
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm?rev=1868761&r1=1868760&r2=1868761&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm
Tue Oct 22 14:45:20 2019
@@ -28,7 +28,7 @@
#if ($primitive == "true")
if (this.$field != v)
#else
- if (!ObjectUtils.equals(this.$field, v))
+ if (!Objects.equals(this.$field, v))
#end
{
setModified(true);
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.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/doUpdate.vm?rev=1868761&r1=1868760&r2=1868761&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm
Tue Oct 22 14:45:20 2019
@@ -98,7 +98,7 @@
throw new NoRowsException(
"The row to update does not exist in the database");
}
- if (!ObjectUtils.equals(
+ if (!Objects.equals(
${field}.${columnGetter}(),
$columnField))
{
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=1868761&r1=1868760&r2=1868761&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
Tue Oct 22 14:45:20 2019
@@ -51,9 +51,9 @@ import java.util.Map;
import java.util.HashMap;
import java.util.Set;
import java.util.HashSet;
+import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.commons.lang3.ObjectUtils;
import org.apache.torque.NoRowsException;
import org.apache.torque.OptimisticLockingFailedException;
import org.apache.torque.TooManyRowsException;
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
