Skip to content

Commit ee6c2c8

Browse files
mp911demp911de
committed
Upgrade to R2DBC 1.0.
Removed SQL Server and MariaDB tests for the time being until drivers are available. Closes #1292
1 parent 1467d63 commit ee6c2c8

10 files changed

+22
-421
lines changed

‎spring-data-r2dbc/pom.xml

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828
<degraph-check.version>0.1.4</degraph-check.version>
2929
<postgresql.version>42.4.0</postgresql.version>
30-
<mysql.version>8.0.29</mysql.version>
31-
<r2dbc-spi-test.version>0.9.1.RELEASE</r2dbc-spi-test.version>
32-
<mariadb-jdbc.version>2.5.4</mariadb-jdbc.version>
33-
<r2dbc-releasetrain.version>Borca-SR1</r2dbc-releasetrain.version>
34-
<reactive-streams.version>1.0.3</reactive-streams.version>
35-
<netty>4.1.75.Final</netty>
30+
<r2dbc-postgresql.version>1.0.0.RC1</r2dbc-postgresql.version>
31+
<r2dbc-h2.version>1.0.0.RC1</r2dbc-h2.version>
32+
<oracle-r2dbc.version>1.0.0</oracle-r2dbc.version>
33+
<r2dbc-spi.version>1.0.0.RELEASE</r2dbc-spi.version>
34+
<reactive-streams.version>1.0.4</reactive-streams.version>
35+
<netty>4.1.79.Final</netty>
3636
</properties>
3737

3838
<inceptionYear>2018</inceptionYear>
@@ -64,13 +64,6 @@
6464

6565
<dependencyManagement>
6666
<dependencies>
67-
<dependency>
68-
<groupId>io.r2dbc</groupId>
69-
<artifactId>r2dbc-bom</artifactId>
70-
<version>${r2dbc-releasetrain.version}</version>
71-
<type>pom</type>
72-
<scope>import</scope>
73-
</dependency>
7467
<dependency>
7568
<groupId>org.testcontainers</groupId>
7669
<artifactId>testcontainers-bom</artifactId>
@@ -135,6 +128,7 @@
135128
<dependency>
136129
<groupId>io.r2dbc</groupId>
137130
<artifactId>r2dbc-spi</artifactId>
131+
<version>${r2dbc-spi.version}</version>
138132
</dependency>
139133

140134
<dependency>
@@ -189,20 +183,6 @@
189183
<scope>test</scope>
190184
</dependency>
191185

192-
<dependency>
193-
<groupId>mysql</groupId>
194-
<artifactId>mysql-connector-java</artifactId>
195-
<version>${mysql.version}</version>
196-
<scope>test</scope>
197-
</dependency>
198-
199-
<dependency>
200-
<groupId>org.mariadb.jdbc</groupId>
201-
<artifactId>mariadb-java-client</artifactId>
202-
<version>${mariadb-jdbc.version}</version>
203-
<scope>test</scope>
204-
</dependency>
205-
206186
<dependency>
207187
<groupId>com.microsoft.sqlserver</groupId>
208188
<artifactId>mssql-jdbc</artifactId>
@@ -213,7 +193,7 @@
213193
<dependency>
214194
<groupId>com.oracle.database.jdbc</groupId>
215195
<artifactId>ojdbc11</artifactId>
216-
<version>21.6.0.0.1</version>
196+
<version>21.5.0.0</version>
217197
<scope>test</scope>
218198
</dependency>
219199

@@ -222,38 +202,28 @@
222202
<dependency>
223203
<groupId>org.postgresql</groupId>
224204
<artifactId>r2dbc-postgresql</artifactId>
205+
<version>${r2dbc-postgresql.version}</version>
225206
<optional>true</optional>
226207
</dependency>
227208

