Apply spring data jdbc 2.1.0-RC2 features

mhyeon-lee · Myeonghyeon-Lee · commit 3d53eee07daf · 2020-10-15T20:52:19.000+09:00
spring-projects/spring-data-relational@9cd8fc1 spring-projects/spring-data-relational@c356a8c
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ buildscript {
 
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
-    implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.4.0-RC1")
+    implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.4.0-RC2")
 }
 ```
 
@@ -44,7 +44,7 @@ dependencies {
 <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.4.0-RC1</version>
+    <version>2.4.0-RC2</version>
     <relativePath/>
 </parent>
 
@@ -56,7 +56,7 @@ dependencies {
 <dependency>
     <groupId>com.navercorp.spring</groupId>
     <artifactId>spring-boot-starter-data-jdbc-plus-sql</artifactId>
-    <version>2.4.0-RC1</version>
+    <version>2.4.0-RC2</version>
 </dependency>
 ```
 
diff --git a/guide-projects/plus-repository-guide/build.gradle b/guide-projects/plus-repository-guide/build.gradle
@@ -5,9 +5,9 @@ dependencies {
     implementation("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude group: "org.junit.vintage", module: "junit-vintage-engine"
diff --git a/guide-projects/plus-sql-java-groovy-guide/build.gradle b/guide-projects/plus-sql-java-groovy-guide/build.gradle
@@ -39,15 +39,15 @@ dependencies {
     implementation("org.codehaus.groovy:groovy:2.5.8")
     implementation("com.h2database:h2")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
 
     implementation project(":spring-data-plus-sql-gen")
     annotationProcessor project(":spring-data-plus-sql-gen")
-    annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-RC2")
 
     compileOnly("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
diff --git a/guide-projects/plus-sql-java-groovy-guide/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/guide/board/Board.java b/guide-projects/plus-sql-java-groovy-guide/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/guide/board/Board.java
@@ -26,6 +26,7 @@
 import java.util.Set;
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Embedded;
 import org.springframework.data.relational.core.mapping.MappedCollection;
@@ -117,6 +118,19 @@ public static class Tag {
 		Long id;
 
 		String content;
+
+		@Transient
+		String description;
+
+		public Tag(
+			Long id,
+			String content,
+			@org.springframework.beans.factory.annotation.Value("#root.content") String description
+		) {
+			this.id = id;
+			this.content = content;
+			this.description = description;
+		}
 	}
 
 	@Table("n_comment")
diff --git a/guide-projects/plus-sql-java-groovy-guide/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/guide/board/BoardRepositoryTest.java b/guide-projects/plus-sql-java-groovy-guide/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/guide/board/BoardRepositoryTest.java
@@ -584,6 +584,7 @@ private void assertEquals(Post actualPost, Post targetPost) {
 		for (int i = 0; i < actualTags.size(); i++) {
 			assertThat(actualTags.get(i).getId()).isEqualTo(postTags.get(i).getId());
 			assertThat(actualTags.get(i).getContent()).isEqualTo(postTags.get(i).getContent());
+			assertThat(actualTags.get(i).getContent()).isEqualTo(actualTags.get(i).getDescription());
 		}
 
 		List<Comment> actualComments = actualPost.getComments();
diff --git a/guide-projects/plus-sql-java-kotlin-guide/build.gradle b/guide-projects/plus-sql-java-kotlin-guide/build.gradle
@@ -37,9 +37,9 @@ dependencies {
     implementation("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude group: "org.junit.vintage", module: "junit-vintage-engine"
diff --git a/guide-projects/plus-sql-kotlin-guide/build.gradle.kts b/guide-projects/plus-sql-kotlin-guide/build.gradle.kts
@@ -27,9 +27,9 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("com.h2database:h2")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
diff --git a/spring-boot-autoconfigure-data-jdbc-plus/build.gradle b/spring-boot-autoconfigure-data-jdbc-plus/build.gradle
@@ -5,9 +5,9 @@ dependencies {
     implementation project(":spring-data-jdbc-plus-sql")
     implementation project(":spring-data-jdbc-plus-repository")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
     implementation("io.projectreactor:reactor-core")
 
     testImplementation("org.junit.jupiter:junit-jupiter")
diff --git a/spring-boot-starter-data-jdbc-plus-repository/build.gradle b/spring-boot-starter-data-jdbc-plus-repository/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     compile(project(":spring-data-jdbc-plus-repository"))
     compile("org.springframework.boot:spring-boot-starter-jdbc")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
 }
diff --git a/spring-boot-starter-data-jdbc-plus-sql/build.gradle b/spring-boot-starter-data-jdbc-plus-sql/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     compile(project(":spring-data-jdbc-plus-sql"))
     compile("org.springframework.boot:spring-boot-starter-jdbc")
 
-    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    implementation("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
 }
diff --git a/spring-data-jdbc-plus-repository/build.gradle b/spring-data-jdbc-plus-repository/build.gradle
@@ -1,9 +1,9 @@
 compileJava.dependsOn(processResources)
 
 dependencies {
-    compile("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    compile("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    compile("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    compile("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    compile("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    compile("org.springframework.data:spring-data-commons:2.4.0-RC2")
 
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/spring-data-jdbc-plus-repository/src/main/java/com/navercorp/spring/data/jdbc/plus/repository/support/JdbcPlusRepositoryFactoryBean.java b/spring-data-jdbc-plus-repository/src/main/java/com/navercorp/spring/data/jdbc/plus/repository/support/JdbcPlusRepositoryFactoryBean.java
@@ -96,6 +96,7 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() {
 			dataAccessStrategy, mappingContext, converter, dialect, publisher, operations);
 		jdbcRepositoryFactory.setQueryMappingConfiguration(queryMappingConfiguration);
 		jdbcRepositoryFactory.setEntityCallbacks(entityCallbacks);
+		jdbcRepositoryFactory.setBeanFactory(beanFactory);
 
 		return jdbcRepositoryFactory;
 	}
diff --git a/spring-data-jdbc-plus-sql/build.gradle b/spring-data-jdbc-plus-sql/build.gradle
@@ -2,9 +2,9 @@ compileJava.dependsOn(processResources)
 
 dependencies {
     compile project(":spring-jdbc-plus-support")
-    compile("org.springframework.data:spring-data-jdbc:2.1.0-RC1")
-    compile("org.springframework.data:spring-data-relational:2.1.0-RC1")
-    compile("org.springframework.data:spring-data-commons:2.4.0-RC1")
+    compile("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
+    compile("org.springframework.data:spring-data-relational:2.1.0-RC2")
+    compile("org.springframework.data:spring-data-commons:2.4.0-RC2")
     compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
     compileOnly("org.jetbrains.kotlin:kotlin-reflect:1.3.72")
     compileOnly("io.projectreactor:reactor-core")
diff --git a/spring-data-jdbc-plus-sql/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/convert/AggregateResultJdbcConverter.java b/spring-data-jdbc-plus-sql/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/convert/AggregateResultJdbcConverter.java
diff --git a/spring-data-jdbc-plus-sql/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/convert/ResultMapPropertyAccessor.java b/spring-data-jdbc-plus-sql/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/convert/ResultMapPropertyAccessor.java
diff --git a/spring-data-plus-sql-gen/build.gradle b/spring-data-plus-sql-gen/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,7 @@ private void assertEquals(Post actualPost, Post targetPost) {`
`584`	`584`	`for (int i = 0; i < actualTags.size(); i++) {`
`585`	`585`	`assertThat(actualTags.get(i).getId()).isEqualTo(postTags.get(i).getId());`
`586`	`586`	`assertThat(actualTags.get(i).getContent()).isEqualTo(postTags.get(i).getContent());`
	`587`	`+ assertThat(actualTags.get(i).getContent()).isEqualTo(actualTags.get(i).getDescription());`
`587`	`588`	`}`
`588`	`589`
`589`	`590`	`List<Comment> actualComments = actualPost.getComments();`