Skip to content

Commit b915038

Browse files
committed
#368 - Polishing.
Line breaks after dots in ascii doctor file for easier reading of the source files. Adds specific deprecation links instead of just links to the general package. Removes an unused private method in `ConnectionFactoryUtils`
1 parent 7707b4f commit b915038

40 files changed

+43
-52
lines changed

src/main/asciidoc/reference/r2dbc-upgrading.adoc

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ Spring Data R2DBC was developed with the intent to evaluate how well R2DBC can i
1111
One of the main aspects was to move core support into Spring Framework once R2DBC support has proven useful.
1212
Spring Framework 5.3 ships with a new module: Spring R2DBC.
1313

14-
`spring-r2dbc` ships core R2DBC functionality (a slim variant of `DatabaseClient`, Transaction Manager, Connection Factory initialization, Exception translation) that was initially provided by Spring Data R2DBC. The 1.2.0 release aligns with what's provided in Spring R2DBC by making several changes outlined in the following sections.
14+
`spring-r2dbc` ships core R2DBC functionality (a slim variant of `DatabaseClient`, Transaction Manager, Connection Factory initialization, Exception translation) that was initially provided by Spring Data R2DBC.
15+
The 1.2.0 release aligns with what's provided in Spring R2DBC by making several changes outlined in the following sections.
1516

1617
Spring R2DBC's `DatabaseClient` is a more lightweight implementation that encapsulates a pure SQL-oriented interface.
1718
You will notice that the method to run SQL statements changed from `DatabaseClient.execute(…)` to `DatabaseClient.sql(…)`.
@@ -36,7 +37,8 @@ Spring R2DBC provides a slim exception translation variant without an SPI for no
3637
[[upgrading.1.1-1.2.replacements]]
3738
=== Usage of replacements provided by Spring R2DBC
3839

39-
To ease migration, several deprecated types are now subtypes of their replacements provided by Spring R2DBC. Spring Data R2DBC has changes several methods or introduced new methods accepting Spring R2DBC types.
40+
To ease migration, several deprecated types are now subtypes of their replacements provided by Spring R2DBC.
41+
Spring Data R2DBC has changes several methods or introduced new methods accepting Spring R2DBC types.
4042
Specifically the following classes are affected:
4143

4244
* `R2dbcEntityTemplate`

src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtils.java

+1-16
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* @author Mark Paluch
3838
* @author Christoph Strobl
39-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection} instead.
39+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.ConnectionFactoryUtils} instead.
4040
*/
4141
@Deprecated
4242
public abstract class ConnectionFactoryUtils {
@@ -82,21 +82,6 @@ public static Mono<Connection> doGetConnection(ConnectionFactory connectionFacto
8282
return org.springframework.r2dbc.connection.ConnectionFactoryUtils.doGetConnection(connectionFactory);
8383
}
8484

85-
/**
86-
* Actually fetch a {@link io.r2dbc.spi.Connection} from the given {@link io.r2dbc.spi.ConnectionFactory}, defensively
87-
* turning an unexpected {@literal null} return value from {@link io.r2dbc.spi.ConnectionFactory#create()} into an
88-
* {@link IllegalStateException}.
89-
*
90-
* @param connectionFactory the {@link io.r2dbc.spi.ConnectionFactory} to obtain {@link io.r2dbc.spi.Connection}s from
91-
* @return a R2DBC {@link io.r2dbc.spi.Connection} from the given {@link io.r2dbc.spi.ConnectionFactory} (never
92-
* {@literal null}).
93-
* @throws IllegalStateException if the {@link io.r2dbc.spi.ConnectionFactory} returned a {@literal null} value.
94-
* @see ConnectionFactory#create()
95-
*/
96-
private static Mono<Connection> fetchConnection(ConnectionFactory connectionFactory) {
97-
return Mono.from(connectionFactory.create());
98-
}
99-
10085
/**
10186
* Close the given {@link io.r2dbc.spi.Connection}, obtained from the given {@link io.r2dbc.spi.ConnectionFactory}, if
10287
* it is not managed externally (that is, not bound to the thread).

src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHolder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Christoph Strobl
3434
* @see R2dbcTransactionManager
3535
* @see ConnectionFactoryUtils
36-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection} instead.
36+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.ConnectionHolder} instead.
3737
*/
3838
@Deprecated
3939
public class ConnectionHolder extends ResourceHolderSupport {

src/main/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*
3333
* @author Mark Paluch
3434
* @see #create
35-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection} instead.
35+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.DelegatingConnectionFactory} instead.
3636
*/
3737
@Deprecated
3838
public class DelegatingConnectionFactory implements ConnectionFactory, Wrapped<ConnectionFactory> {

src/main/java/org/springframework/data/r2dbc/connectionfactory/SingleConnectionConnectionFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
* @see #create()
5454
* @see io.r2dbc.spi.Connection#close()
5555
* @see ConnectionFactoryUtils#releaseConnection(io.r2dbc.spi.Connection, ConnectionFactory)
56-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection} instead.
56+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.SingleConnectionFactory} instead.
5757
*/
5858
@Deprecated
5959
public class SingleConnectionConnectionFactory extends DelegatingConnectionFactory

