#73 - hacking - changed method name according to review.

Author: schauder

src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java

@@ -340,7 +340,7 @@ <T> FetchSpec<T> exchange(String sql, BiFunction<Row, RowMetadata, T> mappingFun
 				pop = new ParameterbindingPreparedOperation(sql, namedParameters, dataAccessStrategy, byName, byIndex);
 			}
 
-			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(pop.bind(it).execute());
+			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(pop.createBoundStatement(it).execute());
 
 			return new DefaultSqlResult<>(DefaultDatabaseClient.this, //
 					sql, //
@@ -883,7 +883,7 @@ private <R> FetchSpec<R> exchange(BiFunction<Row, RowMetadata, R> mappingFunctio
 						byName.forEach(it::bind);
 					});
 
-			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(operation.bind(it).execute());
+			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(operation.createBoundStatement(it).execute());
 
 			return new DefaultSqlResult<>(DefaultDatabaseClient.this, //
 					operation.toQuery(), //
@@ -994,7 +994,7 @@ private <MR> FetchSpec<MR> exchange(Object toInsert, BiFunction<Row, RowMetadata
 						});
 					});
 
-			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(operation.bind(it).execute());
+			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(operation.createBoundStatement(it).execute());
 
 			return new DefaultSqlResult<>(DefaultDatabaseClient.this, //
 					operation.toQuery(), //

src/main/java/org/springframework/data/r2dbc/function/DefaultStatementFactory.java

@@ -472,7 +472,7 @@ protected Statement bind(Statement to) {
 		}
 
 		@Override
-		public Statement bind(Connection connection) {
+		public Statement createBoundStatement(Connection connection) {
 
 			// TODO add back logging
 //			if (logger.isDebugEnabled()) {

src/main/java/org/springframework/data/r2dbc/function/ParameterbindingPreparedOperation.java

@@ -56,7 +56,7 @@ public BindableOperation getSource() {
 	}
 
 	@Override
-	public Statement bind(Connection connection) {
+	public Statement createBoundStatement(Connection connection) {
 
 		Statement statement = connection.createStatement(operation.toQuery());
 

src/main/java/org/springframework/data/r2dbc/function/PreparedOperation.java

@@ -45,5 +45,5 @@ public interface PreparedOperation<T> extends QueryOperation {
 	 * @param connection the {@link Connection} used for constructing a statement
 	 * @return the bound statement.
 	 */
-	Statement bind(Connection connection);
+	Statement createBoundStatement(Connection connection);
 }

src/test/java/org/springframework/data/r2dbc/function/StatementFactoryUnitTests.java

@@ -61,7 +61,7 @@ public void shouldToQuerySimpleSelectWithoutBindings() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo");
 
-		select.bind(connectionMock);
+		select.createBoundStatement(connectionMock);
 
 		verifyZeroInteractions(statementMock);
 	}
@@ -76,7 +76,7 @@ public void shouldToQuerySimpleSelectWithSimpleFilter() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe = $1");
 
-		select.bind(connectionMock);
+		select.createBoundStatement(connectionMock);
 
 		verify(statementMock).bind(0, "John");
 		verifyNoMoreInteractions(statementMock);
@@ -93,7 +93,7 @@ public void shouldToQuerySimpleSelectWithMultipleFilters() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe = $1 AND foo.baz = $2");
 
-		select.bind(connectionMock);
+		select.createBoundStatement(connectionMock);
 
 		verify(statementMock).bind(0, "John");
 		verify(statementMock).bind(1, "Jake");
@@ -110,7 +110,7 @@ public void shouldToQuerySimpleSelectWithNullFilter() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe IS NULL");
 
-		select.bind(connectionMock);
+		select.createBoundStatement(connectionMock);
 		verifyZeroInteractions(statementMock);
 	}
 
@@ -124,7 +124,7 @@ public void shouldToQuerySimpleSelectWithIterableFilter() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe IN ($1, $2)");
 
-		select.bind(connectionMock);
+		select.createBoundStatement(connectionMock);
 		verify(statementMock).bind(0, "John");
 		verify(statementMock).bind(1, "Jake");
 		verifyNoMoreInteractions(statementMock);
@@ -147,7 +147,7 @@ public void shouldToQuerySimpleInsert() {
 		assertThat(insert.getSource()).isInstanceOf(Insert.class);
 		assertThat(insert.toQuery()).isEqualTo("INSERT INTO foo (bar) VALUES ($1)");
 
-		insert.bind(connectionMock);
+		insert.createBoundStatement(connectionMock);
 		verify(statementMock).bind(0, "Foo");
 		verify(statementMock).returnGeneratedValues(any(String[].class));
 		verifyNoMoreInteractions(statementMock);
@@ -170,7 +170,7 @@ public void shouldToQuerySimpleUpdate() {
 		assertThat(update.getSource()).isInstanceOf(Update.class);
 		assertThat(update.toQuery()).isEqualTo("UPDATE foo SET bar = $1");
 
-		update.bind(connectionMock);
+		update.createBoundStatement(connectionMock);
 		verify(statementMock).bind(0, "Foo");
 		verifyNoMoreInteractions(statementMock);
 	}
@@ -185,7 +185,7 @@ public void shouldToQueryNullUpdate() {
 		assertThat(update.getSource()).isInstanceOf(Update.class);
 		assertThat(update.toQuery()).isEqualTo("UPDATE foo SET bar = $1");
 
-		update.bind(connectionMock);
+		update.createBoundStatement(connectionMock);
 		verify(statementMock).bindNull(0, String.class);
 
 		verifyNoMoreInteractions(statementMock);
@@ -202,7 +202,7 @@ public void shouldToQueryUpdateWithFilter() {
 		assertThat(update.getSource()).isInstanceOf(Update.class);
 		assertThat(update.toQuery()).isEqualTo("UPDATE foo SET bar = $1 WHERE foo.baz = $2");
 
-		update.bind(connectionMock);
+		update.createBoundStatement(connectionMock);
 		verify(statementMock).bind(0, "Foo");
 		verify(statementMock).bind(1, "Baz");
 		verifyNoMoreInteractions(statementMock);
@@ -218,7 +218,7 @@ public void shouldToQuerySimpleDeleteWithSimpleFilter() {
 		assertThat(delete.getSource()).isInstanceOf(Delete.class);
 		assertThat(delete.toQuery()).isEqualTo("DELETE FROM foo WHERE foo.doe = $1");
 
-		delete.bind(connectionMock);
+		delete.createBoundStatement(connectionMock);
 		verify(statementMock).bind(0, "John");
 		verifyNoMoreInteractions(statementMock);
 	}
@@ -234,7 +234,7 @@ public void shouldToQuerySimpleDeleteWithMultipleFilters() {
 		assertThat(delete.getSource()).isInstanceOf(Delete.class);
 		assertThat(delete.toQuery()).isEqualTo("DELETE FROM foo WHERE foo.doe = $1 AND foo.baz = $2");
 
-		delete.bind(connectionMock);
+		delete.createBoundStatement(connectionMock);
 		verify(statementMock).bind(0, "John");
 		verify(statementMock).bind(1, "Jake");
 		verifyNoMoreInteractions(statementMock);
@@ -250,7 +250,7 @@ public void shouldToQuerySimpleDeleteWithNullFilter() {
 		assertThat(delete.getSource()).isInstanceOf(Delete.class);
 		assertThat(delete.toQuery()).isEqualTo("DELETE FROM foo WHERE foo.doe IS NULL");
 
-		delete.bind(connectionMock);
+		delete.createBoundStatement(connectionMock);
 		verifyZeroInteractions(statementMock);
 	}
 }