Unifying ParameterBinding hierarchy into a single class and reducing its mutability

Author: andrus

cayenne/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java

@@ -55,16 +55,6 @@ public class BatchAction extends BaseSQLAction {
 	protected BatchQuery query;
 	protected RowDescriptor keyRowDescriptor;
 
-	private static void bind(DbAdapter adapter, PreparedStatement statement, ParameterBinding[] bindings)
-			throws Exception {
-
-		for (ParameterBinding b : bindings) {
-			if (!b.isDisabled()) {
-				adapter.bindParameter(statement, b);
-			}
-		}
-	}
-
 	/**
 	 * @since 4.0
 	 */
@@ -132,7 +122,9 @@ protected void runAsBatch(Connection con, BatchTranslator translator, OperationO
 
 				ParameterBinding[] bindings = translator.updateBindings(row);
 				logger.logQueryParameters("batch bind", bindings);
-				bind(adapter, statement, bindings);
+				for (ParameterBinding b : bindings) {
+					adapter.bindParameter(statement, b);
+				}
 
 				statement.addBatch();
 			}
@@ -192,7 +184,9 @@ protected void runAsIndividualQueries(Connection connection, BatchTranslator tra
 				ParameterBinding[] bindings = translator.updateBindings(row);
 				logger.logQueryParameters("bind", bindings);
 
-				bind(adapter, statement, bindings);
+				for (ParameterBinding b : bindings) {
+					adapter.bindParameter(statement, b);
+				}
 
 				int updated = statement.executeUpdate();
 				if (useOptimisticLock && updated != 1) {

cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java

@@ -48,10 +48,6 @@ private static void bind(DbAdapter adapter, PreparedStatement statement, Paramet
 
         for (ParameterBinding b : bindings) {
 
-            if (b.isDisabled()) {
-                continue;
-            }
-
             // null DbAttributes are a result of inferior qualifier
             // processing (qualifier can't map parameters to DbAttributes
             // and therefore only supports standard java types now) hence, a

cayenne/src/main/java/org/apache/cayenne/access/translator/ParameterBinding.java

@@ -28,8 +28,6 @@
  */
 public class ParameterBinding {
 
-    private static final int EXCLUDED_POSITION = -1;
-
     private final DbAttribute attribute;
     private final int jdbcType;
     private final int scale;
@@ -52,7 +50,20 @@ public ParameterBinding(int jdbcType, int scale, DbAttribute attribute) {
         this.attribute = attribute;
         this.jdbcType = jdbcType;
         this.scale = scale;
-        this.statementPosition = EXCLUDED_POSITION;
+
+        this.statementPosition = -1;
+    }
+
+    /**
+     * Sets the value, statement position and {@link ExtendedType} of the binding.
+     *
+     * @since 5.0
+     */
+    public ParameterBinding reset(int statementPosition, Object value, ExtendedType<?> extendedType) {
+        this.statementPosition = statementPosition;
+        this.value = value;
+        this.extendedType = extendedType;
+        return this;
     }
 
     public Object getValue() {
@@ -63,33 +74,10 @@ public int getStatementPosition() {
         return statementPosition;
     }
 
-    public boolean isDisabled() {
-        return statementPosition == EXCLUDED_POSITION;
-    }
-
     public ExtendedType getExtendedType() {
         return extendedType;
     }
 
-    /**
-     * Marks the binding object as excluded for the current iteration.
-     */
-    public void disable() {
-        this.statementPosition = EXCLUDED_POSITION;
-        this.value = null;
-        this.extendedType = null;
-    }
-
-    /**
-     * Sets the value, statement position and {@link ExtendedType} of the binding.
-     */
-    public ParameterBinding reset(int statementPosition, Object value, ExtendedType<?> extendedType) {
-        this.statementPosition = statementPosition;
-        this.value = value;
-        this.extendedType = extendedType;
-        return this;
-    }
-
     public int getJdbcType() {
         return jdbcType;
     }

cayenne/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java

@@ -112,10 +112,6 @@ private Map<String, List<String>> collectBindings(ParameterBinding[] bindings) {
         String key = null;
         String value;
         for (ParameterBinding b : bindings) {
-            if (b.isDisabled()) {
-                continue;
-            }
-
             DbAttribute attribute = b.getAttribute();
             if (attribute != null) {
                 key = attribute.getName();

cayenne/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java

@@ -100,10 +100,6 @@ protected void appendParameters(StringBuilder buffer, String label, ParameterBin
 			for (int i = 0, j = 1; i < len; i++) {
 				ParameterBinding b = bindings[i];
 
-				if (b.isDisabled()) {
-					continue;
-				}
-
 				if (hasIncluded) {
 					buffer.append(", ");
 				} else {