src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
* @see Connection#close
6161
* @see ConnectionFactoryUtils#doGetConnection
6262
* @see ConnectionFactoryUtils#doReleaseConnection
63-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection} instead.
63+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.TransactionAwareConnectionFactoryProxy} instead.
6464
*/
6565
@Deprecated
6666
public class TransactionAwareConnectionFactoryProxy extends DelegatingConnectionFactory {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/CannotReadScriptException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Thrown by {@link ScriptUtils} if an SQL script cannot be read.
2222
*
2323
* @author Mark Paluch
24-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
24+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.CannotReadScriptException} instead.
2525
*/
2626
@Deprecated
2727
public class CannotReadScriptException extends ScriptException {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/CompositeDatabasePopulator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* executing all scripts.
3232
*
3333
* @author Mark Paluch
34-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
34+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.CompositeDatabasePopulator} instead.
3535
*/
3636
@Deprecated
3737
public class CompositeDatabasePopulator implements DatabasePopulator {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/ConnectionFactoryInitializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
* @author Mark Paluch
3030
* @see DatabasePopulator
31-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
31+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.ConnectionFactoryInitializer} instead.
3232
*/
3333
@Deprecated
3434
public class ConnectionFactoryInitializer implements InitializingBean, DisposableBean {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/DatabasePopulator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @see ResourceDatabasePopulator
2626
* @see DatabasePopulatorUtils
2727
* @see ConnectionFactoryInitializer
28-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
28+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.DatabasePopulator} instead.
2929
*/
3030
@FunctionalInterface
3131
@Deprecated

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/ResourceDatabasePopulator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* @author Mark Paluch
4646
* @see DatabasePopulatorUtils
4747
* @see ScriptUtils
48-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
48+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.ResourceDatabasePopulator} instead.
4949
*/
5050
@Deprecated
5151
public class ResourceDatabasePopulator implements DatabasePopulator {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/ScriptException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Root of the hierarchy of data access exceptions that are related to processing of SQL scripts.
2323
*
2424
* @author Mark Paluch
25-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
25+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.ScriptException} instead.
2626
*/
2727
@Deprecated
2828
public abstract class ScriptException extends DataAccessException {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/ScriptParseException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Thrown by {@link ScriptUtils} if an SQL script cannot be properly parsed.
2323
*
2424
* @author Mark Paluch
25-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
25+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.ScriptParseException} instead.
2626
*/
2727
@Deprecated
2828
public class ScriptParseException extends ScriptException {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/ScriptStatementFailedException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Thrown by {@link ScriptUtils} if a statement in an SQL script failed when executing it against the target database.
2222
*
2323
* @author Mark Paluch
24-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
24+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.ScriptStatementFailedException} instead.
2525
*/
2626
@Deprecated
2727
public class ScriptStatementFailedException extends ScriptException {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/ScriptUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* Mainly for internal use within the framework.
4949
*
5050
* @author Mark Paluch
51-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
51+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.ScriptUtils} instead.
5252
*/
5353
@Deprecated
5454
public abstract class ScriptUtils {

src/main/java/org/springframework/data/r2dbc/connectionfactory/init/UncategorizedScriptException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* for example, a {@link io.r2dbc.spi.R2dbcException} from R2DBC that we cannot pinpoint more precisely.
2121
*
2222
* @author Mark Paluch
23-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init} instead.
23+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.init.UncategorizedScriptException} instead.
2424
*/
2525
@Deprecated
2626
public class UncategorizedScriptException extends ScriptException {

src/main/java/org/springframework/data/r2dbc/connectionfactory/lookup/AbstractRoutingConnectionFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* @see #setTargetConnectionFactories
4343
* @see #setDefaultTargetConnectionFactory
4444
* @see #determineCurrentLookupKey()
45-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup} instead.
45+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup.AbstractRoutingConnectionFactory} instead.
4646
*/
4747
@Deprecated
4848
public abstract class AbstractRoutingConnectionFactory implements ConnectionFactory, InitializingBean {

src/main/java/org/springframework/data/r2dbc/connectionfactory/lookup/BeanFactoryConnectionFactoryLookup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Mark Paluch
3232
* @see BeanFactory
33-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup} instead.
33+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup.BeanFactoryConnectionFactoryLookup} instead.
3434
*/
3535
@Deprecated
3636
public class BeanFactoryConnectionFactoryLookup implements ConnectionFactoryLookup, BeanFactoryAware {

src/main/java/org/springframework/data/r2dbc/connectionfactory/lookup/ConnectionFactoryLookup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Strategy interface for looking up {@link ConnectionFactory} by name.
2222
*
2323
* @author Mark Paluch
24-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup} instead.
24+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup.ConnectionFactoryLookup} instead.
2525
*/
2626
@FunctionalInterface
2727
@Deprecated

