WIP: upgrade to Spring Boot 4 & remove HttpInterceptor that used to hack web clients and rest templates to use deprecated MockFaster

Author: jak78

pom.xml

@@ -87,7 +87,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.5</version>
+                <version>4.0.0-M2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

tzatziki-spring/src/main/java/com/decathlon/tzatziki/spring/DefaultWebClientDefinition.java

@@ -4,11 +4,9 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.reactive.function.client.WebClient;
 
 @SpringBootApplication(scanBasePackages = "com.decathlon")
 @EnableCaching
@@ -29,29 +27,4 @@ public ObjectMapper objectMapperSnakeCase() {
         mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
         return mapper;
     }
-
-    @Bean
-    public RestTemplateBuilder restTemplateBuilder() {
-        return new RestTemplateBuilder();
-    }
-
-    @Bean
-    public RestTemplate restTemplateFromBuilder(RestTemplateBuilder restTemplateBuilder) {
-        return restTemplateBuilder.build();
-    }
-
-    @Bean
-    public WebClient webClient() {
-        return WebClient.create();
-    }
-
-    @Bean
-    public WebClient.Builder webClientBuilder() {
-        return WebClient.builder();
-    }
-
-    @Bean
-    public WebClient webClientFromBuilder(WebClient.Builder webClientBuilder) {
-        return webClientBuilder.build();
-    }
 }

tzatziki-spring/src/main/java/com/decathlon/tzatziki/spring/HttpInterceptor.java

@@ -1,10 +1,8 @@
 package com.decathlon.tzatziki.steps;
 
 import com.decathlon.tzatziki.app.TestApplication;
-import com.decathlon.tzatziki.spring.HttpInterceptor;
 import com.decathlon.tzatziki.utils.Guard;
 import com.decathlon.tzatziki.utils.Patterns;
-import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.spring.CucumberContextConfiguration;
@@ -47,17 +45,6 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon
         }
     }
 
-    @Before
-    public void before() {
-        HttpInterceptor.enable();
-    }
-
-    @Then("if we disable the HttpInterceptor")
-    public void if_we_disable_the_http_interceptor() {
-        HttpInterceptor.disable();
-    }
-
-
     @Given(Patterns.THAT + "the thread pool executor is (not )?cleaned between test runs")
     public void thread_pool_executor_clean(String negation) {
         SpringSteps.clearThreadPoolExecutor = !"not ".equals(negation);