SPRNGCORE-6: Fix deprecated code and ambiguous issues.

Address newly deprecated code issues.

Address ambiguous `any()` issue that now appears and breaks tests.

The `@MockBean` is no longer available and we must instead use `@MockitoBean`.
see: spring-projects/spring-framework#29917 (comment)
see: spring-projects/spring-framework#33925
see: https://docs.spring.io/spring-framework/reference/testing/annotations/integration-spring/annotation-mockitobean.html

Author: kaladay

Diff for: domain/src/test/java/org/folio/spring/domain/controller/JsonSchemasControllerTest.java

@@ -53,9 +53,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -71,7 +71,7 @@ class JsonSchemasControllerTest {
   @Autowired
   private MockMvc mvc;
 
-  @MockBean
+  @MockitoBean
   private JsonSchemasService jsonSchemasService;
 
   @ParameterizedTest

Diff for: domain/src/test/java/org/folio/spring/domain/controller/RamlsControllerTest.java

@@ -53,9 +53,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -71,7 +71,7 @@ class RamlsControllerTest {
   @Autowired
   private MockMvc mvc;
 
-  @MockBean
+  @MockitoBean
   private RamlsService ramlsService;
 
   @ParameterizedTest

Diff for: domain/src/test/java/org/folio/spring/domain/generator/FolioUUIDGeneratorTest.java

@@ -8,6 +8,7 @@
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.id.enhanced.AccessCallback;
 import org.hibernate.id.enhanced.DatabaseStructure;
 import org.hibernate.id.enhanced.Optimizer;
@@ -51,7 +52,7 @@ void beforeEach() {
 
   @Test
   void generateWorksTest() {
-    when(persister.getIdentifier(any(), any())).thenReturn(UUID);
+    when(persister.getIdentifier(any(), any(SharedSessionContractImplementor.class))).thenReturn(UUID);
 
     Object result = folioUUIDGenerator.generate(session, folioUUIDGenerator);
 
@@ -60,7 +61,7 @@ void generateWorksTest() {
 
   @Test
   void generateWorksWithNullIdentifierTest() {
-    when(persister.getIdentifier(any(), any())).thenReturn(null);
+    when(persister.getIdentifier(any(), any(SharedSessionContractImplementor.class))).thenReturn(null);
     when(databaseStructure.buildCallback(any())).thenReturn(accessCallback);
     when(optimizer.generate(any())).thenReturn(JSON_OBJECT);
 

Diff for: tenant/src/test/java/org/folio/spring/tenant/controller/TenantControllerTest.java

@@ -42,9 +42,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -60,7 +60,7 @@ class TenantControllerTest {
   @Autowired
   private MockMvc mvc;
 
-  @MockBean
+  @MockitoBean
   private HibernateSchemaService hibernateSchemaService;
 
   @ParameterizedTest

Diff for: web/src/main/java/org/folio/spring/web/service/HttpService.java

@@ -44,8 +44,8 @@ public void setup() {
     messageConverters.add(new ObjectPlainTextConverter(StandardCharsets.UTF_8));
 
     this.restTemplate = restTemplateBuilder
-        .setConnectTimeout(Duration.ofSeconds(connectionTimeout))
-        .setReadTimeout(Duration.ofSeconds(readTimeout))
+        .connectTimeout(Duration.ofSeconds(connectionTimeout))
+        .readTimeout(Duration.ofSeconds(readTimeout))
         .additionalMessageConverters(messageConverters)
         .build();
   }