next steps

Author: rieckpil

labs/lab-5/src/main/java/pragmatech/digital/workshops/lab5/service/BookService.java

@@ -6,6 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import pragmatech.digital.workshops.lab5.client.OpenLibraryApiClient;
 import pragmatech.digital.workshops.lab5.dto.BookCreationRequest;
 import pragmatech.digital.workshops.lab5.dto.BookMetadataResponse;
@@ -15,10 +16,9 @@
 import pragmatech.digital.workshops.lab5.repository.BookRepository;
 
 @Service
+@Transactional
 public class BookService {
 
-  private static final Logger logger = LoggerFactory.getLogger(BookService.class);
-
   private final BookRepository bookRepository;
   private final OpenLibraryApiClient openLibraryApiClient;
 

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/exercises/Exercise1MockMvcIntegrationTest.java

@@ -72,10 +72,9 @@ void shouldCreateAndRetrieveBookWhenUsingMockMvc() {
   @Test
   void shouldReturnAllBooksWhenUsingMockMvc() {
     // TODO:
+    // 0. Pre-populate the database with some books
     // 1. Perform a GET to /api/books (this endpoint is publicly accessible)
-    //
     // 2. Assert the response status is 200 OK
-    //
     // 3. Assert the response body is a JSON array using jsonPath("$").isArray()
   }
 

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/exercises/Exercise2WebTestClientIntegrationTest.java

@@ -80,6 +80,7 @@ void shouldCreateAndRetrieveBookWhenUsingWebTestClient() {
   @Test
   void shouldReturnAllBooksWhenUsingWebTestClient() {
     // TODO:
+    // 0. Pre-populate the database with some books
     // 1. Perform a GET to /api/books (publicly accessible, no auth needed)
     //    Use webTestClient.get().uri("/api/books")
     //

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/experiment/ContextCustomisationTest.java

@@ -11,6 +11,7 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,7 @@
 )
 @AutoConfigureMockMvc
 @Transactional
+@ActiveProfiles("expensive-tests")
 @Import(LocalDevTestcontainerConfig.class)
 class ContextCustomisationTest {
 

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/experiment/customizer/BookControllerCustomizerIT.java

@@ -0,0 +1,53 @@
+package pragmatech.digital.workshops.lab5.experiment.customizer;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.AfterEach;
+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.webtestclient.autoconfigure.AutoConfigureWebTestClient;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pragmatech.digital.workshops.lab5.config.OpenLibraryApiStub;
+import pragmatech.digital.workshops.lab5.entity.Book;
+import pragmatech.digital.workshops.lab5.repository.BookRepository;
+
+@SharedInfrastructureTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureWebTestClient
+class BookControllerCustomizerIT {
+
+  @Autowired
+  private WebTestClient webTestClient;
+
+  @Autowired
+  private BookRepository bookRepository;
+
+  @Autowired
+  private OpenLibraryApiStub openLibraryApiStub;
+
+  @AfterEach
+  void cleanUp() {
+    bookRepository.deleteAll();
+  }
+
+  @BeforeEach
+  void setUp() {
+    bookRepository.save(new Book("111-1234567890", "Clean Code", "Robert C. Martin", LocalDate.of(2008, 8, 1)));
+    bookRepository.save(new Book("222-1234567890", "Effective Java", "Joshua Bloch", LocalDate.of(2018, 1, 6)));
+  }
+
+  @Test
+  void shouldReturnAllBooksWhenGettingAllBooks() {
+    webTestClient.get()
+      .uri("/api/books")
+      .accept(MediaType.APPLICATION_JSON)
+      .exchange()
+      .expectStatus().isOk()
+      .expectBody()
+      .jsonPath("$").isArray()
+      .jsonPath("$.length()").isEqualTo(2);
+  }
+}

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/experiment/customizer/SharedInfrastructureContextCustomizer.java

@@ -0,0 +1,66 @@
+package pragmatech.digital.workshops.lab5.experiment.customizer;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextCustomizer;
+import org.springframework.test.context.MergedContextConfiguration;
+import org.testcontainers.postgresql.PostgreSQLContainer;
+import pragmatech.digital.workshops.lab5.config.OpenLibraryApiStub;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+public class SharedInfrastructureContextCustomizer implements ContextCustomizer {
+
+  // Static so they persist across multiple test class executions (reusing the context)
+  private static final PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:16-alpine");
+  private static final WireMockServer wireMockServer = new WireMockServer(options().dynamicPort());
+
+  @Override
+  public void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) {
+    // 1. Start Infrastructure
+    postgres.start();
+    wireMockServer.start();
+
+    // 2. Inject Dynamic Properties (JDBC URL, WireMock Port)
+    TestPropertyValues.of(
+      "spring.datasource.url=" + postgres.getJdbcUrl(),
+      "spring.datasource.username=" + postgres.getUsername(),
+      "spring.datasource.password=" + postgres.getPassword(),
+      "book.metadata.api.url=http://localhost:" + wireMockServer.port()
+    ).applyTo(context.getEnvironment());
+
+    // 3. Register Beans Programmatically
+    ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+
+    OpenLibraryApiStub openLibraryStub = new OpenLibraryApiStub(wireMockServer);
+
+    openLibraryStub.stubForSuccessfulBookResponse("9780134757599");
+    openLibraryStub.stubForSuccessfulBookResponse("9780201633610");
+    openLibraryStub.stubForSuccessfulBookResponse("9780132350884");
+
+    // Register WireMock so tests can @Autowired it to stub responses
+    beanFactory.registerSingleton("wireMockServer", wireMockServer);
+    beanFactory.registerSingleton("openLibraryStub", openLibraryStub);
+
+    // Register a Fixed Clock for deterministic time-based testing
+    Clock fixedClock = Clock.fixed(Instant.parse("2026-03-01T10:00:00Z"), ZoneId.of("UTC"));
+    beanFactory.registerSingleton("clock", fixedClock);
+  }
+
+  // Required for context caching to work correctly
+  @Override
+  public boolean equals(Object obj) {
+    return obj != null && obj.getClass() == this.getClass();
+  }
+
+  @Override
+  public int hashCode() {
+    return SharedInfrastructureContextCustomizer.class.hashCode();
+  }
+}

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/experiment/customizer/SharedInfrastructureCustomizerFactory.java

@@ -0,0 +1,22 @@
+package pragmatech.digital.workshops.lab5.experiment.customizer;
+
+import java.util.List;
+
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.test.context.ContextConfigurationAttributes;
+import org.springframework.test.context.ContextCustomizer;
+import org.springframework.test.context.ContextCustomizerFactory;
+
+public class SharedInfrastructureCustomizerFactory implements ContextCustomizerFactory {
+
+  @Override
+  public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
+    // Only activate if the @SharedInfrastructureTest annotation is present
+    if (AnnotatedElementUtils.hasAnnotation(testClass, SharedInfrastructureTest.class)) {
+      return new SharedInfrastructureContextCustomizer();
+    }
+
+    // Otherwise, return null (do nothing)
+    return null;
+  }
+}

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/experiment/customizer/SharedInfrastructureTest.java

@@ -0,0 +1,14 @@
+package pragmatech.digital.workshops.lab5.experiment.customizer;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface SharedInfrastructureTest {
+  // You can add parameters here, like 'boolean useWireMock() default true'
+}

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/solutions/Solution1MockMvcIntegrationTest.java

@@ -1,5 +1,7 @@
 package pragmatech.digital.workshops.lab5.solutions;
 
+import java.time.LocalDate;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,8 @@
 import pragmatech.digital.workshops.lab5.LocalDevTestcontainerConfig;
 import pragmatech.digital.workshops.lab5.config.OpenLibraryApiStub;
 import pragmatech.digital.workshops.lab5.config.WireMockContextInitializer;
+import pragmatech.digital.workshops.lab5.entity.Book;
+import pragmatech.digital.workshops.lab5.repository.BookRepository;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -47,18 +51,14 @@ class Solution1MockMvcIntegrationTest {
   @Autowired
   private MockMvc mockMvc;
 
+  @Autowired
+  private BookRepository bookRepository;
+
   @Autowired
   private OpenLibraryApiStub openLibraryApiStub;
 
   private static final String VALID_ISBN = "978-0134757599";
 
-  @BeforeEach
-  void setUp() {
-    // Register a WireMock stub for the dashed ISBN format used in BookCreationRequest.
-    // The BookService passes the ISBN as-is to the OpenLibrary API client,
-    // so the stub must match the dashed format.
-    openLibraryApiStub.stubForSuccessfulBookResponse(VALID_ISBN);
-  }
 
   @Test
   @WithMockUser(roles = "USER")
@@ -73,6 +73,8 @@ void shouldCreateAndRetrieveBookWhenUsingMockMvc() throws Exception {
       }
       """.formatted(VALID_ISBN);
 
+    openLibraryApiStub.stubForSuccessfulBookResponse(VALID_ISBN);
+
     // Act - Create a book
     MvcResult createResult = mockMvc.perform(post("/api/books")
         .contentType(MediaType.APPLICATION_JSON)
@@ -100,10 +102,14 @@ void shouldCreateAndRetrieveBookWhenUsingMockMvc() throws Exception {
   @Test
   void shouldReturnAllBooksWhenUsingMockMvc() throws Exception {
     // GET /api/books is publicly accessible (permitAll)
+    this.bookRepository.save(new Book("123-1234567890", "Book One", "Author A", LocalDate.now()));
+    this.bookRepository.save(new Book("456-1234567890", "Book Two", "Author B", LocalDate.now()));
+
     mockMvc.perform(get("/api/books")
         .accept(MediaType.APPLICATION_JSON))
       .andExpect(status().isOk())
-      .andExpect(jsonPath("$").isArray());
+      .andExpect(jsonPath("$").isArray())
+      .andExpect(jsonPath("$.size()").value(2));
   }
 
   @Test

labs/lab-5/src/test/java/pragmatech/digital/workshops/lab5/solutions/Solution2WebTestClientIntegrationTest.java

@@ -1,9 +1,9 @@
 package pragmatech.digital.workshops.lab5.solutions;
 
 import java.net.URI;
+import java.time.LocalDate;
 
 import org.junit.jupiter.api.AfterEach;
-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;
@@ -12,9 +12,11 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.transaction.annotation.Transactional;
 import pragmatech.digital.workshops.lab5.LocalDevTestcontainerConfig;
 import pragmatech.digital.workshops.lab5.config.OpenLibraryApiStub;
 import pragmatech.digital.workshops.lab5.config.WireMockContextInitializer;
+import pragmatech.digital.workshops.lab5.entity.Book;
 import pragmatech.digital.workshops.lab5.repository.BookRepository;
 
 /**
@@ -49,20 +51,15 @@ class Solution2WebTestClientIntegrationTest {
 
   private static final String VALID_ISBN = "978-0134757599";
 
-  @BeforeEach
-  void setUp() {
-    // Register a WireMock stub for the dashed ISBN format.
-    openLibraryApiStub.stubForSuccessfulBookResponse(VALID_ISBN);
-  }
-
   @AfterEach
   void cleanUp() {
     // WebTestClient commits transactions in the server thread, so we must
     // clean up manually. Without this, data would persist across tests.
-    bookRepository.deleteAll();
+    this.bookRepository.deleteAll();
   }
 
   @Test
+  @Transactional
   void shouldCreateAndRetrieveBookWhenUsingWebTestClient() {
     // Arrange
     String requestBody = """
@@ -74,6 +71,8 @@ void shouldCreateAndRetrieveBookWhenUsingWebTestClient() {
       }
       """.formatted(VALID_ISBN);
 
+    openLibraryApiStub.stubForSuccessfulBookResponse(VALID_ISBN);
+
     // Act - Create a book using POST with Basic Auth
     URI locationUri = webTestClient.post()
       .uri("/api/books")
@@ -109,20 +108,26 @@ void shouldCreateAndRetrieveBookWhenUsingWebTestClient() {
   @Test
   void shouldReturnAllBooksWhenUsingWebTestClient() {
     // GET /api/books is publicly accessible (permitAll)
-    webTestClient.get()
+
+    // this won't work when we use @Trannsactional because the test transaction is separate from the server thread's transaction.
+    this.bookRepository.save(new Book("123-1234567890", "Book One", "Author A", LocalDate.now()));
+    this.bookRepository.save(new Book("456-1234567890", "Book Two", "Author B", LocalDate.now()));
+
+    this.webTestClient.get()
       .uri("/api/books")
       .accept(MediaType.APPLICATION_JSON)
       .exchange()
       .expectStatus().isOk()
       .expectBody()
-      .jsonPath("$").isArray();
+      .jsonPath("$").isArray()
+      .jsonPath("$.size()").isEqualTo(2);
   }
 
   @Test
   void shouldRejectUnauthorizedAccessToProtectedEndpoint() {
     // GET /api/books/{id} requires USER role
     // Without credentials, the server should return 401
-    webTestClient.get()
+    this.webTestClient.get()
       .uri("/api/books/1")
       .accept(MediaType.APPLICATION_JSON)
       .exchange()