spring-data-r2dbc/issue49

rj-hwang · rj-hwang · commit bb877278ae1d · 2019-01-14T00:03:41.000+08:00
spring-projects/spring-data-r2dbc#49
diff --git a/README.md b/README.md
@@ -1,65 +1,12 @@
-# Start R2DBC
+# Start spring-data-r2dbc
 
-For running unit test, need to :
+- Run unit test on H2 : `'mvn test'` or `'mvn test -P h2'`
+- Run unit test on Postgres : `'mvn test -P postgres'`
+- Run unit test on Mssql : `'mvn test -P mssql'`
 
-1. Create a empty postgres database with name 'test' and owner to 'test' with login password 'password'
-2. Run sql script file '[sql/postgres/schema-create.sql]'.
-3. Run 'mvn test'.
+## issues
 
-[sql/postgres/schema-create.sql]: https://github.com/start-java/start-r2dbc/blob/master/src/main/resources/sql/postgres/schema.sql
-
-## 1. [R2DBC]
-
-R2DBC > Reactive Relational Database Connectivity
-
-- [r2dbc-spi](https://github.com/r2dbc/r2dbc-spi)
-- [r2dbc-spi-test](https://github.com/r2dbc/r2dbc-spi/tree/master/r2dbc-spi-test) -  a Technology Compatibility Kit (TCK)
-- [r2dbc-client](https://github.com/r2dbc/r2dbc-client)
-- Drivers：
-    - [r2dbc-h2](https://github.com/r2dbc/r2dbc-h2)
-    - [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql)
-    - [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql)
-    - [r2dbc-over-adba](https://github.com/r2dbc/r2dbc-over-adba)
-- [r2dbc.github.io](https://github.com/r2dbc/r2dbc.github.io)
-- Examples:
-    - [r2dbc-postgresql example](https://github.com/r2dbc/r2dbc-postgresql/blob/master/src/test/java/io/r2dbc/postgresql/PostgresqlExample.java)
-
-## 2. [spring-data-r2dbc]
-
-- [spring-data-r2dbc](https://github.com/spring-projects/spring-data-r2dbc)
-- [spring-data-jdbc/spring-data-relational](https://github.com/spring-projects/spring-data-jdbc/tree/master/spring-data-relational)
-- Examples:
-    - [spring-data-examples/r2dbc](https://github.com/spring-projects/spring-data-examples/tree/master/r2dbc)
-
-## 3. Release Packages
-
-| Date           | Name                      | Version      | Description
-|----------------|---------------------------|--------------|-------------
-| **2018-12-12** | spring-data-r2dbc         | **1.0.0.M1** | [link](https://repo.spring.io/milestone/org/springframework/data/spring-data-r2dbc/1.0.0.M1/)
-| **2018-11-19** | io.r2dbc:r2dbc-spi        | **1.0.0.M6** | ↑ [released](https://r2dbc.io/2018/11/19/r2dbc-1-0-milestone-6-released)
-| 2018-11-19     | io.r2dbc:r2dbc-spi        | 1.0.0.M6     | ↑
-| 2018-11-19     | io.r2dbc:r2dbc-client     | 1.0.0.M6     | ↑
-| 2018-11-19     | io.r2dbc:r2dbc-postgresql | 1.0.0.M6     | ↑
-| 2018-11-19     | io.r2dbc:r2dbc-h2         | 1.0.0.M6     | + new driver
-| 2018-11-19     | io.r2dbc:r2dbc-mssql      | 1.0.0.M6     | + new driver
-| **2018-09-24** | io.r2dbc:r2dbc-spi        | **1.0.0.M5** | ↑
-| 2018-09-24     | io.r2dbc:r2dbc-client     | 1.0.0.M5     | ↑
-| 2018-09-24     | io.r2dbc:r2dbc-postgresql | 1.0.0.M5     | ↑
-
-## 4. Maven Repositories
-
-- <https://repo.spring.io/milestone/io/r2dbc>
-- <https://repo.spring.io/milestone/org/springframework/data>
-- <https://repo.spring.io/snapshot/org/springframework/data/spring-data-r2dbc>
-- <https://repo.spring.io/snapshot/org/springframework/data/spring-data-jdbc>
-
-## 5. Ref
-
-- 2018-12-19 spring blog : [Spring Tips: Reactive SQL Data Access with Spring Data R2DBC](https://spring.io/blog/2018/12/19/spring-tips-reactive-sql-data-access-with-spring-data-r2dbc)
-- 2018-12-12 spring blog : [Spring Data R2DBC 1.0 M1 released](https://spring.io/blog/2018/12/12/spring-data-r2dbc-1-0-m1-released)
-- 2018-10-01 infoQ : [Experimental Reactive Relational Database Connectivity Driver, R2DBC, Announced at SpringOne](https://www.infoq.com/news/2018/10/springone-r2dbc)
-- 2018-09-27 spring blog : [The Reactive Revolution at SpringOne Platform 2018 (part 1/N)](https://spring.io/blog/2018/09/27/the-reactive-revolution-at-springone-platform-2018-part-1-n)
-- spring-guides : [Accessing Relational Data using JDBC with Spring](https://spring.io/guides/gs/relational-data-access/)
+- [spring-data-r2dbc/issue49](https://github.com/spring-projects/spring-data-r2dbc/issues/49)
 
 
 [R2DBC]: https://r2dbc.io
diff --git a/pom.xml b/pom.xml
@@ -32,9 +32,9 @@
     <mockito.version>2.23.4</mockito.version>
 
     <!-- database -->
-    <db.database>test</db.database>
+    <db.name>test_r2dbc</db.name>
     <db.host>localhost</db.host>
-    <db.user>test</db.user>
+    <db.username>test</db.username>
     <db.password>password</db.password>
   </properties>
   <dependencyManagement>
@@ -64,6 +64,12 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
+    <dependency>
+      <groupId>tech.simter</groupId>
+      <artifactId>simter-r2dbc-ext</artifactId>
+      <version>1.1.1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-r2dbc</artifactId>
@@ -184,68 +190,80 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.22.1</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <delimiters>
+            <!-- make yml file support maven properties (by @...@)-->
+            <delimiter>@</delimiter>
+          </delimiters>
+          <useDefaultDelimiters>false</useDefaultDelimiters>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <profiles>
     <!-- database -->
     <profile>
-      <id>postgres</id>
+      <id>h2</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
+      <properties>
+        <db.platform>h2</db.platform>
+        <db.port>~</db.port>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>io.r2dbc</groupId>
-          <artifactId>r2dbc-postgresql</artifactId>
+          <artifactId>r2dbc-h2</artifactId>
           <version>${r2dbc.version}</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
-          <groupId>org.postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-          <version>42.2.5</version>
+          <groupId>com.h2database</groupId>
+          <artifactId>h2</artifactId>
+          <version>1.4.197</version>
           <scope>runtime</scope>
         </dependency>
       </dependencies>
     </profile>
     <profile>
-      <id>h2</id>
+      <id>postgres</id>
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
+      <properties>
+        <db.platform>postgres</db.platform>
+        <db.port>5432</db.port>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>io.r2dbc</groupId>
-          <artifactId>r2dbc-h2</artifactId>
+          <artifactId>r2dbc-postgresql</artifactId>
           <version>${r2dbc.version}</version>
           <scope>runtime</scope>
         </dependency>
-        <dependency>
-          <groupId>com.h2database</groupId>
-          <artifactId>h2</artifactId>
-          <version>1.4.197</version>
-          <scope>runtime</scope>
-        </dependency>
       </dependencies>
     </profile>
     <profile>
       <id>mssql</id>
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
+      <properties>
+        <db.platform>mssql</db.platform>
+        <db.port>1234</db.port>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>io.r2dbc</groupId>
           <artifactId>r2dbc-mssql</artifactId>
           <version>${r2dbc.version}</version>
           <scope>runtime</scope>
         </dependency>
-        <dependency>
-          <groupId>com.microsoft.sqlserver</groupId>
-          <artifactId>mssql-jdbc</artifactId>
-          <version>7.1.3.jre8-preview</version>
-          <scope>runtime</scope>
-        </dependency>
       </dependencies>
     </profile>
   </profiles>
diff --git a/src/main/java/tech/simter/start/springdatar2dbc/People.java b/src/main/java/tech/simter/start/springdatar2dbc/People.java
@@ -0,0 +1,20 @@
+package tech.simter.start.springdatar2dbc;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+/**
+ * @author RJ
+ */
+@Table("people")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class People {
+  @Id
+  private String id;
+  private String name;
+}
diff --git a/src/main/java/tech/simter/start/springdatar2dbc/PeopleRepository.java b/src/main/java/tech/simter/start/springdatar2dbc/PeopleRepository.java
@@ -0,0 +1,9 @@
+package tech.simter.start.springdatar2dbc;
+
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+
+/**
+ * @author RJ
+ */
+public interface PeopleRepository extends ReactiveCrudRepository<People, String> {
+}
diff --git a/src/main/resources/sql/h2/schema.sql b/src/main/resources/sql/h2/schema.sql
@@ -0,0 +1,5 @@
+drop table if exists people;
+create table people (
+  id   varchar(36) primary key,
+  name varchar(50) not null
+);
diff --git a/src/main/resources/sql/postgres/schema.sql b/src/main/resources/sql/postgres/schema.sql
@@ -1,6 +1,5 @@
-drop table if exists dream;
-create table dream (
-  id        int primary key,
-  name      varchar(50) not null,
-  create_on timestamp
+drop table if exists people;
+create table people (
+  id   varchar(36) primary key,
+  name varchar(50) not null
 );
diff --git a/src/test/java/tech/simter/start/springdatar2dbc/UnitTestConfiguration.java b/src/test/java/tech/simter/start/springdatar2dbc/UnitTestConfiguration.java
@@ -0,0 +1,31 @@
+package tech.simter.start.springdatar2dbc;
+
+import io.r2dbc.spi.ConnectionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
+import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
+import tech.simter.r2dbc.R2dbcConfiguration;
+
+/**
+ * @author RJ
+ */
+@Configuration
+@EnableR2dbcRepositories
+@EnableConfigurationProperties    // for tech.simter.r2dbc.R2dbcProperties
+@Import(R2dbcConfiguration.class) // auto generate connectionFactory bean by maven dependency (from simter-r2dbc-ext)
+public class UnitTestConfiguration extends AbstractR2dbcConfiguration {
+  private final ConnectionFactory connectionFactory;
+
+  @Autowired
+  public UnitTestConfiguration(ConnectionFactory connectionFactory) {
+    this.connectionFactory = connectionFactory;
+  }
+
+  @Override
+  public ConnectionFactory connectionFactory() {
+    return this.connectionFactory;
+  }
+}
diff --git a/src/test/java/tech/simter/start/springdatar2dbc/issue49/SaveMethodImplTest.java b/src/test/java/tech/simter/start/springdatar2dbc/issue49/SaveMethodImplTest.java
@@ -0,0 +1,45 @@
+package tech.simter.start.springdatar2dbc.issue49;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.test.StepVerifier;
+import tech.simter.start.springdatar2dbc.People;
+import tech.simter.start.springdatar2dbc.PeopleRepository;
+import tech.simter.start.springdatar2dbc.UnitTestConfiguration;
+
+import java.util.UUID;
+
+/**
+ * @author RJ
+ */
+@SpringBootTest(classes = UnitTestConfiguration.class)
+@ExtendWith(SpringExtension.class)
+class SaveMethodImplTest {
+  @Autowired
+  private PeopleRepository repository;
+
+  @BeforeEach
+  void clean() {
+    StepVerifier.create(repository.deleteAll()).verifyComplete();
+  }
+
+  @Test
+  void test() {
+    // save it
+    People po = new People();
+    po.setId(UUID.randomUUID().toString());
+    po.setName("simter");
+    StepVerifier.create(repository.save(po))
+      .expectNext(po)
+      .verifyComplete();
+
+    // verify saved
+    StepVerifier.create(repository.findById(po.getId()))
+      .expectNext(po)
+      .verifyComplete();
+  }
+}
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -1,17 +1,29 @@
 spring:
   main:
-    banner-mode: 'OFF'
+    banner-mode: 'off'
+  datasource:
+    initialization-mode: always # embedded|always|never
+    url: ./target/@db.name@   # for h2
+    name: @db.name@           # database-name for postgres, mssql
+    port: @db.port@
+    username: @db.username@
+    password: @db.password@
+    schema: # available when initialization-mode=always
+      - classpath:sql/@db.platform@/schema.sql
 logging:
   #file: target/test.log
   level: # one of TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
     root: ERROR
-    tech.simter.start.java.r2dbc: WARN
+    #---- simter ----#
+    tech.simter.r2dbc: DEBUG
+    tech.simter.start.r2dbc: DEBUG
 
     #org.springframework: WARN
     #org.springframework.boot: WARN
 
     #---- r2dbc ----#
     io.r2dbc: WARN
-    io.r2dbc.postgresql.client.ReactorNettyClient: WARN # debug to show postgres request and Response
+    io.r2dbc.h2.client.SessionClient: DEBUG # DEBUG to show h2 request and Response
+    io.r2dbc.postgresql.client.ReactorNettyClient: DEBUG # DEBUG to show postgres request and Response
     org.springframework.data.r2dbc: WARN
-    org.springframework.data.r2dbc.function.DefaultDatabaseClient: DEBUG # debug to show sql
+    org.springframework.data.r2dbc.function.DefaultDatabaseClient: DEBUG # DEBUG to show sql
