db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1484252 [1/3] - in /db/torque/torque4/trunk/torque-runtime/src: main/java/org/apache/torque/ main/java/org/apache/torque/avalon/ main/java/org/apache/torque/criteria/ main/java/org/apache/torque/map/ main/java/org/apache/torque/om/mapper/ ...
Date Sun, 19 May 2013 09:58:01 GMT
Author: tfischer
Date: Sun May 19 09:58:00 2013
New Revision: 1484252

URL: http://svn.apache.org/r1484252
Log:
TORQUE-279 Remove deprecated methods and classes from the runtime

Removed:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/CriteriaInterface.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CustomBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeer.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderOldCriteriaTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/CriteriaTest.java
Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/resources/torque-schematest.properties

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java Sun May 19 09:58:00 2013
@@ -79,7 +79,7 @@ public class Database
      *
      * @throws NullPointerException if name is null.
      */
-    Database(String name)
+    Database(final String name)
     {
         if (name == null)
         {
@@ -114,7 +114,7 @@ public class Database
      * @param anAdapter The adapter for this database, or null to remove the
      *        current adapter from this database.
      */
-    public void setAdapter(Adapter anAdapter)
+    public void setAdapter(final Adapter anAdapter)
     {
         this.adapter = anAdapter;
     }
@@ -153,7 +153,7 @@ public class Database
      * @param aDataSourceFactory The new DataSorceFactory for this database,
      *        or null to remove the current DataSourceFactory.
      */
-    public void setDataSourceFactory(DataSourceFactory aDataSourceFactory)
+    public void setDataSourceFactory(final DataSourceFactory aDataSourceFactory)
     {
         this.dataSourceFactory = aDataSourceFactory;
     }
@@ -174,7 +174,7 @@ public class Database
      *
      * @param idTable The TableMap representation for the ID table.
      */
-    public void setIdTable(TableMap idTable)
+    public void setIdTable(final TableMap idTable)
     {
         this.idTable = idTable;
         getDatabaseMap().setIdTable(idTable);
@@ -185,7 +185,7 @@ public class Database
      *
      * @param tableName The name for the ID table.
      */
-    public void setIdTable(String tableName)
+    public void setIdTable(final String tableName)
     {
         TableMap tmap = new TableMap(tableName, getDatabaseMap());
         setIdTable(tmap);
@@ -211,25 +211,6 @@ public class Database
      * does nothing.
      *
      * @return true if a new IDBroker was created, false otherwise.
-     *
-     * @deprecated This method will be removed in a future version of Torque.
-     *             Please use createAndRegisterIdBroker() instead.
-     */
-    @Deprecated
-    public synchronized boolean startIdBroker()
-    {
-        return createAndRegisterIdBroker();
-    }
-
-    /**
-     * Creates the IDBroker for this Database and registers it with Torque.
-     * so it is either started instantly if Torque is already initialized
-     * or it is started when Torque is initialized.
-     * The information about the IdTable is stored in the databaseMap.
-     * If an IDBroker already exists for this Database, the method
-     * does nothing.
-     *
-     * @return true if a new IDBroker was created, false otherwise.
      */
     public synchronized boolean createAndRegisterIdBroker()
     {
@@ -265,7 +246,7 @@ public class Database
      * @return The IdGenerator of the requested type, or null if no IdGenerator
      *         exists for the requested type.
      */
-    public IdGenerator getIdGenerator(IDMethod type)
+    public IdGenerator getIdGenerator(final IDMethod type)
     {
         return idGenerators.get(type);
     }
@@ -277,7 +258,7 @@ public class Database
      * @param idGen The new IdGenerator for the type, or null
      *        to remove the IdGenerator of the given type.
      */
-    public void addIdGenerator(IDMethod type, IdGenerator idGen)
+    public void addIdGenerator(final IDMethod type, final IdGenerator idGen)
     {
         idGenerators.put(type, idGen);
     }
@@ -299,7 +280,7 @@ public class Database
      * @param schema the name of the database schema to set, or null to remove
      *        the current schema.
      */
-    public void setSchema(String schema)
+    public void setSchema(final String schema)
     {
         this.schema = schema;
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java Sun May 19 09:58:00 2013
@@ -118,7 +118,7 @@ public final class Torque
      *
      * @param instance Our singleton.
      */
-    public static void setInstance(TorqueInstance instance)
+    public static void setInstance(final TorqueInstance instance)
     {
         torqueSingleton = instance;
     }
@@ -131,7 +131,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static void init(String configFile)
+    public static void init(final String configFile)
         throws TorqueException
     {
         getInstance().init(configFile);
@@ -145,7 +145,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static void init(Configuration conf)
+    public static void init(final Configuration conf)
         throws TorqueException
     {
         getInstance().init(conf);
@@ -169,7 +169,7 @@ public final class Torque
      * @throws TorqueException if the configuration does not contain
      *         any keys starting with <code>Torque.TORQUE_KEY</code>.
      */
-    public static void setConfiguration(Configuration conf)
+    public static void setConfiguration(final Configuration conf)
             throws TorqueException
     {
         getInstance().setConfiguration(conf);
@@ -193,7 +193,7 @@ public final class Torque
      * @return The requested Manager.
      */
     @SuppressWarnings("unchecked")
-	public static <T extends AbstractBaseManager<? extends Persistent>> T getManager(String name)
+	public static <T extends AbstractBaseManager<? extends Persistent>> T getManager(final String name)
     {
         /*
          *  The cast is necessary to work around bug
@@ -214,8 +214,8 @@ public final class Torque
      */
     @SuppressWarnings("unchecked")
     public static <T extends AbstractBaseManager<? extends Persistent>> T getManager(
-            String name,
-            String defaultClassName)
+            final String name,
+            final String defaultClassName)
     {
         /*
          *  The cast is necessary to work around bug
@@ -266,7 +266,7 @@ public final class Torque
      *
      * @throws TorqueException if Torque is not initialized and name is null.
      */
-    public static DatabaseMap getDatabaseMap(String name)
+    public static DatabaseMap getDatabaseMap(final String name)
             throws TorqueException
     {
         return getInstance().getDatabaseMap(name);
@@ -281,7 +281,7 @@ public final class Torque
      *
      * @throws NullPointerException if idBroker is null.
      */
-    public static void registerIDBroker(IDBroker idBroker)
+    public static void registerIDBroker(final IDBroker idBroker)
     {
         getInstance().registerIDBroker(idBroker);
     }
@@ -310,7 +310,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static Connection getConnection(String name)
+    public static Connection getConnection(final String name)
         throws TorqueException
     {
         return getInstance().getConnection(name);
@@ -330,8 +330,8 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static Connection getConnection(String name, String username,
-            String password)
+    public static Connection getConnection(final String name, final String username,
+            final String password)
             throws TorqueException
     {
         return getInstance().getConnection(name, username, password);
@@ -342,32 +342,13 @@ public final class Torque
      *
      * @param name the database name, or null for the default db.
      *
-     * @return The corresponding database adapter.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated use getAdapter(String) instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public static Adapter getDB(String name) throws TorqueException
-    {
-        return getInstance().getDB(name);
-    }
-
-    /**
-     * Returns the database adapter for a specific database name.
-     *
-     * @param name the database name, or null for the default db.
-     *
      * @return The corresponding database adapter, or null if no database
      *         adapter is defined for the given database.
      *
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static Adapter getAdapter(String name) throws TorqueException
+    public static Adapter getAdapter(final String name) throws TorqueException
     {
         return getInstance().getAdapter(name);
     }
@@ -387,7 +368,7 @@ public final class Torque
      *
      * @param con A Connection to close.
      */
-    public static void closeConnection(Connection con)
+    public static void closeConnection(final Connection con)
     {
         getInstance().closeConnection(con);
     }
@@ -400,7 +381,7 @@ public final class Torque
      *
      * @throws NullPointerException if databaseName is null.
      */
-    public static void setSchema(String name, String schema)
+    public static void setSchema(final String name, final String schema)
     {
         getInstance().setSchema(name, schema);
     }
@@ -415,7 +396,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static String getSchema(String name)
+    public static String getSchema(final String name)
         throws TorqueException
     {
         return getInstance().getSchema(name);
@@ -432,7 +413,7 @@ public final class Torque
      *
      * @throws TorqueException if Torque is not yet initialized.
      */
-    public static Database getDatabase(String name) throws TorqueException
+    public static Database getDatabase(final String name) throws TorqueException
     {
         return getInstance().getDatabase(name);
     }
@@ -449,7 +430,7 @@ public final class Torque
      *
      * @throws IllegalArgumentException if databaseName is null.
      */
-    public static Database getOrCreateDatabase(String name)
+    public static Database getOrCreateDatabase(final String name)
     {
         return getInstance().getOrCreateDatabase(name);
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java Sun May 19 09:58:00 2013
@@ -193,7 +193,7 @@ public class TorqueInstance
      * @throws TorqueException if the transaction manger configuration
      *         is invalid.
      */
-    private void initTransactionManager(Configuration conf)
+    private void initTransactionManager(final Configuration conf)
             throws TorqueException
     {
         log.debug("initTransactionManager(" + conf + ")");
@@ -247,7 +247,7 @@ public class TorqueInstance
      *
      * @throws TorqueException if the appropriate key is not set.
      */
-    private void initDefaultDbName(Configuration conf)
+    private void initDefaultDbName(final Configuration conf)
             throws TorqueException
     {
         log.debug("initDefaultDbName(" + conf + ")");
@@ -283,7 +283,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private void initAdapters(Configuration conf)
+    private void initAdapters(final Configuration conf)
             throws TorqueException
     {
         log.debug("initAdapters(" + conf + ")");
@@ -409,7 +409,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private void initDataSourceFactories(Configuration conf)
+    private void initDataSourceFactories(final Configuration conf)
             throws TorqueException
     {
         log.debug("initDataSourceFactories(" + conf + ")");
@@ -447,18 +447,6 @@ public class TorqueInstance
 
                     Database database = getOrCreateDatabase(handle);
                     database.setDataSourceFactory(dsf);
-
-                    // deprecated method of schema configuration
-                    // TODO: remove in Torque 4.1
-                    String schema = subConf.getString(Torque.SCHEMA_KEY, null);
-                    if (!StringUtils.isEmpty(schema))
-                    {
-                        log.warn("Defining the schema in the dsfactory "
-                                + "is deprecated, please configure it "
-                                + "via the config key "
-                                + "torque.database.${databasename}.schema");
-                    }
-                    database.setSchema(schema);
                 }
             }
         }
@@ -502,7 +490,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private void initSchemata(Configuration conf)
+    private void initSchemata(final Configuration conf)
             throws TorqueException
     {
         log.debug("initSchemata(" + conf + ")");
@@ -574,7 +562,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public void init(String configFile)
+    public void init(final String configFile)
             throws TorqueException
     {
         log.debug("init(" + configFile + ")");
@@ -600,7 +588,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public synchronized void init(Configuration conf)
+    public synchronized void init(final Configuration conf)
             throws TorqueException
     {
         log.debug("init(" + conf + ")");
@@ -631,7 +619,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    protected synchronized void initManagerMappings(Configuration conf)
+    protected synchronized void initManagerMappings(final Configuration conf)
             throws TorqueException
     {
         int pref = Torque.MANAGER_PREFIX.length();
@@ -677,7 +665,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private synchronized void initManager(String name, String className)
+    private synchronized void initManager(final String name, final String className)
             throws TorqueException
     {
         AbstractBaseManager<?> manager = managers.get(name);
@@ -730,7 +718,7 @@ public class TorqueInstance
      * @throws TorqueException if the configuration does not contain
      *         any keys starting with <code>Torque.TORQUE_KEY</code>.
      */
-    public void setConfiguration(Configuration conf)
+    public void setConfiguration(final Configuration conf)
             throws TorqueException
     {
         log.debug("setConfiguration(" + conf + ")");
@@ -764,7 +752,7 @@ public class TorqueInstance
      * @param name name of the manager
      * @return a Manager
      */
-    public <T extends AbstractBaseManager<? extends Persistent>> T getManager(String name)
+    public <T extends AbstractBaseManager<? extends Persistent>> T getManager(final String name)
     {
         @SuppressWarnings("unchecked")
         T m = (T) managers.get(name);
@@ -785,8 +773,8 @@ public class TorqueInstance
      * @return a Manager
      */
     @SuppressWarnings("unchecked")
-    public <T extends AbstractBaseManager<? extends Persistent>> T getManager(String name,
-            String defaultClassName)
+    public <T extends AbstractBaseManager<? extends Persistent>> T getManager(final String name,
+            final String defaultClassName)
     {
         T m = (T) managers.get(name);
         if (m == null)
@@ -953,7 +941,7 @@ public class TorqueInstance
      *
      * @throws NullPointerException if idBroker is null.
      */
-    public void registerIDBroker(IDBroker idBroker)
+    public void registerIDBroker(final IDBroker idBroker)
     {
         idBrokers.add(idBroker);
         if (isInit())
@@ -989,7 +977,7 @@ public class TorqueInstance
      *         named database, the connection information is wrong, or the
      *         connection cannot be returned for any other reason.
      */
-    public Connection getConnection(String name)
+    public Connection getConnection(final String name)
             throws TorqueException
     {
         if (!isInit())
@@ -1020,7 +1008,7 @@ public class TorqueInstance
      * @throws TorqueException if Torque is not initialized, or
      *         no DatasourceFactory is configured for the given name.
      */
-    public DataSourceFactory getDataSourceFactory(String name)
+    public DataSourceFactory getDataSourceFactory(final String name)
             throws TorqueException
     {
         if (!isInit())
@@ -1060,8 +1048,8 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public Connection getConnection(String name, String username,
-            String password)
+    public Connection getConnection(final String name, final String username,
+            final String password)
             throws TorqueException
     {
         if (!isInit())
@@ -1088,36 +1076,8 @@ public class TorqueInstance
      *         adapter is defined for the given database.
      *
      * @throws TorqueException if Torque is not initialized.
-     *
-     * @deprecated use getAdapter(String) instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public Adapter getDB(String name) throws TorqueException
-    {
-        if (!isInit())
-        {
-            throw new TorqueException("Torque is not initialized");
-        }
-        Database database = getDatabase(name);
-        if (database == null)
-        {
-            return null;
-        }
-        return database.getAdapter();
-    }
-
-    /**
-     * Returns the database adapter for a specific database.
-     *
-     * @param name the database name, or null for the default db.
-     *
-     * @return The corresponding database adapter, or null if no database
-     *         adapter is defined for the given database.
-     *
-     * @throws TorqueException if Torque is not initialized.
      */
-    public Adapter getAdapter(String name) throws TorqueException
+    public Adapter getAdapter(final String name) throws TorqueException
     {
         if (!isInit())
         {
@@ -1148,7 +1108,7 @@ public class TorqueInstance
      *
      * @param con A Connection to close.
      */
-    public void closeConnection(Connection con)
+    public void closeConnection(final Connection con)
     {
         if (con != null)
         {
@@ -1171,7 +1131,7 @@ public class TorqueInstance
      *
      * @throws NullPointerException if databaseName is null.
      */
-    public void setSchema(String name, String schema)
+    public void setSchema(final String name, final String schema)
     {
         getOrCreateDatabase(name).setSchema(schema);
     }
@@ -1186,7 +1146,7 @@ public class TorqueInstance
      *
      * @throws TorqueException if Torque is not yet initialized.
      */
-    public String getSchema(String name)
+    public String getSchema(final String name)
             throws TorqueException
     {
         if (!isInit())
@@ -1259,7 +1219,7 @@ public class TorqueInstance
      *
      * @throws NullPointerException if databaseName is null.
      */
-    public Database getOrCreateDatabase(String databaseName)
+    public Database getOrCreateDatabase(final String databaseName)
     {
         if (databaseName == null)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java Sun May 19 09:58:00 2013
@@ -146,19 +146,6 @@ public interface Torque
      * @return The corresponding database adapter.
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
-     * @deprecated use getAdapter(String) instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    Adapter getDB(String name) throws TorqueException;
-
-    /**
-     * Returns database adapter for a specific connection pool.
-     *
-     * @param name A pool name.
-     * @return The corresponding database adapter.
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
      */
     Adapter getAdapter(String name) throws TorqueException;
 

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java Sun May 19 09:58:00 2013
@@ -52,8 +52,7 @@ import org.apache.torque.util.UniqueList
  * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
  * @version $Id$
  */
-public class Criteria
-        implements Serializable, Cloneable, CriteriaInterface<Criteria>
+public class Criteria implements Serializable, Cloneable
 {
     /** Serial version. */
     private static final long serialVersionUID = -9001666575933085601L;
@@ -214,7 +213,7 @@ public class Criteria
      *
      * @param dbName The database name.
      */
-    public Criteria(String dbName)
+    public Criteria(final String dbName)
     {
         this();
         this.dbName = dbName;
@@ -227,7 +226,7 @@ public class Criteria
      *
      * @param toCopy the criteria to copy.
      */
-    public Criteria(Criteria toCopy)
+    public Criteria(final Criteria toCopy)
     {
         ignoreCase = toCopy.ignoreCase;
         singleRecord = toCopy.singleRecord;
@@ -270,7 +269,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addAsColumn(String name, Column clause)
+    public Criteria addAsColumn(final String name, final Column clause)
     {
         asColumns.put(name, clause);
         return this;
@@ -304,7 +303,7 @@ public class Criteria
      * @param alias the alias for the table name.
      * @param table the table name as known in the database.
      */
-    public Criteria addAlias(String alias, String table)
+    public Criteria addAlias(final String alias, final String table)
     {
         aliases.put(alias, table);
         return this;
@@ -316,7 +315,7 @@ public class Criteria
      * @param alias the alias for the subselect.
      * @param subselect the Criteria for the subselect.
      */
-    public Criteria addAlias(String alias, Criteria subselect)
+    public Criteria addAlias(final String alias, final Criteria subselect)
     {
         aliases.put(alias, subselect);
         return this;
@@ -333,7 +332,7 @@ public class Criteria
      *         <code>alias</code> is defined but is no alias for a table name
      *         (e.g. it is an alias for a subselect).
      */
-    public String getTableForAlias(String alias)
+    public String getTableForAlias(final String alias)
     {
         Object aliasResolved = aliases.get(alias);
         if (aliasResolved == null)
@@ -360,7 +359,7 @@ public class Criteria
      *         <code>alias</code> is defined but is not an alias for a subselect
      *         (e.g. it is an alias for a table).
      */
-    public Criteria getSubselectForAlias(String alias)
+    public Criteria getSubselectForAlias(final String alias)
     {
         Object aliasResolved = aliases.get(alias);
         if (aliasResolved == null)
@@ -403,7 +402,7 @@ public class Criteria
      *
      * @param dbName The Database(Map) name.
      */
-    public void setDbName(String dbName)
+    public void setDbName(final String dbName)
     {
         this.dbName = dbName;
     }
@@ -421,7 +420,7 @@ public class Criteria
      * @param having A Criterion object
      * @return A modified Criteria object.
      */
-    public Criteria addHaving(Criterion having)
+    public Criteria addHaving(final Criterion having)
     {
         this.having = having;
         return this;
@@ -456,7 +455,7 @@ public class Criteria
      *
      * @return this object.
      */
-    public Criteria setForUpdate(boolean forUpdate)
+    public Criteria setForUpdate(final boolean forUpdate)
     {
         this.forUpdate = forUpdate;
         return this;
@@ -485,7 +484,7 @@ public class Criteria
      * @param right A String with the right side of the join.
      * @return A modified Criteria object.
      */
-    public Criteria addJoin(Column left, Column right)
+    public Criteria addJoin(final Column left, final Column right)
     {
         return addJoin(left, right, null);
     }
@@ -506,7 +505,7 @@ public class Criteria
      *        Criteria.LEFT_JOIN, Criteria.RIGHT_JOIN, Criteria.INNER_JOIN
      * @return A modified Criteria object.
      */
-    public Criteria addJoin(Column left, Column right, JoinType joinType)
+    public Criteria addJoin(final Column left, final Column right, final JoinType joinType)
     {
         joins.add(new Join(left, right, Criteria.EQUAL, joinType));
 
@@ -536,10 +535,10 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addJoin(
-            Column left,
-            Column right,
-            SqlEnum comparison,
-            JoinType joinType)
+            final Column left,
+            final Column right,
+            final SqlEnum comparison,
+            final JoinType joinType)
     {
         joins.add(new Join(left, right, comparison, joinType));
 
@@ -572,10 +571,10 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addJoin(
-            String leftTable,
-            String rightTable,
-            Criterion joinCondition,
-            JoinType joinType)
+            final String leftTable,
+            final String rightTable,
+            final Criterion joinCondition,
+            final JoinType joinType)
     {
         joins.add(new Join(
                 new PreparedStatementPart(leftTable),
@@ -612,10 +611,10 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addJoin(
-            PreparedStatementPart leftTable,
-            PreparedStatementPart rightTable,
-            Criterion joinCondition,
-            JoinType joinType)
+            final PreparedStatementPart leftTable,
+            final PreparedStatementPart rightTable,
+            final Criterion joinCondition,
+            final JoinType joinType)
     {
         joins.add(new Join(
                 leftTable,
@@ -659,7 +658,7 @@ public class Criteria
      * @param ignoreCase True if case should be ignored.
      * @return A modified Criteria object.
      */
-    public Criteria setIgnoreCase(boolean ignoreCase)
+    public Criteria setIgnoreCase(final boolean ignoreCase)
     {
         this.ignoreCase = ignoreCase;
         return this;
@@ -689,7 +688,7 @@ public class Criteria
      *        exactly one record.
      * @return A modified Criteria object.
      */
-    public Criteria setSingleRecord(boolean b)
+    public Criteria setSingleRecord(final boolean b)
     {
         singleRecord = b;
         return this;
@@ -713,7 +712,7 @@ public class Criteria
      *        by a query.
      * @return A modified Criteria object.
      */
-    public Criteria setLimit(int limit)
+    public Criteria setLimit(final int limit)
     {
         this.limit = limit;
         return this;
@@ -736,7 +735,7 @@ public class Criteria
      *        result.
      * @return A modified Criteria object.
      */
-    public Criteria setOffset(long offset)
+    public Criteria setOffset(final long offset)
     {
         this.offset = offset;
         return this;
@@ -767,7 +766,7 @@ public class Criteria
      *
      * @param fetchSize the fetch size, or null for not set.
      */
-    public void setFetchSize(Integer fetchSize)
+    public void setFetchSize(final Integer fetchSize)
     {
         this.fetchSize = fetchSize;
     }
@@ -779,7 +778,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addSelectColumn(Column column)
+    public Criteria addSelectColumn(final Column column)
     {
         selectColumns.add(column);
         return this;
@@ -812,7 +811,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addGroupByColumn(Column groupBy)
+    public Criteria addGroupByColumn(final Column groupBy)
     {
         groupByColumns.add(groupBy);
         return this;
@@ -835,7 +834,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addAscendingOrderByColumn(Column column)
+    public Criteria addAscendingOrderByColumn(final Column column)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.ASC, false));
         return this;
@@ -849,7 +848,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addAscendingOrderByColumn(Column column, boolean ignoreCase)
+    public Criteria addAscendingOrderByColumn(final Column column, final boolean ignoreCase)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.ASC, ignoreCase));
         return this;
@@ -862,7 +861,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addDescendingOrderByColumn(Column column)
+    public Criteria addDescendingOrderByColumn(final Column column)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.DESC, false));
         return this;
@@ -878,8 +877,8 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addDescendingOrderByColumn(
-            Column column,
-            boolean ignoreCase)
+            final Column column,
+            final boolean ignoreCase)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.DESC, ignoreCase));
         return this;
@@ -911,7 +910,7 @@ public class Criteria
      *
      * @return the modified Criteria object.
      */
-    public Criteria addFrom(String tableName)
+    public Criteria addFrom(final String tableName)
     {
         fromElements.add(new FromElement(tableName));
         return this;
@@ -922,7 +921,7 @@ public class Criteria
      *
      * @return the modified Criteria object.
      */
-    public Criteria addFrom(FromElement fromElement)
+    public Criteria addFrom(final FromElement fromElement)
     {
         fromElements.add(fromElement);
         return this;
@@ -961,7 +960,7 @@ public class Criteria
      * @return true if the object is equal to this Criteria, false otherwise.
      */
     @Override
-    public boolean equals(Object object)
+    public boolean equals(final Object object)
     {
         if (object == null)
         {
@@ -1064,7 +1063,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria and(Criterion criterion)
+    public Criteria and(final Criterion criterion)
     {
         if (topLevelCriterion == null)
         {
@@ -1103,7 +1102,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria and(Object lValue, Object rValue)
+    public Criteria and(final Object lValue, final Object rValue)
     {
         if (rValue instanceof SqlEnum)
         {
@@ -1136,23 +1135,9 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    @SuppressWarnings("deprecation")
-    public Criteria and(Object lValue, Object rValue, SqlEnum comparison)
+    public Criteria and(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
-        Criterion newCriterion;
-        if (comparison == SqlEnum.CUSTOM)
-        {
-            newCriterion = new Criterion(
-                    lValue,
-                    null,
-                    null,
-                    (String) rValue,
-                    null);
-        }
-        else
-        {
-            newCriterion = new Criterion(lValue, rValue, comparison);
-        }
+        Criterion newCriterion = new Criterion(lValue, rValue, comparison);
         if (topLevelCriterion == null)
         {
             topLevelCriterion = newCriterion;
@@ -1184,7 +1169,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andDate(Object lValue, int year, int month, int day)
+    public Criteria andDate(final Object lValue, final int year, final int month, final int day)
     {
         return and(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1212,8 +1197,8 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andDate(Object lValue, int year, int month, int day,
-            SqlEnum comparison)
+    public Criteria andDate(final Object lValue, final int year, final int month, final int day,
+            final SqlEnum comparison)
     {
         return and(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1238,7 +1223,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andIn(Object lValue, Object[] rValues)
+    public Criteria andIn(final Object lValue, final Object[] rValues)
     {
         return and(lValue, rValues, Criteria.IN);
     }
@@ -1261,7 +1246,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andIn(Object lValue, Collection<?> rValues)
+    public Criteria andIn(final Object lValue, final Collection<?> rValues)
     {
         return and(lValue, rValues, Criteria.IN);
     }
@@ -1284,7 +1269,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andNotIn(Object lValue, Object[] rValues)
+    public Criteria andNotIn(final Object lValue, final Object[] rValues)
     {
         return and(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1307,7 +1292,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andNotIn(Object lValue, Collection<?> rValues)
+    public Criteria andNotIn(final Object lValue, final Collection<?> rValues)
     {
         return and(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1326,7 +1311,7 @@ public class Criteria
      *
      * @return the modified Criteria.
      */
-    public Criteria andVerbatimSql(String sql, Object[] replacements)
+    public Criteria andVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
                 = new Criterion(null, null, null, sql, replacements);
@@ -1355,10 +1340,10 @@ public class Criteria
      * @return the modified Criteria.
      */
     public Criteria andVerbatimSql(
-            String sql,
-            Object[] replacements,
-            Column toAddToFromClause1,
-            Column toAddToFromClause2)
+            final String sql,
+            final Object[] replacements,
+            final Column toAddToFromClause1,
+            final Column toAddToFromClause2)
     {
         Criterion criterion = new Criterion(
                 toAddToFromClause1,
@@ -1393,7 +1378,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria or(Criterion criterion)
+    public Criteria or(final Criterion criterion)
     {
         if (topLevelCriterion == null)
         {
@@ -1432,7 +1417,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria or(Object lValue, Object rValue)
+    public Criteria or(final Object lValue, final Object rValue)
     {
         if (rValue instanceof SqlEnum)
         {
@@ -1465,23 +1450,9 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    @SuppressWarnings("deprecation")
-    public Criteria or(Object lValue, Object rValue, SqlEnum comparison)
+    public Criteria or(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
-        Criterion newCriterion;
-        if (comparison == SqlEnum.CUSTOM)
-        {
-            newCriterion = new Criterion(
-                    lValue,
-                    null,
-                    null,
-                    (String) rValue,
-                    null);
-        }
-        else
-        {
-            newCriterion = new Criterion(lValue, rValue, comparison);
-        }
+        Criterion newCriterion = new Criterion(lValue, rValue, comparison);
         if (topLevelCriterion == null)
         {
             topLevelCriterion = newCriterion;
@@ -1513,7 +1484,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orDate(Object lValue, int year, int month, int day)
+    public Criteria orDate(final Object lValue, final int year, final int month, final int day)
     {
         return or(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1541,8 +1512,8 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orDate(Object lValue, int year, int month, int day,
-            SqlEnum comparison)
+    public Criteria orDate(final Object lValue, final int year, final int month, final int day,
+            final SqlEnum comparison)
     {
         return or(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1567,7 +1538,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orIn(Object lValue, Object[] rValues)
+    public Criteria orIn(final Object lValue, final Object[] rValues)
     {
         return or(lValue, rValues, Criteria.IN);
     }
@@ -1590,7 +1561,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orIn(Object lValue, Collection<?> rValues)
+    public Criteria orIn(final Object lValue, final Collection<?> rValues)
     {
         return or(lValue, rValues, Criteria.IN);
     }
@@ -1613,7 +1584,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orNotIn(Object lValue, Object[] rValues)
+    public Criteria orNotIn(final Object lValue, final Object[] rValues)
     {
         return or(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1636,7 +1607,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orNotIn(Object lValue, Collection<?> rValues)
+    public Criteria orNotIn(final Object lValue, final Collection<?> rValues)
     {
         return or(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1655,7 +1626,7 @@ public class Criteria
      *
      * @return the modified Criteria.
      */
-    public Criteria orVerbatimSql(String sql, Object[] replacements)
+    public Criteria orVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
                 = new Criterion(null, null, null, sql, replacements);
@@ -1684,10 +1655,10 @@ public class Criteria
      * @return the modified Criteria.
      */
     public Criteria orVerbatimSql(
-            String sql,
-            Object[] replacements,
-            Column toAddToFromClause1,
-            Column toAddToFromClause2)
+            final String sql,
+            final Object[] replacements,
+            final Column toAddToFromClause1,
+            final Column toAddToFromClause2)
     {
         Criterion criterion = new Criterion(
                 toAddToFromClause1,
@@ -1716,7 +1687,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria where(Criterion criterion)
+    public Criteria where(final Criterion criterion)
     {
         return and(criterion);
     }
@@ -1749,7 +1720,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria where(Object lValue, Object rValue)
+    public Criteria where(final Object lValue, final Object rValue)
     {
         return and(lValue, rValue);
     }
@@ -1776,7 +1747,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria where(Object lValue, Object rValue, SqlEnum comparison)
+    public Criteria where(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
         return and(lValue, rValue, comparison);
     }
@@ -1799,7 +1770,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereDate(Object lValue, int year, int month, int day)
+    public Criteria whereDate(final Object lValue, final int year, final int month, final int day)
     {
         return andDate(lValue, year, month, day);
     }
@@ -1823,8 +1794,8 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereDate(Object lValue, int year, int month, int day,
-            SqlEnum comparison)
+    public Criteria whereDate(final Object lValue, final int year, final int month, final int day,
+            final SqlEnum comparison)
     {
         return andDate(lValue, year, month, day, comparison);
     }
@@ -1845,7 +1816,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereIn(Object lValue, Object[] rValues)
+    public Criteria whereIn(final Object lValue, final Object[] rValues)
     {
         return andIn(lValue, rValues);
     }
@@ -1866,7 +1837,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereIn(Object lValue, Collection<?> rValues)
+    public Criteria whereIn(final Object lValue, final Collection<?> rValues)
     {
         return andIn(lValue, rValues);
     }
@@ -1887,7 +1858,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereNotIn(Object lValue, Object[] rValues)
+    public Criteria whereNotIn(final Object lValue, final Object[] rValues)
     {
         return andNotIn(lValue, rValues);
     }
@@ -1907,7 +1878,7 @@ public class Criteria
      * @param rValues The values to compare against.
      * @return A modified Criteria object.
      */
-    public Criteria whereNotIn(Object lValue, Collection<?> rValues)
+    public Criteria whereNotIn(final Object lValue, final Collection<?> rValues)
     {
         return andNotIn(lValue, rValues);
     }
@@ -1929,7 +1900,7 @@ public class Criteria
      *
      * @return the modified Criteria.
      */
-    public Criteria whereVerbatimSql(String sql, Object[] replacements)
+    public Criteria whereVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
                 = new Criterion(null, null, null, sql, replacements);
@@ -1961,10 +1932,10 @@ public class Criteria
      * @return the modified Criteria.
      */
     public Criteria whereVerbatimSql(
-            String sql,
-            Object[] replacements,
-            Column toAddToFromClause1,
-            Column toAddToFromClause2)
+            final String sql,
+            final Object[] replacements,
+            final Column toAddToFromClause1,
+            final Column toAddToFromClause2)
     {
         Criterion criterion = new Criterion(
                 toAddToFromClause1,

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java Sun May 19 09:58:00 2013
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.torque.Column;
@@ -119,11 +118,11 @@ public class Criterion implements Serial
      * @throws NullPointerException if column is null.
      */
     public Criterion(
-            Object lValue,
-            Object rValue,
-            SqlEnum comparison,
-            String sql,
-            Object[] preparedStatementReplacements)
+            final Object lValue,
+            final Object rValue,
+            final SqlEnum comparison,
+            final String sql,
+            final Object[] preparedStatementReplacements)
     {
         if (comparison != null
                 && (sql != null || preparedStatementReplacements != null))
@@ -159,7 +158,7 @@ public class Criterion implements Serial
      *        the object must implement the
      *        <code>org.apache.torque.Column</code> interface.
      */
-    public Criterion(Object lValue, Object rValue)
+    public Criterion(final Object lValue, final Object rValue)
     {
         this(lValue, rValue, Criteria.EQUAL, null, null);
     }
@@ -177,7 +176,7 @@ public class Criterion implements Serial
      *        <code>org.apache.torque.Column</code> interface.
      * @param comparison The comparison operator, not null.
      */
-    public Criterion(Object lValue, Object rValue, SqlEnum comparison)
+    public Criterion(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
         this(lValue, rValue, comparison, null, null);
     }
@@ -187,7 +186,7 @@ public class Criterion implements Serial
      *
      * @param toCopy the Criterion to copy from, not null.
      */
-    public Criterion(Criterion toCopy)
+    public Criterion(final Criterion toCopy)
     {
         this.lValue = toCopy.lValue;
         this.comparison = toCopy.comparison;
@@ -228,7 +227,7 @@ public class Criterion implements Serial
      *        the object must implement the
      *        <code>org.apache.torque.Column</code> interface.
      */
-    public void setLValue(Object lValue)
+    public void setLValue(final Object lValue)
     {
         this.lValue = lValue;
     }
@@ -265,7 +264,7 @@ public class Criterion implements Serial
      *         the object must implement the
      *         <code>org.apache.torque.Column</code> interface.
      */
-    public void setRValue(Object rValue)
+    public void setRValue(final Object rValue)
     {
         this.rValue = rValue;
     }
@@ -308,7 +307,7 @@ public class Criterion implements Serial
      * @param b True if case should be ignored.
      * @return A modified Criterion object.
      */
-    public Criterion setIgnoreCase(boolean b)
+    public Criterion setIgnoreCase(final boolean b)
     {
         ignoreCase = b;
         return this;
@@ -368,7 +367,7 @@ public class Criterion implements Serial
      * @param criterion the criterion to and with this criterion,
      *        not null.
      */
-    public Criterion and(Criterion criterion)
+    public Criterion and(final Criterion criterion)
     {
         addCompositeCriterion(criterion, AND);
         return this;
@@ -381,7 +380,7 @@ public class Criterion implements Serial
      * @param criterion the criterion to and with this criterion,
      *        not null.
      */
-    public Criterion or(Criterion criterion)
+    public Criterion or(final Criterion criterion)
     {
         addCompositeCriterion(criterion, OR);
         return this;
@@ -397,8 +396,8 @@ public class Criterion implements Serial
      * @throws NullPointerException if criterion is null.
      */
     private void addCompositeCriterion(
-            Criterion criterion,
-            String conjunction)
+            final Criterion criterion,
+            final String conjunction)
     {
         if (criterion == null)
         {
@@ -428,8 +427,7 @@ public class Criterion implements Serial
      * Appends a debug String representation of the Criterion
      * onto the String builder.
      */
-    @SuppressWarnings("deprecation")
-    public void appendTo(StringBuilder sb)
+    public void appendTo(final StringBuilder sb)
     {
         if (isComposite())
         {
@@ -454,14 +452,7 @@ public class Criterion implements Serial
         }
         else
         {
-            if (SqlEnum.CUSTOM == comparison)
-            {
-                if (rValue != null && !"".equals(rValue))
-                {
-                    sb.append((String) rValue);
-                }
-            }
-            else if (isVerbatimSqlCondition())
+            if (isVerbatimSqlCondition())
             {
                 sb.append(sql);
             }
@@ -518,7 +509,7 @@ public class Criterion implements Serial
      * the same attributes.
      */
     @Override
-    public boolean equals(Object obj)
+    public boolean equals(final Object obj)
     {
         if (this == obj)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java Sun May 19 09:58:00 2013
@@ -72,7 +72,6 @@ public class Join implements Serializabl
      *         are null.
      * @throws IllegalArgumentException if comparison id SqlEnum.CUSTOM
      */
-    @SuppressWarnings("deprecation")
     public Join(
             final Column leftColumn,
             final Column rightColumn,
@@ -91,11 +90,6 @@ public class Join implements Serializabl
         {
             throw new NullPointerException("comparison is null");
         }
-        if (comparison == SqlEnum.CUSTOM)
-        {
-            throw new IllegalArgumentException(
-                    "The comparison SqlEnum.CUSTOM is not supported for Joins.");
-        }
         this.joinCondition = new Criterion(leftColumn, rightColumn, comparison);
         this.joinType = joinType;
     }
@@ -180,7 +174,7 @@ public class Join implements Serializabl
      * same attributes.
      */
     @Override
-    public boolean equals(Object obj)
+    public boolean equals(final Object obj)
     {
         if (this == obj)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java Sun May 19 09:58:00 2013
@@ -46,7 +46,7 @@ public final class SqlEnum implements ja
      */
     private final int numberOfCompareOperands;
 
-    private SqlEnum(String s, int numberOfCompareOperands)
+    private SqlEnum(final String s, final int numberOfCompareOperands)
     {
         this.s = s;
         this.numberOfCompareOperands = numberOfCompareOperands;
@@ -109,19 +109,6 @@ public final class SqlEnum implements ja
     /** SQL Expression " NOT IN ". */
     public static final SqlEnum NOT_IN =
         new SqlEnum(" NOT IN ", 2);
-    /**
-     * Constant for "CUSTOM".
-     *
-     * @deprecated use the methods Criteria.whereVerbatimSql,
-     *             Criteria.andVerbatimSql, Criteria.orVerbatimSql
-     *             or the Constructor
-     *             Criterion(null, null, null, String, Object[])
-     *             instead of using SqlEnum.CUSTOM.
-     *             This constant will be removed in Torque 4.1.
-     */
-    @Deprecated
-    public static final SqlEnum CUSTOM =
-        new SqlEnum("CUSTOM", -1);
     /** SQL Expression "JOIN". */
     public static final SqlEnum JOIN =
         new SqlEnum("JOIN", -1);
@@ -168,7 +155,7 @@ public final class SqlEnum implements ja
      * @param o the object to compare the SqlEnum with.
      */
     @Override
-    public boolean equals(Object o)
+    public boolean equals(final Object o)
     {
         if (o == null)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java Sun May 19 09:58:00 2013
@@ -127,7 +127,7 @@ public class ColumnMap implements Column
      * @param name The name of the column.
      * @param containingTable TableMap of the table this column is in.
      */
-    public ColumnMap(String name, TableMap containingTable)
+    public ColumnMap(final String name, final TableMap containingTable)
     {
         table = containingTable;
         this.columnName = normalizeName(name);
@@ -140,7 +140,7 @@ public class ColumnMap implements Column
      * @param name The name to check
      * @return The corrected name if needed or the same name if not.
      */
-    protected String normalizeName(String name)
+    protected String normalizeName(final String name)
     {
         if (name.indexOf('.') > 0)
         {
@@ -160,19 +160,6 @@ public class ColumnMap implements Column
     }
 
     /**
-     * Get the table name + column name.
-     *
-     * @return A String with the full column name.
-     *
-     * @deprecated use getSqlExpression() instead.
-     */
-    @Deprecated
-    public String getFullyQualifiedName()
-    {
-        return table.getName() + "." + columnName;
-    }
-
-    /**
      * Get the name of the table this column is in.
      *
      * @return A String with the table name.
@@ -212,7 +199,7 @@ public class ColumnMap implements Column
      *
      * @param type An Object specifying the type.
      */
-    public void setType(Object type)
+    public void setType(final Object type)
     {
         this.type = type;
     }
@@ -222,7 +209,7 @@ public class ColumnMap implements Column
      *
      * @param torqueType the Torque type of the column.
      */
-    public void setTorqueType(String torqueType)
+    public void setTorqueType(final String torqueType)
     {
         this.torqueType = torqueType;
     }
@@ -232,7 +219,7 @@ public class ColumnMap implements Column
      *
      * @param size An int specifying the size.
      */
-    public void setSize(int size)
+    public void setSize(final int size)
     {
         this.size = size;
     }
@@ -242,7 +229,7 @@ public class ColumnMap implements Column
      *
      * @param pk True if column is a primary key.
      */
-    public void setPrimaryKey(boolean pk)
+    public void setPrimaryKey(final boolean pk)
     {
         this.pk = pk;
     }
@@ -252,7 +239,7 @@ public class ColumnMap implements Column
      *
      * @param nn True if column may be null.
      */
-    public void setNotNull(boolean nn)
+    public void setNotNull(final boolean nn)
     {
         this.notNull = nn;
     }
@@ -333,7 +320,7 @@ public class ColumnMap implements Column
     /**
      * @param scale The scale to set.
      */
-    public void setScale(int scale)
+    public void setScale(final int scale)
     {
         this.scale = scale;
     }
@@ -354,7 +341,7 @@ public class ColumnMap implements Column
      *
      * @param name the Java Name.
      */
-    public void setJavaName(String name)
+    public void setJavaName(final String name)
     {
         this.javaName = name;
     }
@@ -374,7 +361,7 @@ public class ColumnMap implements Column
      *
      * @param autoIncrement whether this colimn is an autoincrement column.
      */
-    public void setAutoIncrement(boolean autoIncrement)
+    public void setAutoIncrement(final boolean autoIncrement)
     {
         this.autoIncrement = autoIncrement;
     }
@@ -394,7 +381,7 @@ public class ColumnMap implements Column
      *
      * @param defaultValue The defaultValue to set.
      */
-    public void setDefault(String defaultValue)
+    public void setDefault(final String defaultValue)
     {
         this.defaultValue = defaultValue;
     }
@@ -414,7 +401,7 @@ public class ColumnMap implements Column
      *
      * @param description The description to set.
      */
-    public void setDescription(String description)
+    public void setDescription(final String description)
     {
         this.description = description;
     }
@@ -445,7 +432,7 @@ public class ColumnMap implements Column
      *
      * @param map The inheritanceMap to associate with this column.
      */
-    public void addInheritanceMap(InheritanceMap map)
+    public void addInheritanceMap(final InheritanceMap map)
     {
         setUseInheritance(true);
         this.inheritanceMaps.put(map.getKey(), map);
@@ -466,7 +453,7 @@ public class ColumnMap implements Column
      *
      * @param inheritanceType The inheritance type to set.
      */
-    public void setInheritance(String inheritanceType)
+    public void setInheritance(final String inheritanceType)
     {
         this.inheritance = inheritanceType;
     }
@@ -489,7 +476,7 @@ public class ColumnMap implements Column
      * @param isProtected whether getters and setters for this column
      *        are protected.
      */
-    public void setProtected(boolean isProtected)
+    public void setProtected(final boolean isProtected)
     {
         this.isProtected = isProtected;
     }
@@ -509,7 +496,7 @@ public class ColumnMap implements Column
      *
      * @param pk whether this column is a primary key.
      */
-    public void setPk(boolean pk)
+    public void setPk(final boolean pk)
     {
         this.pk = pk;
     }
@@ -529,7 +516,7 @@ public class ColumnMap implements Column
      *
      * @param useInheritance whether this column uses Inheritance subclasses.
      */
-    public void setUseInheritance(boolean useInheritance)
+    public void setUseInheritance(final boolean useInheritance)
     {
         this.useInheritance = useInheritance;
     }
@@ -541,7 +528,7 @@ public class ColumnMap implements Column
      * @return the inheritance map with the specified key, or null if no
      *         inheritance map with the specified key exists in this column.
      */
-    public InheritanceMap getInheritanceMap(String key)
+    public InheritanceMap getInheritanceMap(final String key)
     {
         return inheritanceMaps.get(key);
     }
@@ -563,7 +550,7 @@ public class ColumnMap implements Column
      * @param usePrimitive whether primitive objects are used
      *        rather than objects.
      */
-    public void setUsePrimitive(boolean usePrimitive)
+    public void setUsePrimitive(final boolean usePrimitive)
     {
         this.usePrimitive = usePrimitive;
     }
@@ -583,7 +570,7 @@ public class ColumnMap implements Column
      *
      * @param javaNamingMethod The javaNamingMethod to set.
      */
-    public void setJavaNamingMethod(String javaNamingMethod)
+    public void setJavaNamingMethod(final String javaNamingMethod)
     {
         this.javaNamingMethod = javaNamingMethod;
     }
@@ -614,7 +601,7 @@ public class ColumnMap implements Column
      *
      * @param position The position to set.
      */
-    public void setPosition(int position)
+    public void setPosition(final int position)
     {
         this.position = position;
     }
@@ -634,7 +621,7 @@ public class ColumnMap implements Column
      *
      * @param javaType The javaType to set.
      */
-    public void setJavaType(String javaType)
+    public void setJavaType(final String javaType)
     {
         this.javaType = javaType;
     }
@@ -655,7 +642,7 @@ public class ColumnMap implements Column
      * @param key the key of the option
      * @param value the value of the option.
      */
-    public void setOption(String key, String value)
+    public void setOption(final String key, final String value)
     {
         optionsMap.put(key, value);
     }
@@ -667,7 +654,7 @@ public class ColumnMap implements Column
      *
      * @return the value of the option, or null if not set.
      */
-    public String getOption(String key)
+    public String getOption(final String key)
     {
         return optionsMap.get(key);
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java Sun May 19 09:58:00 2013
@@ -24,14 +24,13 @@ import java.util.Map;
 import org.apache.torque.Column;
 import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Utility methods for Database, Table and Column Maps.
  *
  * @version $Id$
  */
-@SuppressWarnings("deprecation")
 public final class MapHelper
 {
     /** Private constructor. */
@@ -57,9 +56,9 @@ public final class MapHelper
      * @throws TorqueException possibly if Torque is not initialized.
      */
     public static TableMap getTableMap(
-                Object possibleColumn,
-                CriteriaInterface<?> criteria,
-                TableMap defaultTableMap)
+                final Object possibleColumn,
+                final Criteria criteria,
+                final TableMap defaultTableMap)
             throws TorqueException
     {
         if (!(possibleColumn instanceof Column))
@@ -123,7 +122,7 @@ public final class MapHelper
      */
     public static ColumnMap getColumnMap(
                 Column column,
-                CriteriaInterface<?> criteria)
+                final Criteria criteria)
             throws TorqueException
     {
         String tableName = column.getTableName();

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java Sun May 19 09:58:00 2013
@@ -24,7 +24,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a BigDecimal.
@@ -52,7 +52,7 @@ public class BigDecimalMapper implements
      *
      * @param offset the additional offset (0 based).
      */
-    public BigDecimalMapper(int offset)
+    public BigDecimalMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -69,9 +69,9 @@ public class BigDecimalMapper implements
      * @return the BigDecimal retrieved from the result set.
      */
     public BigDecimal processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface<?> criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java Sun May 19 09:58:00 2013
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Uses a list of mappers to map a database record to a list of objects.
@@ -50,7 +50,7 @@ public class CompositeMapper implements 
      * @param mapper the mapper.
      * @param offset the offset of the mapper within this mapper, 0 based.
      */
-    public void addMapper(RecordMapper<?> mapper, int offset)
+    public void addMapper(final RecordMapper<?> mapper, final int offset)
     {
         mapperList.add(new MapperWithOffset(mapper, offset));
     }
@@ -69,9 +69,9 @@ public class CompositeMapper implements 
      *         were ordered, not null.
      */
     public List<Object> processRow(
-            ResultSet resultSet,
-            int offset,
-            CriteriaInterface<?> criteria)
+            final ResultSet resultSet,
+            final int offset,
+            final Criteria criteria)
         throws TorqueException
     {
         List<Object> result = new ArrayList<Object>(mapperList.size());
@@ -102,7 +102,7 @@ public class CompositeMapper implements 
          * @param mapper the mapper, not null.
          * @param offset the internal offset of the mapper.
          */
-        public MapperWithOffset(RecordMapper<?> mapper, int offset)
+        public MapperWithOffset(final RecordMapper<?> mapper, final int offset)
         {
             this.mapper = mapper;
             this.offset = offset;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java Sun May 19 09:58:00 2013
@@ -24,7 +24,7 @@ import java.sql.SQLException;
 import java.util.Date;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a java.util.Date.
@@ -53,7 +53,7 @@ public class DateMapper implements Recor
      * @param offset
      *            the additional offset (0 based).
      */
-    public DateMapper(int offset)
+    public DateMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -71,9 +71,9 @@ public class DateMapper implements Recor
      * @return the date retrieved from the result set.
      */
     public Date processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface<?> criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a Integer.
@@ -51,7 +51,7 @@ public class IntegerMapper implements Re
      *
      * @param offset the additional offset (0 based).
      */
-    public IntegerMapper(int offset)
+    public IntegerMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -68,9 +68,9 @@ public class IntegerMapper implements Re
      * @return the Integer retrieved from the result set.
      */
     public Integer processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface<?> criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a Long.
@@ -51,7 +51,7 @@ public class LongMapper implements Recor
      *
      * @param offset the additional offset (0 based).
      */
-    public LongMapper(int offset)
+    public LongMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -68,9 +68,9 @@ public class LongMapper implements Recor
      * @return the Long retrieved from the result set.
      */
     public Long processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface<?> criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java Sun May 19 09:58:00 2013
@@ -36,7 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a record to a list of objects.
@@ -83,7 +83,7 @@ public class ObjectListMapper implements
      *        result set's metadata (this may issue
      *        additional database queries).
      */
-    public ObjectListMapper(int numberOfColumnsToMap)
+    public ObjectListMapper(final int numberOfColumnsToMap)
     {
         this.convertClasses = new ArrayList<Class<?>>(numberOfColumnsToMap);
         if (numberOfColumnsToMap != -1)
@@ -110,7 +110,7 @@ public class ObjectListMapper implements
      *        which class is returned), java.sql.Ref, Short, String,
      *        java.sql.Time, java.sql.Timestamp and java.net.URL.
      */
-    public ObjectListMapper(List<Class<?>> convertClasses)
+    public ObjectListMapper(final List<Class<?>> convertClasses)
     {
         if (convertClasses != null)
         {
@@ -136,9 +136,9 @@ public class ObjectListMapper implements
      *         from the result set.
      */
     public List<Object> processRow(
-                ResultSet resultSet,
-                int offset,
-                CriteriaInterface<?> criteria)
+                final ResultSet resultSet,
+                final int offset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.sql.ResultSet;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps an object to a database record and back.
@@ -59,6 +59,6 @@ public interface RecordMapper<T> extends
     T processRow(
                 ResultSet resultSet,
                 int rowOffset,
-                CriteriaInterface<?> criteria)
+                Criteria criteria)
             throws TorqueException;
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a String.
@@ -51,7 +51,7 @@ public class StringMapper implements Rec
      *
      * @param offset the additional offset (0 based).
      */
-    public StringMapper(int offset)
+    public StringMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -68,9 +68,9 @@ public class StringMapper implements Rec
      * @return the String retrieved from the result set.
      */
     public String processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface<?> criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java Sun May 19 09:58:00 2013
@@ -22,7 +22,7 @@ package org.apache.torque.sql;
 import java.util.List;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.criteria.Criterion;
 import org.apache.torque.criteria.FromElement;
 import org.apache.torque.criteria.Join;
@@ -37,7 +37,6 @@ import org.apache.torque.util.UniqueList
  * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
  * @version $Id$
  */
-@SuppressWarnings("deprecation")
 public final class JoinBuilder
 {
     /**
@@ -60,7 +59,7 @@ public final class JoinBuilder
      * @throws TorqueException if the Joins can not be processed
      */
     public static void processJoins(
-                final CriteriaInterface<?> criteria,
+                final Criteria criteria,
                 final Query query)
             throws TorqueException
     {
@@ -237,8 +236,8 @@ public final class JoinBuilder
      * @throws TorqueException if the join condition cannot be built.
      */
     private static PreparedStatementPart buildJoinCondition(
-                Criterion joinCondition,
-                CriteriaInterface<?> criteria)
+                final Criterion joinCondition,
+                final Criteria criteria)
             throws TorqueException
     {
         PreparedStatementPart joinPart = new PreparedStatementPart();
@@ -258,9 +257,9 @@ public final class JoinBuilder
      * @throws TorqueException if the join condition cannot be built.
      */
     private static void appendJoinCondition(
-                Criterion joinCondition,
-                CriteriaInterface<?> criteria,
-                PreparedStatementPart joinPart)
+                final Criterion joinCondition,
+                final Criteria criteria,
+                final PreparedStatementPart joinPart)
             throws TorqueException
     {
         if (joinCondition.isComposite())



---------------------------------------------------------------------
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