db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1849386 - in /db/torque/torque4/trunk: torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/ torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/ torque-templates/...
Date Thu, 20 Dec 2018 13:28:59 GMT
Author: tv
Date: Thu Dec 20 13:28:59 2018
New Revision: 1849386

URL: http://svn.apache.org/viewvc?rev=1849386&view=rev
Log:
Generify ObjectKey

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/equalsHashCode.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doDelete.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.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/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/main/java/org/apache/torque/OptimisticLockingInterface.java
    db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingPeerInterface.java
    db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/TestPeerInterface.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/equalsHashCode.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/equalsHashCode.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/equalsHashCode.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/equalsHashCode.vm Thu Dec 20 13:28:59 2018
@@ -59,7 +59,7 @@
      */
     public int hashCode()
     {
-        ObjectKey ok = getPrimaryKey();
+        ObjectKey<?> ok = getPrimaryKey();
         if (ok == null)
         {
             return super.hashCode();

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm Thu Dec 20 13:28:59 2018
@@ -32,7 +32,7 @@
      *
      * @return an ObjectKey.
      */
-    public ObjectKey ${foreignKeyGetter}()
+    public ObjectKey<?> ${foreignKeyGetter}()
     {
 #if ($referenceElements.size() == 1)
   #set ( $columnElement = $referenceElements.get(0).getChild("local-column").getChild("column") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm Thu Dec 20 13:28:59 2018
@@ -53,11 +53,11 @@
      *
      * @param key $columnField ObjectKey
      */
-    public void setPrimaryKey(ObjectKey key)
+    public void setPrimaryKey(ObjectKey<?> key)
         $throwsClause
     {
   #if($columnFieldType == "java.math.BigDecimal")
-        ${setter}(((NumberKey) key).getBigDecimal());
+        ${setter}(((NumberKey) key).getValue());
   #elseif ($columnFieldType == "Short")
         ${setter}(Short.valueOf(((NumberKey) key).shortValue()));
   #elseif ($columnFieldType == "Integer")
@@ -76,9 +76,9 @@
   #elseif($columnFieldType == "String")
         ${setter}(key.toString());
   #elseif($columnFieldType == "java.util.Date")
-        ${setter}(((DateKey) key).getDate());
+        ${setter}(((DateKey) key).getValue());
   #elseif($columnFieldType == "Boolean" || $columnFieldType == "boolean" )
-        ${setter}(((BooleanKey) key).getBoolean());
+        ${setter}(((BooleanKey) key).getValue());
   #else
         ${setter}(($columnFieldType) key);
   #end
@@ -128,7 +128,7 @@
      *
      * @param key the primary key to set, not null.
      */
-    public void setPrimaryKey(ObjectKey key) throws TorqueException
+    public void setPrimaryKey(ObjectKey<?> key) throws TorqueException
     {
         SimpleKey[] keys = (SimpleKey[]) key.getValue();
   #set ($i = 0)
@@ -139,7 +139,7 @@
     #set ( $number = $columnElement.getAttribute("number") )
     #set ( $primitive = $columnElement.getAttribute("primitive") )
     #if($columnFieldType == "java.math.BigDecimal")
-        ${setter}(((NumberKey) keys[$i]).getBigDecimal());
+        ${setter}(((NumberKey) keys[$i]).getValue());
     #elseif ($number == "true")
       #if ($primitive == "true")
         ${setter}(((NumberKey) keys[$i]).${columnFieldType}Value());
@@ -154,9 +154,9 @@
     #elseif($columnFieldType == "String")
         ${setter}(keys[$i].toString());
     #elseif($columnFieldType == "java.util.Date")
-        ${setter}(((DateKey) keys[$i]).getDate());
+        ${setter}(((DateKey) keys[$i]).getValue());
     #elseif($columnFieldType == "Boolean" || $columnFieldType == "boolean")
-        ${setter}(((BooleanKey) keys[$i]).getBoolean());
+        ${setter}(((BooleanKey) keys[$i]).getValue());
     #else
         ${setter}(($columnFieldType) keys[$i]);
     #end
@@ -206,7 +206,7 @@
      *
      * @throws NoSuchOperationException always.
      */
-    public void setPrimaryKey(ObjectKey key) throws TorqueException
+    public void setPrimaryKey(ObjectKey<?> key) throws TorqueException
     {
         throw new UnsupportedOperationException(
                 "This table has no primary key");
@@ -230,7 +230,7 @@
      * returns an id that differentiates this object from others
      * of its class.
      */
-    public ObjectKey getPrimaryKey()
+    public ObjectKey<?> getPrimaryKey()
     {
 #if ($primaryKeyColumnElements.size() == 1)
   #set ( $columnElement = $primaryKeyColumnElements.get(0) )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm Thu Dec 20 13:28:59 2018
@@ -41,7 +41,7 @@
      * overridden in <code>$localTableElement.getAttribute("javaName")</code>.
 #end
      */
-    public void ${setter}Key(ObjectKey key) throws TorqueException
+    public void ${setter}Key(ObjectKey<?> key) throws TorqueException
     {
 #if ($referenceElements.size() > 1)
         SimpleKey[] keys = (SimpleKey[]) key.getValue();
@@ -64,7 +64,7 @@
   #elseif ($localFieldType == "long")
         ${localFieldSetter}(((NumberKey) $keyVariable).longValue());
   #elseif ($localFieldType == "java.math.BigDecimal")
-        ${localFieldSetter}(((NumberKey) $keyVariable).getBigDecimal());
+        ${localFieldSetter}(((NumberKey) $keyVariable).getValue());
   #elseif ($localFieldType == "byte")
         ${localFieldSetter}(((NumberKey) $keyVariable).byteValue());
   #elseif ($localFieldType == "float")
@@ -86,7 +86,7 @@
   #elseif ($localFieldType == "String")
         ${localFieldSetter}(${keyVariable}.toString());
   #elseif ($localFieldType == "Date")
-        ${localFieldSetter}(((DateKey)$keyVariable).getDate());
+        ${localFieldSetter}(((DateKey)$keyVariable).getValue());
   #end
   #set ( $i = $i + 1 )
 #end ## end of foreach loop over references

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm Thu Dec 20 13:28:59 2018
@@ -93,7 +93,7 @@ $torqueGen.mergepoint("serialVersionUid"
      * @return a <code>${dbObjectClassName}</code> value
      * @exception TorqueException if an error occurs
      */
-    public static ${dbObjectClassName} getInstance(ObjectKey id)
+    public static ${dbObjectClassName} getInstance(ObjectKey<?> id)
         throws TorqueException
     {
         return getManager().getOMInstance(id);
@@ -108,7 +108,7 @@ $torqueGen.mergepoint("serialVersionUid"
      * @return a <code>${dbObjectClassName}</code> value
      * @exception TorqueException if an error occurs
      */
-    public static ${dbObjectClassName} getCachedInstance(ObjectKey id)
+    public static ${dbObjectClassName} getCachedInstance(ObjectKey<?> id)
         throws TorqueException
     {
         return getManager().cacheGet(id);
@@ -123,7 +123,7 @@ $torqueGen.mergepoint("serialVersionUid"
      * @return a <code>${interfaceName}</code> value
      * @exception TorqueException if an error occurs
      */
-    public static ${dbObjectClassName} getInstance(ObjectKey id, boolean fromCache)
+    public static ${dbObjectClassName} getInstance(ObjectKey<?> id, boolean fromCache)
         throws TorqueException
     {
         return getManager().getOMInstance(id, fromCache);
@@ -169,7 +169,7 @@ $torqueGen.mergepoint("serialVersionUid"
      * @return a <code>List</code> value
      * @exception TorqueException if an error occurs
      */
-    public static List<${dbObjectClassName}> getInstances(List<? extends ObjectKey> ids)
+    public static List<${dbObjectClassName}> getInstances(List<? extends ObjectKey<?>> ids)
         throws TorqueException
     {
         return getManager().getOMs(ids);
@@ -184,7 +184,7 @@ $torqueGen.mergepoint("serialVersionUid"
      * @return a <code>List</code> value
      * @exception TorqueException if an error occurs
      */
-    public static List<${dbObjectClassName}> getInstances(List<? extends ObjectKey> ids, boolean fromCache)
+    public static List<${dbObjectClassName}> getInstances(List<? extends ObjectKey<?>> ids, boolean fromCache)
         throws TorqueException
     {
         return getManager().getOMs(ids, fromCache);
@@ -244,7 +244,7 @@ $torqueGen.mergepoint("serialVersionUid"
      *
      * @param id a <code>NumberKey</code> value
      */
-    protected ${dbObjectClassName} retrieveStoredOM(ObjectKey id)
+    protected ${dbObjectClassName} retrieveStoredOM(ObjectKey<?> id)
         throws TorqueException
     {
         return ${peerClassName}.retrieveByPK(id);
@@ -257,10 +257,10 @@ $torqueGen.mergepoint("serialVersionUid"
      * @return a <code>List</code> value
      * @exception TorqueException if an error occurs
      */
-    protected List<${dbObjectClassName}> retrieveStoredOMs(List<? extends ObjectKey> ids)
+    protected List<${dbObjectClassName}> retrieveStoredOMs(List<? extends ObjectKey<?>> ids)
         throws TorqueException
     {
-        return ${peerClassName}.retrieveByPKs((List<ObjectKey>)ids);
+        return ${peerClassName}.retrieveByPKs((List<ObjectKey<?>>)ids);
     }
 $torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm Thu Dec 20 13:28:59 2018
@@ -35,7 +35,7 @@
      *
      * @param pk the primary key value to build the criteria from, not null.
      */
-    public static Criteria buildCriteria(ObjectKey pk)
+    public static Criteria buildCriteria(ObjectKey<?> pk)
     {
         return ${peerImplGetter}().buildCriteria(pk);
     }
@@ -47,7 +47,7 @@
      * @param pks the primary key values to build the criteria from, not null,
      *        may not contain null.
      */
-    public static Criteria buildCriteria(Collection<ObjectKey> pks)
+    public static Criteria buildCriteria(Collection<ObjectKey<?>> pks)
     {
         return ${peerImplGetter}().buildCriteria(pks);
     }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doDelete.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doDelete.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doDelete.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doDelete.vm Thu Dec 20 13:28:59 2018
@@ -149,7 +149,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static int doDelete(ObjectKey pk) throws TorqueException
+    public static int doDelete(ObjectKey<?> pk) throws TorqueException
     {
         return ${peerImplGetter}().doDelete(pk);
     }
@@ -168,7 +168,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static int doDelete(ObjectKey pk, Connection con)
+    public static int doDelete(ObjectKey<?> pk, Connection con)
         throws TorqueException
     {
         return ${peerImplGetter}().doDelete(pk, con);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm Thu Dec 20 13:28:59 2018
@@ -41,7 +41,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static ObjectKey doInsert(ColumnValues columnValues) 
+    public static ObjectKey<?> doInsert(ColumnValues columnValues) 
             throws TorqueException
     {
         return ${peerImplGetter}().doInsert(columnValues);
@@ -63,7 +63,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static ObjectKey doInsert(ColumnValues columnValues, Connection con)
+    public static ObjectKey<?> doInsert(ColumnValues columnValues, Connection con)
             throws TorqueException
     {
         return ${peerImplGetter}().doInsert(columnValues, con);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm Thu Dec 20 13:28:59 2018
@@ -132,7 +132,7 @@
      * @throws NoRowsException Primary key was not found in database.
      * @throws TooManyRowsException Primary key was not found in database.
      */
-    public static $dbObjectClassName retrieveByPK(ObjectKey pk)
+    public static $dbObjectClassName retrieveByPK(ObjectKey<?> pk)
         throws TorqueException, NoRowsException, TooManyRowsException
     {
         return ${peerImplGetter}().retrieveByPK(pk);
@@ -148,7 +148,7 @@
      * @throws NoRowsException Primary key was not found in database.
      * @throws TooManyRowsException Primary key was not found in database.
      */
-    public static $dbObjectClassName retrieveByPK(ObjectKey pk, Connection con)
+    public static $dbObjectClassName retrieveByPK(ObjectKey<?> pk, Connection con)
         throws TorqueException, NoRowsException, TooManyRowsException
     {
         return ${peerImplGetter}().retrieveByPK(pk, con);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm Thu Dec 20 13:28:59 2018
@@ -78,7 +78,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static List<${dbObjectClassName}> retrieveByObjectKeys(Collection<ObjectKey> pks)
+    public static List<${dbObjectClassName}> retrieveByObjectKeys(Collection<ObjectKey<?>> pks)
         throws TorqueException
     {
         return ${peerImplGetter}().retrieveByObjectKeys(pks);
@@ -95,7 +95,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static List<${dbObjectClassName}> retrieveByObjectKeys(Collection<ObjectKey> pks, Connection con)
+    public static List<${dbObjectClassName}> retrieveByObjectKeys(Collection<ObjectKey<?>> pks, Connection con)
         throws TorqueException
     {
         return ${peerImplGetter}().retrieveByObjectKeys(pks, con);
@@ -115,7 +115,7 @@
      * @deprecated This method has been renamed to retrieveByObjectKeys.
      *             This method will not be generated any more in future versions of Torque.
      */
-    public static List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey> pks)
+    public static List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey<?>> pks)
         throws TorqueException
     {
         return ${peerImplGetter}().retrieveByPKs(pks);
@@ -135,7 +135,7 @@
      * @deprecated This method has been renamed to retrieveByObjectKeys.
      *             This method will not be generated any more in future versions of Torque.
      */
-    public static List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey> pks, Connection con)
+    public static List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey<?>> pks, Connection con)
         throws TorqueException
     {
         return ${peerImplGetter}().retrieveByPKs(pks, con);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.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/buildCriteria.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm Thu Dec 20 13:28:59 2018
@@ -35,7 +35,7 @@
      *
      * @param pk the primary key value to build the criteria from, not null.
      */
-    public Criteria buildCriteria(ObjectKey pk)
+    public Criteria buildCriteria(ObjectKey<?> pk)
     {
         Criteria criteria = new Criteria();
   #if ($primaryKeyColumnElements.size() == 1)
@@ -61,7 +61,7 @@
      * @param pks the primary key values to build the criteria from, not null,
      *        may not contain null.
      */
-    public Criteria buildCriteria(Collection<ObjectKey> pks)
+    public Criteria buildCriteria(Collection<ObjectKey<?>> pks)
     {
         Criteria criteria = new Criteria();
   #if ($primaryKeyColumnElements.size() == 1)
@@ -69,7 +69,7 @@
     #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
         criteria.andIn(${peerClassName}.$peerColumnName, pks);
   #else
-        for (ObjectKey pk : pks)
+        for (ObjectKey<?> pk : pks)
         {
             SimpleKey[] keys = (SimpleKey[])pk.getValue();
     #set ( $i = 0 )
@@ -100,10 +100,10 @@
     public Criteria buildPkCriteria(
             Collection<${dbObjectClassName}> objects)
     {
-        List<ObjectKey> pks = new ArrayList<ObjectKey>(objects.size());
+        List<ObjectKey<?>> pks = new ArrayList<ObjectKey<?>>(objects.size());
         for (${dbObjectClassName} object : objects)
         {
-            ObjectKey pk = object.getPrimaryKey();
+            ObjectKey<?> pk = object.getPrimaryKey();
             if (pk != null)
             {
                 pks.add(pk);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.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/fillReferencedObject.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm Thu Dec 20 13:28:59 2018
@@ -141,23 +141,23 @@
             Connection connection) 
         throws TorqueException
     {
-        Set<ObjectKey> foreignKeySet = new HashSet<ObjectKey>();
+        Set<ObjectKey<?>> foreignKeySet = new HashSet<ObjectKey<?>>();
         for (${localDbObjectClassName} current${localDbObjectClassName} : toFill)
         {
-            ObjectKey foreignKey = current${localDbObjectClassName}.${foreignKeyGetter}();
+            ObjectKey<?> foreignKey = current${localDbObjectClassName}.${foreignKeyGetter}();
             if (foreignKey != null)
             {
                 foreignKeySet.add(foreignKey);
             }
         }
         
-        Iterator<ObjectKey> foreignKeyIt = foreignKeySet.iterator();
-        List<ObjectKey> foreignKeyListChunk = new ArrayList<ObjectKey>();
-        Map<ObjectKey, ${fieldType}> referencedKeyTo${fieldType}Map 
-                = new HashMap<ObjectKey, ${fieldType}>();
+        Iterator<ObjectKey<?>> foreignKeyIt = foreignKeySet.iterator();
+        List<ObjectKey<?>> foreignKeyListChunk = new ArrayList<ObjectKey<?>>();
+        Map<ObjectKey<?>, ${fieldType}> referencedKeyTo${fieldType}Map 
+                = new HashMap<ObjectKey<?>, ${fieldType}>();
         while (foreignKeyIt.hasNext())
         {
-            ObjectKey currentKey = foreignKeyIt.next();
+            ObjectKey<?> currentKey = foreignKeyIt.next();
             foreignKeyListChunk.add(currentKey);
             if ((foreignKeyListChunk.size() < chunkSize || chunkSize == -1)
                 && foreignKeyIt.hasNext())
@@ -177,7 +177,7 @@
     #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
             criteria.andIn(${foreignTablePeerClassName}.${peerColumnName}, foreignKeyListChunk);
   #else
-            for (ObjectKey foreignKey : foreignKeyListChunk)
+            for (ObjectKey<?> foreignKey : foreignKeyListChunk)
             {
                 SimpleKey[] keys = (SimpleKey[]) foreignKey.getValue();
     #set ( $i = 0 )
@@ -211,7 +211,7 @@
   #if ($foreignKeyReferences.size() == 1)
     #set ( $columnElement = $foreignKeyReferences.get(0).getChild("foreign-column").getChild("column") )
     #set ( $getter = $columnElement.getAttribute("getter") )
-                ObjectKey foreignKey = SimpleKey.keyFor(referencedObject.${getter}());
+                ObjectKey<?> foreignKey = SimpleKey.keyFor(referencedObject.${getter}());
   #else
                 SimpleKey[] keyElementArray = new SimpleKey[$foreignKeyReferences.size()];
     #set ($i = 0)
@@ -222,7 +222,7 @@
                         referencedObject.${getter}());
       #set ($i = $i + 1)
     #end
-                ObjectKey foreignKey = new ComboKey(keyElementArray);
+                ObjectKey<?> foreignKey = new ComboKey(keyElementArray);
   #end
                 referencedKeyTo${fieldType}Map.put(
                         foreignKey,
@@ -235,7 +235,7 @@
         List<${fieldType}> result = new ArrayList<${fieldType}>();
         for (${localDbObjectClassName} objectToFill : toFill)
         {
-            ObjectKey foreignKey = objectToFill.${foreignKeyGetter}();
+            ObjectKey<?> foreignKey = objectToFill.${foreignKeyGetter}();
 #if ($foreignKeyReferences.size() == 1)
             if (foreignKey == null || foreignKey.getValue() == null)
 #else

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.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/fillReferencingObjects.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm Thu Dec 20 13:28:59 2018
@@ -143,16 +143,16 @@
             Connection connection)
         throws TorqueException
     {
-        Set<ObjectKey> localKeySet = new HashSet<ObjectKey>();
+        Set<ObjectKey<?>> localKeySet = new HashSet<ObjectKey<?>>();
         for (${localDbObjectClassName} current${localDbObjectClassName} : toFill)
         {
 #if ($referencesPrimaryKey)
-            ObjectKey localKey = current${localDbObjectClassName}.getPrimaryKey();
+            ObjectKey<?> localKey = current${localDbObjectClassName}.getPrimaryKey();
 #else
   #if ($foreignKeyReferences.size() == 1)
     #set ( $localReferenceColumnElement = $foreignKeyReferences.get(0).getChild("foreign-column").getChild("column") )
     #set ( $localFieldGetter = $localReferenceColumnElement.getAttribute("getter") )
-            ObjectKey localKey = SimpleKey.keyFor(current${localDbObjectClassName}.${localFieldGetter}());
+            ObjectKey<?> localKey = SimpleKey.keyFor(current${localDbObjectClassName}.${localFieldGetter}());
   #else
             SimpleKey[] keyElementArray = new SimpleKey[$foreignKeyReferences.size()];
     #set ($i = 0)
@@ -163,19 +163,19 @@
                     current${localDbObjectClassName}.${localFieldGetter}());
       #set ($i = $i + 1)
     #end
-            ObjectKey localKey = new ComboKey(keyElementArray);
+            ObjectKey<?> localKey = new ComboKey(keyElementArray);
   #end
 #end
             localKeySet.add(localKey);
         }
 
-        Iterator<ObjectKey> localKeyIt = localKeySet.iterator();
-        List<ObjectKey> localKeyListChunk = new ArrayList<ObjectKey>();
-        Map<ObjectKey, List<${fieldContainedType}>> fkTo${fieldContainedType}Map
-                = new HashMap<ObjectKey, List<${fieldContainedType}>>();
+        Iterator<ObjectKey<?>> localKeyIt = localKeySet.iterator();
+        List<ObjectKey<?>> localKeyListChunk = new ArrayList<ObjectKey<?>>();
+        Map<ObjectKey<?>, List<${fieldContainedType}>> fkTo${fieldContainedType}Map
+                = new HashMap<ObjectKey<?>, List<${fieldContainedType}>>();
         while (localKeyIt.hasNext())
         {
-            ObjectKey currentKey = localKeyIt.next();
+            ObjectKey<?> currentKey = localKeyIt.next();
             localKeyListChunk.add(currentKey);
             if ((localKeyListChunk.size() < chunkSize || chunkSize == -1)
                 && localKeyIt.hasNext())
@@ -189,7 +189,7 @@
   #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
             criteria.andIn(${foreignTablePeerClassName}.${peerColumnName}, localKeyListChunk);
 #else
-            for (ObjectKey localKey : localKeyListChunk)
+            for (ObjectKey<?> localKey : localKeyListChunk)
             {
                 SimpleKey[] keys = (SimpleKey[]) localKey.getValue();
   #set ( $i = 0 )
@@ -213,7 +213,7 @@
                      connection);
             for (${fieldContainedType} referencedObject : referenced${fieldContainedType}List)
             {
-                ObjectKey foreignKey = referencedObject.${foreignKeyGetter}();
+                ObjectKey<?> foreignKey = referencedObject.${foreignKeyGetter}();
                 List<${fieldContainedType}> objectsWithForeignKey 
                     = fkTo${fieldContainedType}Map.get(foreignKey);
                 if (objectsWithForeignKey == null)
@@ -234,12 +234,12 @@
             objectToFill.${initializer}();
             objectToFill.${getter}().clear();
 #if ($referencesPrimaryKey)
-            ObjectKey localKey = objectToFill.getPrimaryKey();
+            ObjectKey<?> localKey = objectToFill.getPrimaryKey();
 #else
   #if ($foreignKeyReferences.size() == 1)
     #set ( $localReferenceColumnElement = $foreignKeyReferences.get(0).getChild("foreign-column").getChild("column") )
     #set ( $localFieldGetter = $localReferenceColumnElement.getAttribute("getter") )
-            ObjectKey localKey = SimpleKey.keyFor(objectToFill.${localFieldGetter}());
+            ObjectKey<?> localKey = SimpleKey.keyFor(objectToFill.${localFieldGetter}());
   #else
             SimpleKey[] keyElementArray = new SimpleKey[$foreignKeyReferences.size()];
     #set ($i = 0)
@@ -250,7 +250,7 @@
                     objectToFill.${localFieldGetter}());
       #set ($i = $i + 1)
     #end
-            ObjectKey localKey = new ComboKey(keyElementArray);
+            ObjectKey<?> localKey = new ComboKey(keyElementArray);
   #end
 #end
             List<${fieldContainedType}> referencingList

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.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/retrieveByPK.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm Thu Dec 20 13:28:59 2018
@@ -143,7 +143,7 @@
      * @throws NoRowsException Primary key was not found in database.
      * @throws TooManyRowsException Primary key was not found in database.
      */
-    public $dbObjectClassName retrieveByPK(ObjectKey pk)
+    public $dbObjectClassName retrieveByPK(ObjectKey<?> pk)
         throws TorqueException, NoRowsException, TooManyRowsException
     {
         try (TorqueConnection connection = Transaction.begin(getDatabaseName()))
@@ -164,7 +164,7 @@
      * @throws NoRowsException Primary key was not found in database.
      * @throws TooManyRowsException Primary key was not found in database.
      */
-    public $dbObjectClassName retrieveByPK(ObjectKey pk, Connection con)
+    public $dbObjectClassName retrieveByPK(ObjectKey<?> pk, Connection con)
         throws TorqueException, NoRowsException, TooManyRowsException
     {
         Criteria criteria = buildCriteria(pk);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.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/retrieveByPKs.vm?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm Thu Dec 20 13:28:59 2018
@@ -75,7 +75,7 @@
         {
             return new ArrayList<${dbObjectClassName}>();
         }
-        List<ObjectKey> objectKeyList = new ArrayList<ObjectKey>();
+        List<ObjectKey<?>> objectKeyList = new ArrayList<ObjectKey<?>>();
         for (${columnFieldType} pk : pks)
         {
             objectKeyList.add(SimpleKey.keyFor(pk));
@@ -97,7 +97,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public List<${dbObjectClassName}> retrieveByObjectKeys(Collection<ObjectKey> pks)
+    public List<${dbObjectClassName}> retrieveByObjectKeys(Collection<ObjectKey<?>> pks)
         throws TorqueException
     {
         try (TorqueConnection connection = Transaction.begin(getDatabaseName()))
@@ -121,7 +121,7 @@
      *         rethrown wrapped into a TorqueException.
      */
     public List<${dbObjectClassName}> retrieveByObjectKeys(
-                Collection<ObjectKey> pks,
+                Collection<ObjectKey<?>> pks,
                 Connection dbcon)
             throws TorqueException
     {
@@ -149,7 +149,7 @@
      * @deprecated This method has been renamed to retrieveByObjectKeys.
      *             This method will not be generated any more in future versions of Torque.
      */
-    public List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey> pks)
+    public List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey<?>> pks)
         throws TorqueException
     {
         return retrieveByObjectKeys(pks);
@@ -170,7 +170,7 @@
      * @deprecated This method has been renamed to retrieveByObjectKeys.
      *             This method will not be generated any more in future versions of Torque.
      */
-    public List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey> pks, Connection con)
+    public List<${dbObjectClassName}> retrieveByPKs(Collection<ObjectKey<?>> pks, Connection con)
         throws TorqueException
     {
         return retrieveByObjectKeys(pks, con);

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=1849386&r1=1849385&r2=1849386&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 Thu Dec 20 13:28:59 2018
@@ -122,12 +122,12 @@
         toLinkTo.${resetter}();
         toLinkTo.${getter}(connection);
 #if ($referencesPrimaryKey)
-        ObjectKey localKey = toLinkTo.getPrimaryKey();
+        ObjectKey<?> localKey = toLinkTo.getPrimaryKey();
 #else
   #if ($foreignKeyReferences.size() == 1)
     #set ( $localReferenceColumnElement = $foreignKeyReferences.get(0).getChild("foreign-column").getChild("column") )
     #set ( $localFieldGetter = $localReferenceColumnElement.getAttribute("getter") )
-        ObjectKey localKey = SimpleKey.keyFor(toLinkTo.${localFieldGetter}());
+        ObjectKey<?> localKey = SimpleKey.keyFor(toLinkTo.${localFieldGetter}());
   #else
         SimpleKey[] keyElementArray = new SimpleKey[$foreignKeyReferences.size()];
     #set ($i = 0)
@@ -138,7 +138,7 @@
                 toLinkTo.${localFieldGetter}());
       #set ($i = $i + 1)
     #end
-        ObjectKey localKey = new ComboKey(keyElementArray);
+        ObjectKey<?> localKey = new ComboKey(keyElementArray);
   #end
 #end
 
@@ -166,10 +166,10 @@
         Criterion onlyReferencingCriterion = c0;
 #end
         criteria.where(onlyReferencingCriterion);
-        Set<ObjectKey> toSaveKeys = new HashSet<ObjectKey>();
+        Set<ObjectKey<?>> toSaveKeys = new HashSet<ObjectKey<?>>();
         for (${foreignDbObjectClassName} toSaveElement : toSave)
         {
-            ObjectKey toSaveKey = toSaveElement.getPrimaryKey();
+            ObjectKey<?> toSaveKey = toSaveElement.getPrimaryKey();
             if (toSaveKey.getValue() != null)
             {
                 toSaveKeys.add(toSaveKey);
@@ -194,7 +194,7 @@
                       Criteria.IN);
 #else
             Criterion toSaveKeyCriterion = null;
-            for (ObjectKey toSaveKey : toSaveKeys)
+            for (ObjectKey<?> toSaveKey : toSaveKeys)
             {
                 SimpleKey[] toSavePrimaryKeys = (SimpleKey[]) toSaveKey.getValue();
   #set ( $i = 0 )
@@ -281,7 +281,7 @@
                     Criteria.NOT_IN);
 #else
             Criterion toSaveKeyCriterion = null;
-            for (ObjectKey toSaveKey : toSaveKeys)
+            for (ObjectKey<?> toSaveKey : toSaveKeys)
             {
                 SimpleKey[] toSavePrimaryKeys = (SimpleKey[]) toSaveKey.getValue();
   #set ( $i = 0 )

Modified: db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingInterface.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingInterface.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingInterface.java (original)
+++ db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingInterface.java Thu Dec 20 13:28:59 2018
@@ -35,7 +35,7 @@ public interface OptimisticLockingInterf
 
     void save(Connection connection) throws TorqueException;
 
-    ObjectKey getPrimaryKey();
+    ObjectKey<?> getPrimaryKey();
 
     boolean isModified();
 }

Modified: db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingPeerInterface.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingPeerInterface.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingPeerInterface.java (original)
+++ db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingPeerInterface.java Thu Dec 20 13:28:59 2018
@@ -33,7 +33,7 @@ public interface OptimisticLockingPeerIn
 
     T doSelectSingleRecord(T toSelect) throws TorqueException;
 
-    T retrieveByPK(ObjectKey key) throws TorqueException;
+    T retrieveByPK(ObjectKey<?> key) throws TorqueException;
 
     int doDelete(T toDelete) throws TorqueException;
 

Modified: db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/TestPeerInterface.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/TestPeerInterface.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/TestPeerInterface.java (original)
+++ db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/TestPeerInterface.java Thu Dec 20 13:28:59 2018
@@ -32,5 +32,5 @@ import org.apache.torque.util.ColumnValu
 
 public interface TestPeerInterface
 {
-    ObjectKey doInsert(ColumnValues columnValues) throws TorqueException;
+    ObjectKey<?> doInsert(ColumnValues columnValues) throws TorqueException;
 }

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java Thu Dec 20 13:28:59 2018
@@ -45,7 +45,7 @@ public class ForeignKeyGetterTest extend
     {
         NullablePIntegerFk nullablePIntegerFk = new NullablePIntegerFk();
         nullablePIntegerFk.setFk(0);
-        ObjectKey foreignKey = nullablePIntegerFk.getForeignKeyForPIntegerPk();
+        ObjectKey<?> foreignKey = nullablePIntegerFk.getForeignKeyForPIntegerPk();
         assertNull(foreignKey.getValue());
     }
 
@@ -59,7 +59,7 @@ public class ForeignKeyGetterTest extend
     {
         NullablePIntegerFk nullablePIntegerFk = new NullablePIntegerFk();
         nullablePIntegerFk.setFk(3);
-        ObjectKey foreignKey = nullablePIntegerFk.getForeignKeyForPIntegerPk();
+        ObjectKey<?> foreignKey = nullablePIntegerFk.getForeignKeyForPIntegerPk();
         assertEquals(new NumberKey(3), foreignKey);
     }
 
@@ -73,7 +73,7 @@ public class ForeignKeyGetterTest extend
     {
         PIntegerFkWithDefault pIntegerFk = new PIntegerFkWithDefault();
         pIntegerFk.setFk(0);
-        ObjectKey foreignKey = pIntegerFk.getForeignKeyForPIntegerPk();
+        ObjectKey<?> foreignKey = pIntegerFk.getForeignKeyForPIntegerPk();
         assertNull(foreignKey.getValue());
     }
 
@@ -88,7 +88,7 @@ public class ForeignKeyGetterTest extend
     {
         PIntegerFkWithDefault pIntegerFk = new PIntegerFkWithDefault();
         pIntegerFk.setFk(2);
-        ObjectKey foreignKey = pIntegerFk.getForeignKeyForPIntegerPk();
+        ObjectKey<?> foreignKey = pIntegerFk.getForeignKeyForPIntegerPk();
         assertEquals(new NumberKey(2), foreignKey);
     }
 
@@ -103,7 +103,7 @@ public class ForeignKeyGetterTest extend
     {
         PIntegerFkWithDefault pIntegerFk = new PIntegerFkWithDefault();
         pIntegerFk.setFk(3);
-        ObjectKey foreignKey = pIntegerFk.getForeignKeyForPIntegerPk();
+        ObjectKey<?> foreignKey = pIntegerFk.getForeignKeyForPIntegerPk();
         assertEquals(new NumberKey(3), foreignKey);
     }
 
@@ -117,7 +117,7 @@ public class ForeignKeyGetterTest extend
     {
         NullableOIntegerFk nullableOIntegerFk = new NullableOIntegerFk();
         nullableOIntegerFk.setFk(null);
-        ObjectKey foreignKey = nullableOIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = nullableOIntegerFk.getForeignKeyForOIntegerPk();
         assertNull(foreignKey.getValue());
     }
 
@@ -131,7 +131,7 @@ public class ForeignKeyGetterTest extend
     {
         NullableOIntegerFk nullableOIntegerFk = new NullableOIntegerFk();
         nullableOIntegerFk.setFk(0);
-        ObjectKey foreignKey = nullableOIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = nullableOIntegerFk.getForeignKeyForOIntegerPk();
         assertEquals(new NumberKey(0), foreignKey);
     }
 
@@ -145,7 +145,7 @@ public class ForeignKeyGetterTest extend
     {
         NullableOIntegerFk nullableOIntegerFk = new NullableOIntegerFk();
         nullableOIntegerFk.setFk(3);
-        ObjectKey foreignKey = nullableOIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = nullableOIntegerFk.getForeignKeyForOIntegerPk();
         assertEquals(new NumberKey(3), foreignKey);
     }
 
@@ -159,7 +159,7 @@ public class ForeignKeyGetterTest extend
     {
         OIntegerFkWithDefault oIntegerFk = new OIntegerFkWithDefault();
         oIntegerFk.setFk(null);
-        ObjectKey foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
         assertNull(foreignKey.getValue());
     }
 
@@ -173,7 +173,7 @@ public class ForeignKeyGetterTest extend
     {
         OIntegerFkWithDefault oIntegerFk = new OIntegerFkWithDefault();
         oIntegerFk.setFk(0);
-        ObjectKey foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
         assertEquals(new NumberKey(0), foreignKey);
     }
 
@@ -187,7 +187,7 @@ public class ForeignKeyGetterTest extend
     {
         OIntegerFkWithDefault oIntegerFk = new OIntegerFkWithDefault();
         oIntegerFk.setFk(2);
-        ObjectKey foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
         assertEquals(new NumberKey(2), foreignKey);
     }
 
@@ -202,7 +202,7 @@ public class ForeignKeyGetterTest extend
     {
         OIntegerFkWithDefault oIntegerFk = new OIntegerFkWithDefault();
         oIntegerFk.setFk(3);
-        ObjectKey foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
+        ObjectKey<?> foreignKey = oIntegerFk.getForeignKeyForOIntegerPk();
         assertEquals(new NumberKey(3), foreignKey);
     }
 }

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=1849386&r1=1849385&r2=1849386&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 Thu Dec 20 13:28:59 2018
@@ -364,7 +364,7 @@ public class DeleteTest extends BaseData
         assertTrue(nullableOIntegerFkList.contains(toDelete));
 
         // calculate and check primary key
-        ObjectKey primaryKey = toDelete.getPrimaryKey();
+        ObjectKey<?> primaryKey = toDelete.getPrimaryKey();
         assertTrue(primaryKey instanceof NumberKey);
         assertEquals(new BigDecimal(preDeleteId), primaryKey.getValue());
 
@@ -411,7 +411,7 @@ public class DeleteTest extends BaseData
         assertFalse(nullableOIntegerFkList.contains(toDelete));
 
         // calculate and check primary key
-        ObjectKey primaryKey = toDelete.getPrimaryKey();
+        ObjectKey<?> primaryKey = toDelete.getPrimaryKey();
         assertTrue(primaryKey instanceof NumberKey);
         assertEquals(new BigDecimal(preDeleteId), primaryKey.getValue());
 

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java Thu Dec 20 13:28:59 2018
@@ -94,7 +94,7 @@ public class DoInsertTest extends BaseDa
                 new JdbcTypedValue("newName", Types.VARCHAR));
 
         // execute
-        ObjectKey result = AuthorPeer.doInsert(columnValues);
+        ObjectKey<?> result = AuthorPeer.doInsert(columnValues);
 
         // verify
         Author author = new Author();
@@ -128,7 +128,7 @@ public class DoInsertTest extends BaseDa
                 new JdbcTypedValue(new ColumnImpl("3")));
 
         // execute
-        ObjectKey objectKey = IntegerTypePeer.doInsert(columnValues);
+        ObjectKey<?> objectKey = IntegerTypePeer.doInsert(columnValues);
 
         // verify
         List<IntegerType> allIntegerTypes = IntegerTypePeer.doSelect(

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java Thu Dec 20 13:28:59 2018
@@ -57,7 +57,7 @@ public class RetrieveByPkTest extends Ba
      */
     public void testRetrieveByPk() throws Exception
     {
-        ObjectKey primaryKey = authorList.get(1).getPrimaryKey();
+        ObjectKey<?> primaryKey = authorList.get(1).getPrimaryKey();
         Author author = AuthorPeer.retrieveByPK(primaryKey);
         assertEquals("Expected author with Id "
                 + authorList.get(1).getAuthorId()
@@ -74,7 +74,7 @@ public class RetrieveByPkTest extends Ba
      */
     public void testRetrieveByNonExistingPk() throws Exception
     {
-        ObjectKey primaryKey = new NumberKey(-1);
+        ObjectKey<?> primaryKey = new NumberKey(-1);
         try
         {
             AuthorPeer.retrieveByPK(primaryKey);
@@ -110,7 +110,7 @@ public class RetrieveByPkTest extends Ba
      */
     public void testRetrieveByNullValuePk() throws Exception
     {
-        ObjectKey primaryKey = new NumberKey((BigDecimal) null);
+        ObjectKey<?> primaryKey = new NumberKey((BigDecimal) null);
         try
         {
             AuthorPeer.retrieveByPK(primaryKey);
@@ -146,7 +146,7 @@ public class RetrieveByPkTest extends Ba
      */
     public void testRetrieveByObjectKeys() throws Exception
     {
-        List<ObjectKey> objectKeys = new ArrayList<>();
+        List<ObjectKey<?>> objectKeys = new ArrayList<>();
         objectKeys.add(authorList.get(1).getPrimaryKey());
         objectKeys.add(authorList.get(2).getPrimaryKey());
         objectKeys.add(SimpleKey.keyFor(-5L));

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java?rev=1849386&r1=1849385&r2=1849386&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java Thu Dec 20 13:28:59 2018
@@ -400,7 +400,7 @@ public class SelectTest extends BaseData
      */
     public void testSelectSimpleKeyNullValue() throws Exception
     {
-        SimpleKey keyToSelect = SimpleKey.keyFor((Integer) null);
+        SimpleKey<?> keyToSelect = SimpleKey.keyFor((Integer) null);
         Criteria criteria = new Criteria()
                 .where(BookPeer.ISBN, keyToSelect);
 



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


Mime
View raw message