svn commit: r1577118 - in /cayenne/main/trunk/cayenne-server/src: main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java test/java/org/apache/cayenne/access/trans/BatchQueryBuilderTest.java

[aadamchik]

Author: aadamchik
Date: Thu Mar 13 11:45:50 2014
New Revision: 1577118

URL: http://svn.apache.org/r1577118
Log:
cleanup - 'bindParameter' implementation is always overwridden in all subclasses

so must be abstract in super

Modified:
    
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
    
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/trans/BatchQueryBuilderTest.java

Modified: 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java?rev=1577118&r1=1577117&r2=1577118&view=diff
==============================================================================
--- 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
 (original)
+++ 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
 Thu Mar 13 11:45:50 2014
@@ -95,18 +95,7 @@ public abstract class BatchQueryBuilder 
      * 
      * @since 1.2
      */
-    public void bindParameters(PreparedStatement statement, BatchQuery query) 
throws SQLException, Exception {
-
-        List<DbAttribute> dbAttributes = query.getDbAttributes();
-        int attributeCount = dbAttributes.size();
-
-        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());
-
-        }
-    }
+    public abstract void bindParameters(PreparedStatement statement, 
BatchQuery query) throws SQLException, Exception;
 
     /**
      * Returns a list of values for the current batch iteration. Used primarily

Modified: 
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/trans/BatchQueryBuilderTest.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/trans/BatchQueryBuilderTest.java?rev=1577118&r1=1577117&r2=1577118&view=diff
==============================================================================
--- 
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/trans/BatchQueryBuilderTest.java
 (original)
+++ 
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/trans/BatchQueryBuilderTest.java
 Thu Mar 13 11:45:50 2014
@@ -20,6 +20,8 @@
 
 package org.apache.cayenne.access.trans;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.sql.Types;
 
 import org.apache.cayenne.dba.DbAdapter;
@@ -48,6 +50,9 @@ public class BatchQueryBuilderTest exten
             public String createSqlString(BatchQuery batch) {
                                return null;
                        }
+                       @Override
+            public void bindParameters(PreparedStatement statement, BatchQuery 
query) throws SQLException, Exception {
+            }
                };
 
                assertSame(adapter, builder.getAdapter());
@@ -65,6 +70,10 @@ public class BatchQueryBuilderTest exten
             public String createSqlString(BatchQuery batch) {
                                return null;
                        }
+                       
+                       @Override
+            public void bindParameters(PreparedStatement statement, BatchQuery 
query) throws SQLException, Exception {
+            }
                };
                
                builder.setTrimFunction(trimFunction);
@@ -93,6 +102,10 @@ public class BatchQueryBuilderTest exten
             public String createSqlString(BatchQuery batch) {
                                return null;
                        }
+                       
+                       @Override
+                       public void bindParameters(PreparedStatement statement, 
BatchQuery query) throws SQLException, Exception {
+                       }
                };
 
                StringBuffer buf = new StringBuffer();