src/main/java/org/springframework/data/r2dbc/connectionfactory/lookup/ConnectionFactoryLookupFailureException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* {@link io.r2dbc.spi.ConnectionFactory} could not be obtained.
2323
*
2424
* @author Mark Paluch
25-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup} instead.
25+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup.ConnectionFactoryLookupFailureException} instead.
2626
*/
2727
@SuppressWarnings("serial")
2828
@Deprecated

src/main/java/org/springframework/data/r2dbc/connectionfactory/lookup/MapConnectionFactoryLookup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*
3232
* @author Mark Paluch
3333
* @author Jens Schauder
34-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup} instead.
34+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup.MapConnectionFactoryLookup} instead.
3535
*/
3636
@Deprecated
3737
public class MapConnectionFactoryLookup implements ConnectionFactoryLookup {

src/main/java/org/springframework/data/r2dbc/connectionfactory/lookup/SingleConnectionFactoryLookup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* returned for any connection factory name.
2525
*
2626
* @author Mark Paluch
27-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup} instead.
27+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.connection.lookup.SingleConnectionFactoryLookup} instead.
2828
*/
2929
@Deprecated
3030
public class SingleConnectionFactoryLookup implements ConnectionFactoryLookup {

src/main/java/org/springframework/data/r2dbc/core/ExecuteFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Mark Paluch
3333
* @since 1.1
3434
* @see Statement#execute()
35-
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core} support instead.
35+
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core.ExecuteFunction} support instead.
3636
*/
3737
@Deprecated
3838
@FunctionalInterface

src/main/java/org/springframework/data/r2dbc/core/FetchSpec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @author Mark Paluch
2323
* @see RowsFetchSpec
2424
* @see UpdatedRowsFetchSpec
25-
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core} support instead.
25+
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core.FetchSpec} support instead.
2626
*/
2727
@Deprecated
2828
public interface FetchSpec<T> extends RowsFetchSpec<T>, UpdatedRowsFetchSpec {}

