svn commit: r1936627 - in db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates: bean/inheritance manager/base recordmapper/base

Author: tv
Date: Mon Jul 27 10:14:17 2026
New Revision: 1936627

Log:
Reduce amount of warnings in generated Java code

Modified:
   db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm
   db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm
   db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm
   db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm
   db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm

Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm	Mon Jul 27 10:08:07 2026	(r1936626)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm	Mon Jul 27 10:14:17 2026	(r1936627)
@@ -37,4 +37,5 @@ public class $beanClassName
     extends $beanExtends
     implements Serializable
 {
+$torqueGen.mergepoint("serialVersionUid")
 }

Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm	Mon Jul 27 10:08:07 2026	(r1936626)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm	Mon Jul 27 10:14:17 2026	(r1936627)
@@ -25,8 +25,6 @@
 ##
 package ${baseManagerPackage};
 
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 import org.apache.torque.Torque;
@@ -242,7 +240,7 @@ $torqueGen.mergepoint("serialVersionUid"
     /**
      * Gets a ModuleEntity based on id.
      *
-     * @param id a <code>NumberKey</code> value
+     * @param id an <code>ObjectKey</code> value
      */
     protected ${dbObjectClassName} retrieveStoredOM(ObjectKey<?> id)
         throws TorqueException
@@ -253,10 +251,11 @@ $torqueGen.mergepoint("serialVersionUid"
     /**
      * Gets a list of ModuleEntities based on id's.
      *
-     * @param ids a <code>NumberKey[]</code> value
+     * @param ids a List of <code>ObjectKey</code> values
      * @return a <code>List</code> value
      * @exception TorqueException if an error occurs
      */
+    @SuppressWarnings("unchecked")
     protected List<${dbObjectClassName}> retrieveStoredOMs(List<? extends ObjectKey<?>> ids)
         throws TorqueException
     {

Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm	Mon Jul 27 10:08:07 2026	(r1936626)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm	Mon Jul 27 10:14:17 2026	(r1936627)
@@ -36,6 +36,6 @@
 #end
  *
  * You should not use this class directly.  It should not even be
- * extended; all references should be to ${beanClassName}
+ * extended; all references should be to ${managerClassName}
  */
  
\ No newline at end of file

Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm	Mon Jul 27 10:08:07 2026	(r1936626)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm	Mon Jul 27 10:14:17 2026	(r1936627)
@@ -66,9 +66,9 @@
             try
             {
                 Class<?> omClass = Class.forName(classKey.toString());
-                $tableField = ($dbObjectClassName) omClass.newInstance();
+                $tableField = ($dbObjectClassName) omClass.getDeclaredConstructor().newInstance();
             }
-            catch (InstantiationException | IllegalAccessException | ClassNotFoundException e)
+            catch (InstantiationException | IllegalAccessException | ClassNotFoundException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException e)
             {
                 throw new TorqueException(e);
             }

Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm	Mon Jul 27 10:08:07 2026	(r1936626)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm	Mon Jul 27 10:14:17 2026	(r1936627)
@@ -30,6 +30,7 @@
 package ${baseRecordMapperPackage};
 
 import java.io.Serial;
+import java.lang.reflect.InvocationTargetException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashSet;