You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2019/03/08 15:16:28 UTC
svn commit: r1855051 - in
/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates:
bean/base/ dbObject/base/ general/ peer/base/ peer/impl/base/
recordmapper/base/
Author: tv
Date: Fri Mar 8 15:16:28 2019
New Revision: 1855051
URL: http://svn.apache.org/viewvc?rev=1855051&view=rev
Log:
Silence most compiler warnings in generated code
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.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/getByNameMethods.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeerForView.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm Fri Mar 8 15:16:28 2019
@@ -59,12 +59,14 @@ import ${colEnumPackage}.${colEnumClassN
#end
$torqueGen.mergepoint("classJavadoc")
+@SuppressWarnings("unused")
public abstract class $baseBeanClassName
#if ( $torqueGen.option("beanExtendsClass") && $torqueGen.option("beanExtendsClass") != "" )
extends $torqueGen.option("beanExtendsClass")
#end
implements Serializable
{
+$torqueGen.mergepoint("serialVersionUid")
## ----------------
## member variables
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm Fri Mar 8 15:16:28 2019
@@ -35,6 +35,7 @@ $torqueGen.mergepoint("classAnnotations"
#else
#set ($extendsBaseClass = "extends $baseClass" )
#end
+@SuppressWarnings("unused")
public abstract class $baseDbObjectClassName $extendsBaseClass
implements ##
#if ($torqueGen.booleanOption("torque.om.addSaveMethods") && $saveMethodsInDbObjects == "true")
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=1855051&r1=1855050&r2=1855051&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 Fri Mar 8 15:16:28 2019
@@ -89,6 +89,7 @@ $torqueGen.mergepoint("classJavadoc")
#else
#set ($extendsBaseClass = "extends $baseClass" )
#end
+@SuppressWarnings("unused")
public abstract class $baseDbObjectClassName $extendsBaseClass
implements ObjectModel, Serializable##
#if ($torqueGen.booleanOption("torque.om.addIntakeRetrievable")), $torqueGen.option("torque.om.retrievableInterface")#end##
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm Fri Mar 8 15:16:28 2019
@@ -182,7 +182,6 @@
* @param name peer name
* @return value
*/
- @SuppressWarnings("unlikely-arg-type")
public Object getByPeerName(String name)
{
#foreach ($columnElement in $columnElements)
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm Fri Mar 8 15:16:28 2019
@@ -21,10 +21,14 @@
##
## This template generates a serialVersionUID field from the
## time stamp at generation time, if the option torque.om:addTimeStamp
-## is set to true.
+## is set to true, else the serialVersionUID is set to 1.
##
#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
/** Serial version */
private static final long serialVersionUID = ${torqueGen.now().Time}L;
+#else
+ /** Serial version */
+ private static final long serialVersionUID = 1L;
+
#end
\ No newline at end of file
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm Fri Mar 8 15:16:28 2019
@@ -32,6 +32,7 @@ package ${basePeerPackage};
$torqueGen.mergepoint("imports")
$torqueGen.mergepoint("classJavadoc")
+@SuppressWarnings("unused")
public abstract class $basePeerClassName
#if ( ${basePeerBaseClass} && (${basePeerBaseClass} != "") )
extends ${basePeerBaseClass}
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeerForView.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeerForView.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeerForView.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeerForView.vm Fri Mar 8 15:16:28 2019
@@ -32,6 +32,7 @@ package ${basePeerPackage};
$torqueGen.mergepoint("imports")
$torqueGen.mergepoint("classJavadoc")
+@SuppressWarnings("unused")
public abstract class $basePeerClassName
#if ( ${basePeerBaseClass} && (${basePeerBaseClass} != "") )
extends ${basePeerBaseClass}
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.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/basePeerForViewImpl.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm Fri Mar 8 15:16:28 2019
@@ -32,6 +32,7 @@ package ${basePeerPackage};
$torqueGen.mergepoint("imports")
$torqueGen.mergepoint("classJavadoc")
+@SuppressWarnings("unused")
public abstract class $basePeerImplClassName
#if (${basePeerImplBaseClass} && ${basePeerImplBaseClass} !="")
extends ${basePeerImplBaseClass}<${dbObjectClassName}>
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.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/basePeerImpl.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm Fri Mar 8 15:16:28 2019
@@ -32,6 +32,7 @@ package ${basePeerPackage};
$torqueGen.mergepoint("imports")
$torqueGen.mergepoint("classJavadoc")
+@SuppressWarnings("unused")
public abstract class $basePeerImplClassName
#if (${basePeerImplBaseClass} && ${basePeerImplBaseClass} !="")
extends ${basePeerImplBaseClass}<${dbObjectClassName}>
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm?rev=1855051&r1=1855050&r2=1855051&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm Fri Mar 8 15:16:28 2019
@@ -81,9 +81,18 @@ import ${dbObjectPackage}.${inheritanceC
*
#end
*/
+@SuppressWarnings("unused")
public class ${baseRecordMapperClassName} implements RecordMapper<${dbObjectClassName}>
{
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
+ /** Serial version */
+ private static final long serialVersionUID = ${torqueGen.now().Time}L;
+#else
+ /** Serial version */
+ private static final long serialVersionUID = 1L;
+
+#end
/** The class log. */
private static Log log
= LogFactory.getLog(${baseRecordMapperClassName}.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org
Re: svn commit: r1855051 - in
/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates:
bean/base/ dbObject/base/ general/ peer/base/ peer/impl/base/
recordmapper/base/
Posted by Thomas Vandahl <tv...@apache.org>.
Hi Jeff,
On 08.03.19 16:24, Jeffery Painter wrote:
> Nice! I was afraid to mess with the templates too much when I tried
> fixing all the JavaDoc issues. Looking forward to a release soon so we
> can figure out what we need to integrate with Turbine :-)
>
> Let me know if I can help with anything here.
Thanks for the offer. I guess we are pretty much through. My gut feeling
tells me that still lots of things can be simplified with Java8 in the
runtime but we need to take a break somewhere.
It might be useful to look after PMD and Findbugs complaints, if you want.
I'm planning to prepare a release candidate for 4.1 real soon now.
Bye, Thomas
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org
Re: svn commit: r1855051 - in
/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates:
bean/base/ dbObject/base/ general/ peer/base/ peer/impl/base/
recordmapper/base/
Posted by Jeffery Painter <je...@jivecast.com>.
Nice! I was afraid to mess with the templates too much when I tried
fixing all the JavaDoc issues. Looking forward to a release soon so we
can figure out what we need to integrate with Turbine :-)
Let me know if I can help with anything here.
-
Jeff
On 3/8/19 10:16 AM, tv@apache.org wrote:
> Author: tv
> Date: Fri Mar 8 15:16:28 2019
> New Revision: 1855051
>
> URL: http://svn.apache.org/viewvc?rev=1855051&view=rev
> Log:
> Silence most compiler warnings in generated code
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org