228209
<dependency>
229210
<groupId>io.r2dbc</groupId>
230211
<artifactId>r2dbc-h2</artifactId>
231-
<scope>test</scope>
232-
</dependency>
233-
234-
<dependency>
235-
<groupId>io.r2dbc</groupId>
236-
<artifactId>r2dbc-mssql</artifactId>
237-
<scope>test</scope>
238-
</dependency>
239-
240-
<dependency>
241-
<groupId>org.mariadb</groupId>
242-
<artifactId>r2dbc-mariadb</artifactId>
212+
<version>${r2dbc-h2.version}</version>
243213
<scope>test</scope>
244214
</dependency>
245215

246216
<dependency>
247217
<groupId>com.oracle.database.r2dbc</groupId>
248218
<artifactId>oracle-r2dbc</artifactId>
249-
<version>0.4.0</version>
219+
<version>${oracle-r2dbc.version}</version>
250220
<scope>test</scope>
251221
</dependency>
252222

253223
<dependency>
254224
<groupId>io.r2dbc</groupId>
255225
<artifactId>r2dbc-spi-test</artifactId>
256-
<version>${r2dbc-spi-test.version}</version>
226+
<version>${r2dbc-spi.version}</version>
257227
<scope>test</scope>
258228
</dependency>
259229

‎spring-data-r2dbc/src/main/asciidoc/preface.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ While the open source ecosystem hosts various non-blocking relational database d
4848
[[get-started:first-steps:reactive]]
4949
== What is Reactive?
5050

51-
The term, "`reactive`", refers to programming models that are built around reacting to change, availability, and processability -— network components reacting to I/O events, UI controllers reacting to mouse events, resources being made available, and others.
51+
The term, "`reactive`", refers to programming models that are built around reacting to change, availability, and processability-network components reacting to I/O events, UI controllers reacting to mouse events, resources being made available, and others.
5252
In that sense, non-blocking is reactive, because, instead of being blocked, we are now in the mode of reacting to notifications as operations complete or data becomes available.
5353

5454
There is also another important mechanism that we on the Spring team associate with reactive, and that is non-blocking back pressure.
@@ -62,7 +62,7 @@ The main purpose of Reactive Streams is to let the subscriber control how quickl
6262
[[get-started:first-steps:reactive-api]]
6363
== Reactive API
6464

65-
Reactive Streams plays an important role for interoperability. It is of interest to libraries and infrastructure components but less useful as an application API, because it is too low-level.
65+
Reactive Streams plays an important role for interoperability.It is of interest to libraries and infrastructure components but less useful as an application API, because it is too low-level.
6666
Applications need a higher-level and richer, functional API to compose async logic —- similar to the Java 8 Stream API but not only for tables.
6767
This is the role that reactive libraries play.
6868

@@ -79,9 +79,9 @@ Whenever feasible, Spring Data adapts transparently to the use of RxJava or anot
7979
[[requirements]]
8080
== Requirements
8181

82-
The Spring Data R2DBC 1.x binaries require:
82+
The Spring Data R2DBC 3.x binaries require:
8383

84-
* JDK level 8.0 and above
84+
* JDK level 17 and above
8585
* https://spring.io/docs[Spring Framework] {springVersion} and above
8686
* https://r2dbc.io[R2DBC] {r2dbcVersion} and above
8787

@@ -97,7 +97,7 @@ Community Forum :: Spring Data on https://stackoverflow.com/questions/tagged/spr
9797
Note that registration is needed only for posting.
9898

9999
[[get-started:help:professional]]
100-
Professional Support :: Professional, from-the-source support, with guaranteed response time, is available from https://pivotal.io/[Pivotal Sofware, Inc.], the company behind Spring Data and Spring.
100+
Professional Support :: Professional, from-the-source support, with guaranteed response time, is available from https://pivotal.io/[Pivotal Software, Inc.], the company behind Spring Data and Spring.
101101

102102
[[get-started:up-to-date]]
103103
== Following Development

