spring-data-r2dbc/issue49

spring-projects/spring-data-r2dbc#49

Author: rj-hwang

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>

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;
+}

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> {
+}

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
+);

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
 );

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;
+  }
+}

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();
+  }
+}

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