Skip to content

Commit d2eb42d

Browse files
odrotbohmmp911de
authored andcommitted
spring-projects#421 - Elevate R2DBC example to top level project.
Moved r2dbc example to a top-level project. Switched to new Spring Data R2DBC project coordinates. Original pull request: spring-projects#422.
1 parent 28dd3d8 commit d2eb42d

File tree

10 files changed

+37
-8
lines changed

10 files changed

+37
-8
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ We have separate folders for the samples of individual modules:
8282

8383
* `basic` - Basic usage of Spring Data JDBC.
8484

85+
## Spring Data R2DBC
86+
87+
* `example` - Basic usage of Spring Data R2DBC.
88+
8589
## Miscellaneous
8690

8791
* `bom` - Example project how to use the Spring Data release train bom in non-Spring-Boot scenarios.

jdbc/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<modules>
2020
<module>basics</module>
2121
<module>mybatis</module>
22-
<module>r2dbc</module>
2322
<module>jooq</module>
2423
</modules>
2524

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<module>mongodb</module>
2727
<module>multi-store</module>
2828
<module>neo4j</module>
29+
<module>r2dbc</module>
2930
<module>rest</module>
3031
<module>redis</module>
3132
<module>solr</module>
File renamed without changes.

r2dbc/example/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>org.springframework.data.examples</groupId>
8+
<artifactId>spring-data-r2dbc-examples</artifactId>
9+
<version>2.0.0.BUILD-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>spring-data-r2dbc-example</artifactId>
13+
14+
<name>Spring Data R2DBC - Example</name>
15+
16+
17+
</project>

jdbc/r2dbc/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java renamed to r2dbc/example/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import reactor.core.publisher.Flux;
1919

20-
import org.springframework.data.jdbc.repository.query.Query;
20+
import org.springframework.data.r2dbc.repository.query.Query;
2121
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
2222

2323
/**

jdbc/r2dbc/pom.xml renamed to r2dbc/pom.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
43
<modelVersion>4.0.0</modelVersion>
54

5+
<artifactId>spring-data-r2dbc-examples</artifactId>
6+
<packaging>pom</packaging>
7+
68
<parent>
79
<groupId>org.springframework.data.examples</groupId>
8-
<artifactId>spring-data-jdbc-examples</artifactId>
10+
<artifactId>spring-data-examples</artifactId>
911
<version>2.0.0.BUILD-SNAPSHOT</version>
1012
</parent>
1113

12-
<artifactId>spring-data-r2dbc</artifactId>
14+
<name>Spring Data R2DBC - Examples</name>
15+
<description>Sample projects for Spring Data R2DBC</description>
1316

14-
<name>Spring Data JDBC - Demonstrating reactive repositories with R2DBC</name>
17+
<inceptionYear>2018</inceptionYear>
18+
19+
<modules>
20+
<module>example</module>
21+
</modules>
1522

1623
<properties>
1724
<reactor-bom.version>Californium-RELEASE</reactor-bom.version>
@@ -21,8 +28,8 @@
2128

2229
<dependency>
2330
<groupId>org.springframework.data</groupId>
24-
<artifactId>spring-data-jdbc</artifactId>
25-
<version>1.0.0.r2dbc-SNAPSHOT</version>
31+
<artifactId>spring-data-r2dbc</artifactId>
32+
<version>1.0.0.BUILD-SNAPSHOT</version>
2633
</dependency>
2734

2835
<dependency>
@@ -61,4 +68,5 @@
6168
</dependency>
6269

6370
</dependencies>
71+
6472
</project>

0 commit comments

Comments
 (0)