fix(deps): bump org.springframework.boot:spring-boot-starter-parent from 3.5.7 to 4.0.2

pom.xml

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.5.7</version>
+    <version>4.0.2</version>
     <relativePath />
   </parent>
 
@@ -37,26 +37,24 @@
     </sonar.exclusions>
 
     <!-- Folio dependencies versions -->
-    <folio-spring-base.version>10.0.0-SNAPSHOT</folio-spring-base.version>
-    <folio-service-tools.version>5.1.0-SNAPSHOT</folio-service-tools.version>
-    <folio-kafka-wrapper.version>3.4.0-SNAPSHOT</folio-kafka-wrapper.version>
-
-    <!-- LD dependencies versions -->
+    <folio-spring-base.version>10.0.0-RC1</folio-spring-base.version>
+    <folio-service-tools.version>6.0.0-SNAPSHOT</folio-service-tools.version>
+    <folio-kafka-wrapper.version>4.0.0-SNAPSHOT</folio-kafka-wrapper.version>
+    <mod-source-record-storage-client.version>5.11.0-SNAPSHOT</mod-source-record-storage-client.version>
+    <mod-record-specifications-dto.version>3.0.0-SNAPSHOT</mod-record-specifications-dto.version>
     <lib-linked-data-dictionary.version>2.0.0-SNAPSHOT</lib-linked-data-dictionary.version>
     <lib-linked-data-marc4ld.version>2.0.0-SNAPSHOT</lib-linked-data-marc4ld.version>
     <lib-linked-data-fingerprint.version>2.0.0-SNAPSHOT</lib-linked-data-fingerprint.version>
     <lib-linked-data-rdf4ld.version>1.0.0-SNAPSHOT</lib-linked-data-rdf4ld.version>
 
     <!-- Dependencies versions -->
+    <hypersistence-utils-hibernate>3.15.1</hypersistence-utils-hibernate>
     <apache-commons-io.version>2.21.0</apache-commons-io.version>
     <apache-commons-collections.version>4.5.0</apache-commons-collections.version>
     <apache-commons-csv.version>1.14.1</apache-commons-csv.version>
     <mapstruct.version>1.6.3</mapstruct.version>
     <lombok.version>1.18.42</lombok.version>
     <lombok.mapstruct-binding.version>0.2.0</lombok.mapstruct-binding.version>
-    <hypersistence-utils-hibernate>3.14.1</hypersistence-utils-hibernate>
-    <mod-source-record-storage-client.version>5.10.15</mod-source-record-storage-client.version>
-    <mod-record-specifications-dto.version>2.0.3</mod-record-specifications-dto.version>
     <maven-checkstyle-plugin.checkstyle.version>13.0.0</maven-checkstyle-plugin.checkstyle.version>
     <jayway-jsonpath.version>2.10.0</jayway-jsonpath.version>
 
@@ -146,29 +144,43 @@
       <artifactId>spring-boot-starter-web</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-to-slf4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>org.springframework.kafka</groupId>
