#54 - Build against R2DBC 1.0 snapshots.

Author: mp911de

pom.xml

@@ -31,10 +31,11 @@
 		<hsqldb.version>2.4.1</hsqldb.version>
 		<postgresql.version>42.2.5</postgresql.version>
 		<mssql-jdbc.version>7.1.2.jre8-preview</mssql-jdbc.version>
-		<r2dbc-spi.version>1.0.0.M6</r2dbc-spi.version>
-		<r2dbc-postgresql.version>1.0.0.M6</r2dbc-postgresql.version>
-		<r2dbc-h2.version>1.0.0.M6</r2dbc-h2.version>
-		<r2dbc-mssql.version>1.0.0.M6</r2dbc-mssql.version>
+		<r2dbc.version>1.0.0.BUILD-SNAPSHOT</r2dbc.version>
+		<r2dbc-spi.version>${r2dbc.version}</r2dbc-spi.version>
+		<r2dbc-postgresql.version>${r2dbc.version}</r2dbc-postgresql.version>
+		<r2dbc-h2.version>${r2dbc.version}</r2dbc-h2.version>
+		<r2dbc-mssql.version>${r2dbc.version}</r2dbc-mssql.version>
 		<reactive-streams.version>1.0.1</reactive-streams.version>
 		<testcontainers.version>1.10.1</testcontainers.version>
 

src/main/java/org/springframework/data/r2dbc/dialect/BindMarker.java

@@ -28,7 +28,7 @@ public interface BindMarker {
 	 *          {@literal null} values.
 	 * @see Statement#bind
 	 */
-	void bind(Statement<?> statement, Object value);
+	void bind(Statement statement, Object value);
 
 	/**
 	 * Bind a {@literal null} value to the {@link Statement} using the underlying binding strategy.
@@ -37,5 +37,5 @@ public interface BindMarker {
 	 * @param valueType value type, must not be {@literal null}.
 	 * @see Statement#bindNull
 	 */
-	void bindNull(Statement<?> statement, Class<?> valueType);
+	void bindNull(Statement statement, Class<?> valueType);
 }

src/main/java/org/springframework/data/r2dbc/dialect/Dialect.java

@@ -22,17 +22,6 @@ public interface Dialect {
 	 */
 	BindMarkersFactory getBindMarkersFactory();
 
-	/**
-	 * Returns the clause to include for returning generated keys. The returned query is directly appended to
-	 * {@code INSERT} statements.
-	 *
-	 * @return the clause to include for returning generated keys.
-	 * @deprecated to be removed after upgrading to R2DBC 1.0M7 in favor of using the driver's direct support for
-	 *             retrieving generated keys.
-	 */
-	@Deprecated
-	String generatedKeysClause();
-
 	/**
 	 * Return a collection of types that are natively supported by this database/driver. Defaults to
 	 * {@link Collections#emptySet()}.

src/main/java/org/springframework/data/r2dbc/dialect/H2Dialect.java

@@ -11,13 +11,4 @@ public class H2Dialect extends PostgresDialect {
 	 * Singleton instance.
 	 */
 	public static final H2Dialect INSTANCE = new H2Dialect();
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.r2dbc.dialect.Dialect#returnGeneratedKeys()
-	 */
-	@Override
-	public String generatedKeysClause() {
-		return "";
-	}
 }

src/main/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkers.java