src/main/java/org/springframework/data/r2dbc/core/MapBindParameterSource.java

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* {@link NamedParameterExpander} class.
3131
*
3232
* @author Mark Paluch
33+
* @deprecated since 1.2, use Spring's org.springframework.r2dbc.core.MapBindParameterSource support instead.
3334
*/
3435
@Deprecated
3536
class MapBindParameterSource implements BindParameterSource {

src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
* @author Thomas Risberg
4747
* @author Juergen Hoeller
4848
* @author Mark Paluch
49+
* @deprecated since 1.2, use Spring's org.springframework.r2dbc.core.NamedParameterUtils support instead.
4950
*/
5051
@Deprecated
5152
abstract class NamedParameterUtils {

src/main/java/org/springframework/data/r2dbc/core/ParsedSql.java

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*
2626
* @author Thomas Risberg
2727
* @author Juergen Hoeller
28+
* @deprecated since 1.2, use Spring's org.springframework.r2dbc.core.ParsedSql support instead.
2829
*/
2930
@Deprecated
3031
class ParsedSql {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @param <T> underlying operation source.
3030
* @author Mark Paluch
3131
* @see org.springframework.data.r2dbc.core.DatabaseClient#execute(Supplier)
32-
* @deprecated since 1.2, use Spring R2DBC's {@link org.springframework.r2dbc.core} support instead.
32+
* @deprecated since 1.2, use Spring R2DBC's {@link org.springframework.r2dbc.core.PreparedOperation} support instead.
3333
*/
3434
@Deprecated
3535
public interface PreparedOperation<T> extends QueryOperation, org.springframework.r2dbc.core.PreparedOperation<T> {

src/main/java/org/springframework/data/r2dbc/core/QueryOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
* @author Mark Paluch
2525
* @see PreparedOperation
26-
* @deprecated since 1.2, use Spring R2DBC's {@link org.springframework.r2dbc.core} support instead.
26+
* @deprecated since 1.2, use Spring R2DBC's {@link org.springframework.r2dbc.core.QueryOperation} support instead.
2727
*/
2828
@FunctionalInterface
2929
@Deprecated

src/main/java/org/springframework/data/r2dbc/core/RowsFetchSpec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
* @param <T> row result type.
2525
* @author Mark Paluch
26-
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core} support instead.
26+
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core.RowsFetchSpec} support instead.
2727
*/
2828
@Deprecated
2929
public interface RowsFetchSpec<T> {

src/main/java/org/springframework/data/r2dbc/core/SqlProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Juergen Hoeller
2727
* @author Mark Paluch
28-
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core} support instead.
28+
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core.SqlProvider} support instead.
2929
*/
3030
@Deprecated
3131
public interface SqlProvider extends org.springframework.r2dbc.core.SqlProvider {

src/main/java/org/springframework/data/r2dbc/core/StatementFilterFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Mark Paluch
3232
* @since 1.1
3333
* @see ExecuteFunction
34-
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core} support instead.
34+
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core.StatementFilterFunction} support instead.
3535
*/
3636
@Deprecated
3737
@FunctionalInterface

src/main/java/org/springframework/data/r2dbc/core/StatementFilterFunctions.java

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*
2626
* @author Mark Paluch
2727
* @since 1.1
28+
* @deprecated since 1.2, use Spring's org.springframework.r2dbc.core.StatementFilterFunctions support instead.
2829
*/
2930
@Deprecated
3031
enum StatementFilterFunctions implements StatementFilterFunction {

src/main/java/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Contract for fetching the number of affected rows.
2222
*
2323
* @author Mark Paluch
24-
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core} support instead.
24+
* @deprecated since 1.2, use Spring's {@link org.springframework.r2dbc.core.UpdatedRowsFetchSpec} support instead.
2525
*/
2626
@Deprecated
2727
public interface UpdatedRowsFetchSpec {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @see Statement#bind
1111
* @see BindMarkers
1212
* @see BindMarkersFactory
13-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding} instead.
13+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding.BindMarker} instead.
1414
*/
1515
@Deprecated
1616
public interface BindMarker extends org.springframework.r2dbc.core.binding.BindMarker {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @see BindMarker
1313
* @see BindMarkersFactory
1414
* @see io.r2dbc.spi.Statement#bind
15-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding} instead.
15+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding.BindMarkers} instead.
1616
*/
1717
@FunctionalInterface
1818
@Deprecated

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @author Mark Paluch
1616
* @see BindMarkers
1717
* @see io.r2dbc.spi.Statement
18-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding} instead.
18+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding.BindMarkersFactory} instead.
1919
*/
2020
@FunctionalInterface
2121
@Deprecated

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @see PreparedOperation
2525
* @see io.r2dbc.spi.Statement#bind
2626
* @see io.r2dbc.spi.Statement#bindNull
27-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding} instead.
27+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding.BindTarget} instead.
2828
*/
2929
@Deprecated
3030
public interface BindTarget extends org.springframework.r2dbc.core.binding.BindTarget {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* Bindings are typically immutable.
4040
*
4141
* @author Mark Paluch
42-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding} instead.
42+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding.Bindings} instead.
4343
*/
4444
@Deprecated
4545
public class Bindings implements Streamable<Bindings.Binding> {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* {@link BindMarkers}.
2727
*
2828
* @author Mark Paluch
29-
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding} instead.
29+
* @deprecated since 1.2 in favor of Spring R2DBC. Use {@link org.springframework.r2dbc.core.binding.MutableBindings} instead.
3030
*/
3131
@Deprecated
3232
public class MutableBindings extends Bindings {

0 commit comments

Comments
 (0)