-      <artifactId>spring-kafka</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-kafka</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -202,14 +214,9 @@
       <version>${apache-commons-io.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.hypersistence</groupId>
-      <artifactId>hypersistence-utils-hibernate-63</artifactId>
+      <artifactId>hypersistence-utils-hibernate-73</artifactId>
       <version>${hypersistence-utils-hibernate}</version>
     </dependency>
 
@@ -227,20 +234,12 @@
     <!-- test -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.junit.vintage</groupId>
-          <artifactId>junit-vintage-engine</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-to-slf4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

src/main/java/org/folio/linked/data/LinkedDataApplication.java

@@ -6,15 +6,15 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.resilience.annotation.EnableResilientMethods;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableCaching
 @EnableAsync
-@EnableFeignClients
 @EnableScheduling
+@EnableResilientMethods
 @SpringBootApplication
 @ComponentScan(value = "org.folio", excludeFilters = @Filter(type = REGEX, pattern =
   {"org.folio.spring.tools.systemuser.*", "org.folio.spring.tools.batch.*"}))

src/main/java/org/folio/linked/data/configuration/HttpClientConfiguration.java

@@ -0,0 +1,45 @@
+package org.folio.linked.data.configuration;
+
+import org.folio.linked.data.integration.rest.authoritysource.AuthoritySourceFilesClient;
+import org.folio.linked.data.integration.rest.configuration.ConfigurationClient;
+import org.folio.linked.data.integration.rest.search.SearchClient;
+import org.folio.linked.data.integration.rest.settings.SettingsClient;
+import org.folio.linked.data.integration.rest.specification.SpecClient;
+import org.folio.linked.data.integration.rest.srs.SrsClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.service.invoker.HttpServiceProxyFactory;
+
+@Configuration
+public class HttpClientConfiguration {
+
+  @Bean
+  public AuthoritySourceFilesClient authoritySourceFilesClient(HttpServiceProxyFactory factory) {
+    return factory.createClient(AuthoritySourceFilesClient.class);
+  }
+
+  @Bean
+  public ConfigurationClient configurationClient(HttpServiceProxyFactory factory) {
+    return factory.createClient(ConfigurationClient.class);
+  }
+
+  @Bean
+  public SearchClient searchClient(HttpServiceProxyFactory factory) {
+    return factory.createClient(SearchClient.class);
+  }
+
+  @Bean
+  public SettingsClient settingsClient(HttpServiceProxyFactory factory) {
+    return factory.createClient(SettingsClient.class);
+  }
+
+  @Bean
+  public SpecClient specClient(HttpServiceProxyFactory factory) {
+    return factory.createClient(SpecClient.class);
+  }
+
+  @Bean
+  public SrsClient srsClient(HttpServiceProxyFactory factory) {
+    return factory.createClient(SrsClient.class);
+  }
+}

src/main/java/org/folio/linked/data/configuration/json/JsonMapperConfig.java

@@ -0,0 +1,21 @@
+package org.folio.linked.data.configuration.json;
+
+import static org.folio.linked.data.util.JsonUtils.JSON_MAPPER;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import tools.jackson.databind.json.JsonMapper;
+
+@Configuration
+public class JsonMapperConfig {
+
+  @Bean
+  @Primary
+  public JsonMapper jacksonJsonMapper() {
+    return JSON_MAPPER;
+  }
+}
+
+
+

src/main/java/org/folio/linked/data/configuration/json/deserialization/ResourceRequestFieldDeserializer.java

@@ -1,19 +1,17 @@
 package org.folio.linked.data.configuration.json.deserialization;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import java.io.IOException;
 import java.util.Map;
 import org.folio.ld.dictionary.ResourceTypeDictionary;
 import org.folio.linked.data.domain.dto.HubField;
 import org.folio.linked.data.domain.dto.InstanceField;
 import org.folio.linked.data.domain.dto.ResourceRequestField;
 import org.folio.linked.data.domain.dto.WorkField;
-import org.folio.linked.data.exception.RequestProcessingExceptionBuilder;
 import org.folio.linked.data.util.DtoDeserializer;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.ValueDeserializer;
 
-public class ResourceRequestFieldDeserializer extends JsonDeserializer<ResourceRequestField> {
+public class ResourceRequestFieldDeserializer extends ValueDeserializer<ResourceRequestField> {
 
   private static final Map<String, Class<? extends ResourceRequestField>> IDENDTITY_MAP = Map.of(
     ResourceTypeDictionary.INSTANCE.getUri(), InstanceField.class,
@@ -22,12 +20,12 @@ public class ResourceRequestFieldDeserializer extends JsonDeserializer<ResourceR
   );
   private final DtoDeserializer<ResourceRequestField> dtoDeserializer;
 
-  public ResourceRequestFieldDeserializer(RequestProcessingExceptionBuilder exceptionBuilder) {
-    dtoDeserializer = new DtoDeserializer<>(ResourceRequestField.class, IDENDTITY_MAP, exceptionBuilder);
+  public ResourceRequestFieldDeserializer() {
+    dtoDeserializer = new DtoDeserializer<>(ResourceRequestField.class, IDENDTITY_MAP);
   }
 
   @Override
-  public ResourceRequestField deserialize(JsonParser jp, DeserializationContext dc) throws IOException {
-    return dtoDeserializer.deserialize(jp);
+  public ResourceRequestField deserialize(JsonParser jp, DeserializationContext dc) {
+    return dtoDeserializer.deserialize(jp, dc);
   }
 }