@@ -74,7 +74,7 @@ public String getPlaceholder() {
 		 * @see org.springframework.data.r2dbc.dialect.BindMarker#bindValue(io.r2dbc.spi.Statement, java.lang.Object)
 		 */
 		@Override
-		public void bind(Statement<?> statement, Object value) {
+		public void bind(Statement statement, Object value) {
 			statement.bind(this.index, value);
 		}
 
@@ -83,7 +83,7 @@ public void bind(Statement<?> statement, Object value) {
 		 * @see org.springframework.data.r2dbc.dialect.BindMarker#bindNull(io.r2dbc.spi.Statement, java.lang.Class)
 		 */
 		@Override
-		public void bindNull(Statement<?> statement, Class<?> valueType) {
+		public void bindNull(Statement statement, Class<?> valueType) {
 			statement.bindNull(this.index, valueType);
 		}
 	}

src/main/java/org/springframework/data/r2dbc/dialect/NamedBindMarkers.java

@@ -101,7 +101,7 @@ public String getPlaceholder() {
 		 * @see org.springframework.data.r2dbc.dialect.BindMarker#bindValue(io.r2dbc.spi.Statement, java.lang.Object)
 		 */
 		@Override
-		public void bind(Statement<?> statement, Object value) {
+		public void bind(Statement statement, Object value) {
 			statement.bind(this.identifier, value);
 		}
 
@@ -110,7 +110,7 @@ public void bind(Statement<?> statement, Object value) {
 		 * @see org.springframework.data.r2dbc.dialect.BindMarker#bindNull(io.r2dbc.spi.Statement, java.lang.Class)
 		 */
 		@Override
-		public void bindNull(Statement<?> statement, Class<?> valueType) {
+		public void bindNull(Statement statement, Class<?> valueType) {
 			statement.bindNull(this.identifier, valueType);
 		}
 	}

src/main/java/org/springframework/data/r2dbc/dialect/PostgresDialect.java

@@ -73,15 +73,6 @@ public BindMarkersFactory getBindMarkersFactory() {
 		return INDEXED;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.r2dbc.dialect.Dialect#returnGeneratedKeys()
-	 */
-	@Override
-	public String generatedKeysClause() {
-		return "RETURNING *";
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.r2dbc.dialect.Dialect#getSimpleTypesKeys()

src/main/java/org/springframework/data/r2dbc/dialect/SqlServerDialect.java

@@ -62,15 +62,6 @@ public BindMarkersFactory getBindMarkersFactory() {
 		return NAMED;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.r2dbc.dialect.Dialect#returnGeneratedKeys()
-	 */
-	@Override
-	public String generatedKeysClause() {
-		return "select SCOPE_IDENTITY() AS GENERATED_KEYS";
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.r2dbc.dialect.Dialect#getSimpleTypesKeys()

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

@@ -19,7 +19,7 @@ public interface BindIdOperation extends BindableOperation {
 	 * @param value the actual value. Must not be {@literal null}.
 	 * @see Statement#bind
 	 */
-	void bindId(Statement<?> statement, Object value);
+	void bindId(Statement statement, Object value);
 
 	/**
 	 * Bind the given {@code values} to the {@link Statement} using the underlying binding strategy.
@@ -28,5 +28,5 @@ public interface BindIdOperation extends BindableOperation {
 	 * @param values the actual values.
 	 * @see Statement#bind
 	 */
-	void bindIds(Statement<?> statement, Iterable<? extends Object> values);
+	void bindIds(Statement statement, Iterable<? extends Object> values);
 }

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

@@ -24,7 +24,7 @@ public interface BindableOperation extends QueryOperation {
 	 *          {@literal null} values.
 	 * @see Statement#bind
 	 */
-	void bind(Statement<?> statement, String identifier, Object value);
+	void bind(Statement statement, String identifier, Object value);
 
 	/**
 	 * Bind a {@literal null} value to the {@link Statement} using the underlying binding strategy.
@@ -34,7 +34,7 @@ public interface BindableOperation extends QueryOperation {
 	 * @param valueType value type, must not be {@literal null}.
 	 * @see Statement#bindNull
 	 */
-	void bindNull(Statement<?> statement, String identifier, Class<?> valueType);
+	void bindNull(Statement statement, String identifier, Class<?> valueType);
 
 	/**
 	 * Bind a {@link SettableValue} to the {@link Statement} using the underlying binding strategy. Binds either the
@@ -45,7 +45,7 @@ public interface BindableOperation extends QueryOperation {
 	 * @see Statement#bind
 	 * @see Statement#bindNull
 	 */
-	default void bind(Statement<?> statement, SettableValue value) {
+	default void bind(Statement statement, SettableValue value) {
 
 		if (value.getValue() == null) {
 			bindNull(statement, value.getIdentifier().toString(), value.getType());

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

@@ -251,14 +251,14 @@ protected DefaultGenericExecuteSpec createGenericExecuteSpec(Supplier<String> sq
 		return new DefaultGenericExecuteSpec(sqlSupplier);
 	}
 
-	private static void doBind(Statement<?> statement, Map<String, SettableValue> byName,
+	private static void doBind(Statement statement, Map<String, SettableValue> byName,
 			Map<Integer, SettableValue> byIndex) {
 
 		bindByIndex(statement, byIndex);
 		bindByName(statement, byName);
 	}
 
-	private static void bindByName(Statement<?> statement, Map<String, SettableValue> byName) {
+	private static void bindByName(Statement statement, Map<String, SettableValue> byName) {
 
 		byName.forEach((name, o) -> {
 
@@ -270,7 +270,7 @@ private static void bindByName(Statement<?> statement, Map<String, SettableValue
 		});
 	}
 
-	private static void bindByIndex(Statement<?> statement, Map<Integer, SettableValue> byIndex) {
+	private static void bindByIndex(Statement statement, Map<Integer, SettableValue> byIndex) {
 
 		byIndex.forEach((i, o) -> {
 
@@ -329,7 +329,7 @@ protected String getSql() {
 
 		<T> FetchSpec<T> exchange(String sql, BiFunction<Row, RowMetadata, T> mappingFunction) {
 
-			Function<Connection, Statement<?>> executeFunction = it -> {
+			Function<Connection, Statement> executeFunction = it -> {
 
 				if (logger.isDebugEnabled()) {
 					logger.debug("Executing SQL statement [" + sql + "]");
@@ -338,7 +338,7 @@ <T> FetchSpec<T> exchange(String sql, BiFunction<Row, RowMetadata, T> mappingFun
 				BindableOperation operation = namedParameters.expand(sql, dataAccessStrategy.getBindMarkersFactory(),
 						new MapBindParameterSource(byName));
 
-				Statement<?> statement = it.createStatement(operation.toQuery());
+				Statement statement = it.createStatement(operation.toQuery());
 
 				byName.forEach((name, o) -> {
 
@@ -632,7 +632,7 @@ public DefaultSelectSpecSupport page(Pageable page) {
 
 		<R> FetchSpec<R> execute(String sql, BiFunction<Row, RowMetadata, R> mappingFunction) {
 
-			Function<Connection, Statement<?>> selectFunction = it -> {
+			Function<Connection, Statement> selectFunction = it -> {
 
 				if (logger.isDebugEnabled()) {
 					logger.debug("Executing SQL statement [" + sql + "]");
@@ -886,13 +886,13 @@ private <R> FetchSpec<R> exchange(BiFunction<Row, RowMetadata, R> mappingFunctio
 			BindableOperation bindableInsert = dataAccessStrategy.insertAndReturnGeneratedKeys(table, byName.keySet());
 
 			String sql = bindableInsert.toQuery();
-			Function<Connection, Statement<?>> insertFunction = it -> {
+			Function<Connection, Statement> insertFunction = it -> {
 
 				if (logger.isDebugEnabled()) {
 					logger.debug("Executing SQL statement [" + sql + "]");
 				}
 
-				Statement<?> statement = it.createStatement(sql);
+				Statement statement = it.createStatement(sql).returnGeneratedValues();
 
 				byName.forEach((k, v) -> bindableInsert.bind(statement, v));
 
@@ -1015,7 +1015,7 @@ private <MR> FetchSpec<MR> exchange(Object toInsert, BiFunction<Row, RowMetadata
 					logger.debug("Executing SQL statement [" + sql + "]");
 				}
 
-				Statement<?> statement = it.createStatement(sql);
+				Statement statement = it.createStatement(sql).returnGeneratedValues();
 
 				for (SettableValue settable : insertValues) {
 					bindableInsert.bind(statement, settable);