‎spring-data-r2dbc/src/main/asciidoc/reference/r2dbc-core.adoc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@ To do so:
2020
====
2121
[source,xml,subs="+attributes"]
2222
----
23-
<dependencyManagement>
24-
<dependencies>
25-
<dependency>
26-
<groupId>io.r2dbc</groupId>
27-
<artifactId>r2dbc-bom</artifactId>
28-
<version>${r2dbc-releasetrain.version}</version>
29-
<type>pom</type>
30-
<scope>import</scope>
31-
</dependency>
32-
</dependencies>
33-
</dependencyManagement>
34-
3523
<dependencies>
3624
3725
<!-- other dependency elements omitted -->
@@ -46,7 +34,7 @@ To do so:
4634
<dependency>
4735
<groupId>io.r2dbc</groupId>
4836
<artifactId>r2dbc-h2</artifactId>
49-
<version>{r2dbcVersion}</version>
37+
<version>x.y.z</version>
5038
</dependency>
5139
5240
</dependencies>
@@ -188,7 +176,6 @@ Spring Data R2DBC ships with dialect implementations for the following drivers:
188176
* https://github.com/r2dbc/r2dbc-h2[H2] (`io.r2dbc:r2dbc-h2`)
189177
* https://github.com/mariadb-corporation/mariadb-connector-r2dbc[MariaDB] (`org.mariadb:r2dbc-mariadb`)
190178
* https://github.com/r2dbc/r2dbc-mssql[Microsoft SQL Server] (`io.r2dbc:r2dbc-mssql`)
191-
* https://github.com/mirromutth/r2dbc-mysql[MySQL] (`dev.miku:r2dbc-mysql`)
192179
* https://github.com/jasync-sql/jasync-sql[jasync-sql MySQL] (`com.github.jasync-sql:jasync-r2dbc-mysql`)
193180
* https://github.com/r2dbc/r2dbc-postgresql[Postgres] (`io.r2dbc:r2dbc-postgresql`)
194181
* https://github.com/oracle/oracle-r2dbc[Oracle] (`com.oracle.database.r2dbc:oracle-r2dbc`)

‎spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/SqlServerReactiveDataAccessStrategyTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.data.r2dbc.core;
1717

18-
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
19-
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
2018
import org.springframework.data.r2dbc.dialect.SqlServerDialect;
2119

2220
/**

‎spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/dialect/DialectResolverUnitTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import io.r2dbc.h2.H2ConnectionConfiguration;
66
import io.r2dbc.h2.H2ConnectionFactory;
7-
import io.r2dbc.mssql.MssqlConnectionConfiguration;
8-
import io.r2dbc.mssql.MssqlConnectionFactory;
97
import io.r2dbc.postgresql.PostgresqlConnectionConfiguration;
108
import io.r2dbc.postgresql.PostgresqlConnectionFactory;
119
import io.r2dbc.spi.Connection;
@@ -36,12 +34,9 @@ void shouldResolveDatabaseType() {
3634

3735
PostgresqlConnectionFactory postgres = new PostgresqlConnectionFactory(PostgresqlConnectionConfiguration.builder()
3836
.host("localhost").database("foo").username("bar").password("password").build());
39-
MssqlConnectionFactory mssql = new MssqlConnectionFactory(MssqlConnectionConfiguration.builder().host("localhost")
40-
.database("foo").username("bar").password("password").build());
4137
H2ConnectionFactory h2 = new H2ConnectionFactory(H2ConnectionConfiguration.builder().inMemory("mem").build());
4238

4339
assertThat(DialectResolver.getDialect(postgres)).isEqualTo(PostgresDialect.INSTANCE);
44-
assertThat(DialectResolver.getDialect(mssql)).isEqualTo(SqlServerDialect.INSTANCE);
4540
assertThat(DialectResolver.getDialect(h2)).isEqualTo(H2Dialect.INSTANCE);
4641
}
4742

‎spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/MariaDbR2dbcRepositoryIntegrationTests.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)