chore: clean boot-data-couchbase

boot-data-couchbase/pom.xml

@@ -20,7 +20,7 @@
 
     <properties>
         <java.version>17</java.version>
-		<testcontainers.version>1.17.1</testcontainers.version>
+		<testcontainers.version>1.17.2</testcontainers.version>
         <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
     </properties>
 

boot-data-couchbase/src/main/java/com/example/demo/DemoApplication.java

@@ -36,18 +36,20 @@ public static void main(String[] args) {
         SpringApplication.run(DemoApplication.class, args);
     }
 
+}
+
+@Configuration
+class WebConfig {
     @Bean
-    public RouterFunction<ServerResponse> routes(PostHandler postController) {
-        return route(GET("/posts"), postController::all)
-                .andRoute(POST("/posts"), postController::create)
-                .andRoute(GET("/posts/{id}"), postController::get)
-                .andRoute(PUT("/posts/{id}"), postController::update)
-                .andRoute(DELETE("/posts/{id}"), postController::delete);
+    public RouterFunction<ServerResponse> routes(PostHandler handler) {
+        return route(GET("/posts"), handler::all)
+                .andRoute(POST("/posts"), handler::create)
+                .andRoute(GET("/posts/{id}"), handler::get)
+                .andRoute(PUT("/posts/{id}"), handler::update)
+                .andRoute(DELETE("/posts/{id}"), handler::delete);
     }
-
 }
 
-
 @Configuration(proxyBeanMethods = false)
 // see: https://jira.spring.io/browse/DATACOUCH-644
 @EnableReactiveCouchbaseAuditing
@@ -94,14 +96,10 @@ public void run(String[] args) {
 }
 
 @Component
+@RequiredArgsConstructor
 class PostHandler {
-
     private final PostRepository posts;
 
-    public PostHandler(PostRepository posts) {
-        this.posts = posts;
-    }
-
     public Mono<ServerResponse> all(ServerRequest req) {
         return ServerResponse.ok().body(this.posts.findAll(), Post.class);
     }
@@ -153,7 +151,6 @@ interface PostRepository extends ReactiveCouchbaseRepository<Post, String> {
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-
 class Post {
 
     @Id

boot-data-couchbase/src/test/java/com/example/demo/PostRepositoryWithDynamicPropertiesTest.java

@@ -1,10 +1,13 @@
 package com.example.demo;
 
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.autoconfigure.data.couchbase.DataCouchbaseTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.domain.Sort;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
@@ -18,14 +21,22 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest
+@DataCouchbaseTest
 @Testcontainers
 @ActiveProfiles("test")
 @Slf4j
 class PostRepositoryWithDynamicPropertiesTest {
+
+
+    @TestConfiguration
+    @Import(DataConfig.class)
+    static class TestConfig {
+    }
+
     private static final String COUCHBASE_IMAGE_NAME = "couchbase";
     private static final String DEFAULT_IMAGE_NAME = "couchbase/server";
     private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse(COUCHBASE_IMAGE_NAME)
@@ -49,16 +60,21 @@ static void bindCouchbaseProperties(DynamicPropertyRegistry registry) {
     @Autowired
     private PostRepository posts;
 
+    @SneakyThrows
     @BeforeEach
     public void setup() {
+        var countDownLatch = new CountDownLatch(1);
         this.posts
                 .saveAll(
                         List.of(
                                 Post.builder().title("Post one").content("content of post one").build(),
                                 Post.builder().title("Post two").content("content of post two").build()
                         )
                 )
+                .doOnTerminate(countDownLatch::countDown)
                 .subscribe(data -> log.debug("saved data: {}", data));
+
+        countDownLatch.await(1000, java.util.concurrent.TimeUnit.MILLISECONDS);
     }
 
     @Test