Polish

Author: mfvanek

spring-boot-3-demo-app-reactive/src/main/java/io/github/mfvanek/spring/boot3/reactive/service/PublicApiService.java

@@ -54,7 +54,6 @@ private Mono<CurrentTime> getZonedTimeFromWorldTimeApi() {
             .bodyToMono(String.class)
             .retryWhen(prepareRetry(zoneName))
             .flatMap(this::convert)
-            .doOnError(err -> log.warn("Received error response", err)) // TODO ???
             .onErrorComplete()
             .flatMap(Mono::justOrEmpty);
     }

spring-boot-3-demo-app-reactive/src/test/java/io/github/mfvanek/spring/boot3/reactive/service/PublicApiServiceTest.java

@@ -50,13 +50,6 @@ void printTimeZoneSuccessfully(@Nonnull final CapturedOutput output) {
         assertThat(result).isNotNull();
         assertThat(result.truncatedTo(ChronoUnit.MINUTES))
             .isEqualTo(localDateTimeNow.truncatedTo(ChronoUnit.MINUTES));
-        assertThat(output.getAll())
-            .contains("Request received:")
-            .doesNotContain(
-                "Retrying request to ",
-                "Retries exhausted",
-                "Failed to convert response ",
-                "timezone");
     }
 
     @Test

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/support/TestBase.java

@@ -16,14 +16,20 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 import java.time.Clock;
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.ZoneOffset;
 import java.util.TimeZone;
 import javax.annotation.Nonnull;
 
@@ -35,10 +41,16 @@
 @ActiveProfiles("test")
 @AutoConfigureObservability
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(initializers = {KafkaInitializer.class, JaegerInitializer.class, PostgresInitializer.class})
+@ContextConfiguration(
+    classes = TestBase.CustomClockConfiguration.class,
+    initializers = {KafkaInitializer.class, JaegerInitializer.class, PostgresInitializer.class}
+)
 @AutoConfigureWireMock(port = 0)
 public abstract class TestBase {
 
+    private static final ZoneOffset FIXED_ZONE = ZoneOffset.ofHours(-1);
+    private static final LocalDateTime BEFORE_MILLENNIUM = LocalDateTime.of(1999, Month.DECEMBER, 31, 23, 59, 59);
+
     @Autowired
     protected WebTestClient webTestClient;
     @Autowired
@@ -88,4 +100,14 @@ private void stubErrorResponse(@Nonnull final String zoneName, @Nonnull final Ru
                 .withBody(objectMapper.writeValueAsString(errorForResponse))
             ));
     }
+
+    @TestConfiguration
+    static class CustomClockConfiguration {
+
+        @Bean
+        @Primary
+        public Clock fixedClock() {
+            return Clock.fixed(BEFORE_MILLENNIUM.toInstant(FIXED_ZONE), FIXED_ZONE);
+        }
+    }
 }