Add hints for PostgreSQL R2DBC connector

- Refactor the data-r2dbc sample to work with H2 and PostgreSQL

Closes gh-1626

Author: mhalbritter

samples/data-r2dbc/build-single-profile.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+clean_up () {
+    ARG=$?
+    docker-compose down --volumes
+    exit $ARG
+}
+trap clean_up EXIT
+
+docker-compose up -d --renew-anon-volumes
+
+export SPRING_PROFILES_ACTIVE=h2
+echo "Testing with $SPRING_PROFILES_ACTIVE profile"
+${PWD%/*samples/*}/scripts/compileWithMaven.sh $* &&  ${PWD%/*samples/*}/scripts/test.sh $*

samples/data-r2dbc/build.sh

@@ -1,3 +1,20 @@
 #!/usr/bin/env bash
 
-${PWD%/*samples/*}/scripts/compileWithMaven.sh $* &&  ${PWD%/*samples/*}/scripts/test.sh $*
+set -e
+
+clean_up () {
+    ARG=$?
+    docker-compose down --volumes
+    exit $ARG
+}
+trap clean_up EXIT
+
+docker-compose up -d --renew-anon-volumes
+
+export SPRING_PROFILES_ACTIVE=h2
+echo "Testing with $SPRING_PROFILES_ACTIVE profile"
+${PWD%/*samples/*}/scripts/compileWithMaven.sh $* &&  ${PWD%/*samples/*}/scripts/test.sh $*
+
+echo "Testing with $SPRING_PROFILES_ACTIVE profile"
+export SPRING_PROFILES_ACTIVE=postgresql
+${PWD%/*samples/*}/scripts/compileWithMaven.sh $* &&  ${PWD%/*samples/*}/scripts/test.sh $*

samples/data-r2dbc/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.1'
+services:
+  postgresql:
+    image: 'postgres:14'
+    environment:
+      POSTGRES_USER: 'postgres'
+      POSTGRES_PASSWORD: 'postgres'
+      POSTGRES_DB: 'spring-native'
+    ports:
+      - '5432:5432'

samples/data-r2dbc/pom.xml

@@ -29,11 +29,12 @@
 		<dependency>
 			<groupId>io.r2dbc</groupId>
 			<artifactId>r2dbc-h2</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<groupId>org.postgresql</groupId>
+			<artifactId>r2dbc-postgresql</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 

samples/data-r2dbc/src/main/java/com/example/webflux/WebfluxApplication.java renamed to samples/data-r2dbc/src/main/java/com/example/r2dbc/R2DBCApplication.java

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.example.webflux;
+package com.example.r2dbc;
+
+import reactor.core.publisher.Mono;
 
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
@@ -24,14 +26,13 @@
 import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
 
-import static org.springframework.web.reactive.function.server.RouterFunctions.*;
-import static org.springframework.web.reactive.function.server.ServerResponse.*;
+import static org.springframework.web.reactive.function.server.RouterFunctions.route;
+import static org.springframework.web.reactive.function.server.ServerResponse.ok;
 
 @SpringBootApplication
 @EnableR2dbcAuditing(auditorAwareRef = "fixedAuditor")
-public class WebfluxApplication {
+public class R2DBCApplication {
 
 	@Bean
 	RouterFunction<ServerResponse> routes(ReservationRepository reservationRepository) {
@@ -51,6 +52,6 @@ ReactiveAuditorAware<String> fixedAuditor() {
 	}
 
 	public static void main(String[] args) {
-		SpringApplication.run(WebfluxApplication.class, args);
+		SpringApplication.run(R2DBCApplication.class, args);
 	}
 }

samples/data-r2dbc/src/main/java/com/example/webflux/Reservation.java renamed to samples/data-r2dbc/src/main/java/com/example/r2dbc/Reservation.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.example.webflux;
+package com.example.r2dbc;
+
+import java.time.Instant;
 
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 
-import java.time.Instant;
-
 public class Reservation {
 
 	@Id

samples/data-r2dbc/src/main/java/com/example/webflux/ReservationRepository.java renamed to samples/data-r2dbc/src/main/java/com/example/r2dbc/ReservationRepository.java

@@ -1,6 +1,6 @@
-package com.example.webflux;
+package com.example.r2dbc;
 
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 
 interface ReservationRepository extends ReactiveCrudRepository<Reservation, Integer> {
-}
+}

samples/data-r2dbc/src/main/resources/application-postgresql.properties

@@ -0,0 +1,3 @@
+spring.r2dbc.url=r2dbc:postgres://localhost/spring-native
+spring.r2dbc.username=postgres
+spring.r2dbc.password=postgres

samples/data-r2dbc/src/main/resources/application.properties

@@ -1,6 +1,5 @@
-#spring.r2dbc.url=r2dbc:postgres://localhost/orders
-#spring.r2dbc.username=orders
-#spring.r2dbc.password=orders
-#spring.jpa.generate-ddl=true
 spring.data.r2dbc.repositories.enable=true
-#spring.datasource.driver-class-name=org.postgresql.Driver
+spring.sql.init.mode=always
+spring.r2dbc.url=r2dbc:h2:mem:///spring-native;DB_CLOSE_DELAY=-1
+spring.r2dbc.username=h2
+spring.r2dbc.password=h2

samples/data-r2dbc/src/main/resources/data.sql

@@ -1,2 +1,2 @@
 INSERT INTO reservation(name) VALUES ('Andy');
-INSERT INTO reservation(name) VALUES ('Sebastien');
+INSERT INTO reservation(name) VALUES ('Sebastien');