DATAJDBC-335 - Address review comments.

Author: mp911de

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/AssignValue.java

@@ -65,14 +65,14 @@ public Expression getValue() {
 		return value;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
 
-		StringBuilder builder = new StringBuilder(32);
+		StringBuilder builder = new StringBuilder();
 		return builder.append(this.column).append(" = ").append(this.value).toString();
 	}
 }

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultUpdate.java

@@ -40,7 +40,7 @@ class DefaultUpdate implements Update {
 		this.where = where != null ? new Where(where) : null;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.Visitable#visit(org.springframework.data.relational.core.sql.Visitor)
 	 */
@@ -61,14 +61,14 @@ public void visit(Visitor visitor) {
 		visitor.leave(this);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
 
-		StringBuilder builder = new StringBuilder(32);
+		StringBuilder builder = new StringBuilder();
 		builder.append("UPDATE ").append(table);
 
 		if (!assignments.isEmpty()) {

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultUpdateBuilder.java

@@ -16,10 +16,11 @@
 package org.springframework.data.relational.core.sql;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import org.springframework.data.relational.core.sql.UpdateBuilder.UpdateAssign;
-import org.springframework.data.relational.core.sql.UpdateBuilder.UpdateAssignAnd;
 import org.springframework.data.relational.core.sql.UpdateBuilder.UpdateWhere;
 import org.springframework.data.relational.core.sql.UpdateBuilder.UpdateWhereAndOr;
 import org.springframework.lang.Nullable;
@@ -31,13 +32,13 @@
  * @author Mark Paluch
  * @since 1.1
  */
-class DefaultUpdateBuilder implements UpdateBuilder, UpdateWhere, UpdateWhereAndOr, UpdateAssign, UpdateAssignAnd {
+class DefaultUpdateBuilder implements UpdateBuilder, UpdateWhere, UpdateWhereAndOr, UpdateAssign {
 
 	private Table table;
 	private List<Assignment> assignments = new ArrayList<>();
 	private @Nullable Condition where;
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.UpdateBuilder#table(org.springframework.data.relational.core.sql.Table)
 	 */
@@ -51,7 +52,7 @@ public UpdateAssign table(Table table) {
 		return this;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateAssign#set(org.springframework.data.relational.core.sql.Assignment)
 	 */
@@ -65,16 +66,33 @@ public DefaultUpdateBuilder set(Assignment assignment) {
 		return this;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateAssignAnd#and(org.springframework.data.relational.core.sql.Assignment)
+	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateAssign#set(org.springframework.data.relational.core.sql.Assignment...)
 	 */
 	@Override
-	public DefaultUpdateBuilder and(Assignment assignment) {
-		return set(assignment);
+	public UpdateWhere set(Assignment... assignments) {
+
+		Assert.notNull(assignments, "Assignment must not be null!");
+
+		return set(Arrays.asList(assignments));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateAssign#set(java.util.Collection)
+	 */
+	@Override
+	public UpdateWhere set(Collection<? extends Assignment> assignments) {
+
+		Assert.notNull(assignments, "Assignment must not be null!");
+
+		this.assignments.addAll(assignments);
+
+		return this;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateWhere#where(org.springframework.data.relational.core.sql.Condition)
 	 */
@@ -88,7 +106,7 @@ public UpdateWhereAndOr where(Condition condition) {
 		return this;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateWhereAndOr#and(org.springframework.data.relational.core.sql.Condition)
 	 */
@@ -102,7 +120,7 @@ public UpdateWhereAndOr and(Condition condition) {
 		return this;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.UpdateWhereAndOr#or(org.springframework.data.relational.core.sql.Condition)
 	 */
@@ -116,7 +134,7 @@ public UpdateWhereAndOr or(Condition condition) {
 		return this;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.relational.core.sql.UpdateBuilder.BuildUpdate#build()
 	 */

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/UpdateBuilder.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.relational.core.sql;
 
+import java.util.Collection;
+
 /**
  * Entry point to construct an {@link Update} statement.
  *
@@ -44,22 +46,25 @@ interface UpdateAssign {
 		 * @return {@code this} builder.
 		 * @see Assignment
 		 */
-		UpdateAssignAnd set(Assignment assignment);
-	}
+		UpdateWhere set(Assignment assignment);
 
-	/**
-	 * Interface exposing {@code SET} methods.
-	 */
-	interface UpdateAssignAnd extends UpdateWhere {
+		/**
+		 * Apply one or more {@link Assignment SET assignments}.
+		 *
+		 * @param assignments the {@link Assignment column assignments}.
+		 * @return {@code this} builder.
+		 * @see Assignment
+		 */
+		UpdateWhere set(Assignment... assignments);
 
 		/**
-		 * Apply a {@link Assignment SET assignment}.
+		 * Apply one or more {@link Assignment SET assignments}.
 		 *
-		 * @param assignment a single {@link Assignment column assignment}.
+		 * @param assignments the {@link Assignment column assignments}.
 		 * @return {@code this} builder.
 		 * @see Assignment
 		 */
-		UpdateAssignAnd and(Assignment assignment);
+		UpdateWhere set(Collection<? extends Assignment> assignments);
 	}
 
 	/**

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java

@@ -51,8 +51,7 @@ public void shouldRenderMultipleColumnUpdate() {
 		Column bar = table.column("bar");
 
 		Update update = StatementBuilder.update(table) //
-				.set(foo.set(SQL.bindMarker())) //
-				.and(bar.set(SQL.bindMarker())) //
+				.set(foo.set(SQL.bindMarker()), bar.set(SQL.bindMarker())) //
 				.build();
 
 		assertThat(SqlRenderer.toString(update)).isEqualTo("UPDATE mytable SET mytable.foo = ?, mytable.bar = ?");