svn commit: r1357893 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne: access/jdbc/ColumnDescriptor.java access/trans/BatchQueryBuilder.java conn/ContainerPoolFactory.java

[aadamchik]

Author: aadamchik
Date: Thu Jul  5 20:44:40 2012
New Revision: 1357893

URL: http://svn.apache.org/viewvc?rev=1357893&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1

in progress

Removed:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ContainerPoolFactory.java
Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java?rev=1357893&r1=1357892&r2=1357893&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
 Thu Jul  5 20:44:40 2012
@@ -61,20 +61,6 @@ public class ColumnDescriptor implements
     /**
      * Creates a column descriptor with user-specified parameters.
      * 
-     * @since 1.2
-     * @deprecated since 3.1 use ColumnDescriptor(String columnName, int 
jdbcType) instead
-     */
-    @Deprecated
-    public ColumnDescriptor(String columnName, int jdbcType, String javaClass) 
{
-        this.name = columnName;
-        this.dataRowKey = columnName;
-        this.jdbcType = jdbcType;
-        this.javaClass = javaClass;
-    }
-
-    /**
-     * Creates a column descriptor with user-specified parameters.
-     * 
      * @since 3.1
      */
     public ColumnDescriptor(String columnName, int jdbcType) {
@@ -166,11 +152,13 @@ public class ColumnDescriptor implements
         }
 
         ColumnDescriptor rhs = (ColumnDescriptor) o;
-        return new EqualsBuilder().append(name, rhs.name).append(
-                namePrefix,
-                rhs.namePrefix).append(procedureName, 
rhs.procedureName).append(
-                dataRowKey,
-                rhs.dataRowKey).append(tableName, rhs.tableName).isEquals();
+        return new EqualsBuilder()
+                .append(name, rhs.name)
+                .append(namePrefix, rhs.namePrefix)
+                .append(procedureName, rhs.procedureName)
+                .append(dataRowKey, rhs.dataRowKey)
+                .append(tableName, rhs.tableName)
+                .isEquals();
     }
 
     /**
@@ -178,8 +166,13 @@ public class ColumnDescriptor implements
      */
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(23, 
43).append(name).append(namePrefix).append(
-                
procedureName).append(tableName).append(dataRowKey).toHashCode();
+        return new HashCodeBuilder(23, 43)
+                .append(name)
+                .append(namePrefix)
+                .append(procedureName)
+                .append(tableName)
+                .append(dataRowKey)
+                .toHashCode();
     }
 
     /**
@@ -199,17 +192,6 @@ public class ColumnDescriptor implements
     }
 
     /**
-     * Returns a default Java class for an internal JDBC type.
-     * 
-     * @since 1.2
-     * @deprecated use TypesMapping.getJavaBySqlType(int type) instead
-     */
-    @Deprecated
-    public String getDefaultJavaClass(int size, int scale) {
-        return TypesMapping.getJavaBySqlType(getJdbcType(), size, scale);
-    }
-
-    /**
      * Returns "qualifiedColumnName" property.
      * 
      * @since 1.2

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java?rev=1357893&r1=1357892&r2=1357893&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
 Thu Jul  5 20:44:40 2012
@@ -39,13 +39,6 @@ public abstract class BatchQueryBuilder 
     protected DbAdapter adapter;
     protected String trimFunction;
 
-    /**
-     * @deprecated since 3.1 unused
-     */
-    @Deprecated
-    public BatchQueryBuilder() {
-    }
-
     public BatchQueryBuilder(DbAdapter adapter) {
         this.adapter = adapter;
     }
@@ -116,8 +109,12 @@ public abstract class BatchQueryBuilder 
         for (int i = 0; i < attributeCount; i++) {
             Object value = query.getValue(i);
             DbAttribute attribute = dbAttributes.get(i);
-            adapter.bindParameter(statement, value, i + 1, 
attribute.getType(), attribute
-                    .getScale());
+            adapter.bindParameter(
+                    statement,
+                    value,
+                    i + 1,
+                    attribute.getType(),
+                    attribute.getScale());
 
         }
     }