Upgrade Spring boot To 4.0.3

.azure/azure-pipelines.yml

@@ -16,6 +16,9 @@ pool:
   vmImage: ubuntu-latest
 
 steps:
+  - checkout: self
+    submodules: recursive
+
   - task: CopyFiles@2
     inputs:
       SourceFolder: '$(Build.SourcesDirectory)'

docs/compatibility.md

@@ -2,17 +2,18 @@
 This table serves as a guide, suggesting which versions of individual submodules are best suited to accompany each version of the main module. It helps users ensure compatibility and smooth integration by recommending specific submodule versions for their chosen main module version.
 
 | [ODE (this project)](https://github.com/usdot-jpo-ode/jpo-ode/releases) | [ACM](https://github.com/usdot-jpo-ode/asn1_codec/releases) | [PPM](https://github.com/usdot-jpo-ode/jpo-cvdp/releases) | [SEC](https://github.com/usdot-jpo-ode/jpo-security-svcs/releases) | [SDWD](https://github.com/usdot-jpo-ode/jpo-sdw-depositor/releases) | [S3D](https://github.com/usdot-jpo-ode/jpo-s3-deposit/releases) | [GJConverter](https://github.com/usdot-jpo-ode/jpo-geojsonconverter/releases) | [CMonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor/releases) | [CVisualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/releases) | [CVManager](https://github.com/usdot-jpo-ode/jpo-cvmanager/releases) | [MEC](https://github.com/usdot-jpo-ode/jpo-mec-deposit/releases) |
-|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-| 5.1.0 | 3.2.0 | 1.6.0 | 1.7.0 | 1.10.0 | 1.7.1 | 3.2.0 | 3.1.0 |  N/A  | 2.0.0 | 1.0.0 |
-| 4.1.2 | 3.1.0 | 1.5.0 | 1.6.0 | 1.9.1 | 1.7.1 | 2.1.0 | 2.1.0 | 1.5.0 | 1.6.0 |  N/A  |
-| 4.0.0 | 3.0.0 | 1.5.0 | 1.5.0 | 1.9.0 | 1.7.0 | 2.0.0 | 2.0.0 | 1.5.0 | 1.5.0 |  N/A  |
-| 3.0.0 | 2.2.0 | 1.4.0 | 1.5.0 | 1.8.0 | 1.6.0 | 1.4.2 | 1.4.2 | 1.4.1 | 1.4.0 |  N/A  |
-| 2.1.0 | 2.1.0 | 1.3.0 | 1.4.0 | 1.7.0 | 1.5.0 | 1.3.0 | 1.3.0 | 1.3.0 | 1.3.0 |  N/A  |
-| 2.0.x | 2.0.0 | 1.3.0 | 1.4.0 | 1.6.0 | 1.4.0 | 1.2.0 | 1.2.0 | 1.2.0 | 1.2.0 |  N/A  |
-| 1.5.1 | 1.5.0 | 1.2.0 | 1.3.0 | 1.5.0 | 1.3.0 | 1.1.0 | 1.1.0 | 1.1.0 | 1.1.0 |  N/A  |
-| 1.4.1 | 1.4.1 | 1.1.1 | 1.2.1 | 1.4.1 | 1.2.1 | 1.0.0 | 1.0.1 | 1.0.1 | 1.0.1 |  N/A  |
-| 1.4.0 | 1.4.0 | 1.1.0 | 1.2.0 | 1.4.0 | 1.2.0 |  N/A  |  N/A  |  N/A  |  N/A  |  N/A  |
-| 1.3.0 | 1.3.0 | 1.0.0 | 1.0.1 | 1.3.0 | 1.1.0 |  N/A  |  N/A  |  N/A  |  N/A  |  N/A  |
+|-------------------------------------------------------------------------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
+| 6.0.0                                                                   | TBD - migration pending | TBD - migration pending | TBD - migration pending | TBD - migration pending | TBD - migration pending |TBD - migration pending | TBD - migration pending |  TBD - migration pending  | TBD - migration pending | TBD - migration pending |
+| 5.1.0                                                                   | 3.2.0 | 1.6.0 | 1.7.0 | 1.10.0 | 1.7.1 | 3.2.0 | 3.1.0 |  N/A  | 2.0.0 | 1.0.0 |
+| 4.1.2                                                                   | 3.1.0 | 1.5.0 | 1.6.0 | 1.9.1 | 1.7.1 | 2.1.0 | 2.1.0 | 1.5.0 | 1.6.0 |  N/A  |
+| 4.0.0                                                                   | 3.0.0 | 1.5.0 | 1.5.0 | 1.9.0 | 1.7.0 | 2.0.0 | 2.0.0 | 1.5.0 | 1.5.0 |  N/A  |
+| 3.0.0                                                                   | 2.2.0 | 1.4.0 | 1.5.0 | 1.8.0 | 1.6.0 | 1.4.2 | 1.4.2 | 1.4.1 | 1.4.0 |  N/A  |
+| 2.1.0                                                                   | 2.1.0 | 1.3.0 | 1.4.0 | 1.7.0 | 1.5.0 | 1.3.0 | 1.3.0 | 1.3.0 | 1.3.0 |  N/A  |
+| 2.0.x                                                                   | 2.0.0 | 1.3.0 | 1.4.0 | 1.6.0 | 1.4.0 | 1.2.0 | 1.2.0 | 1.2.0 | 1.2.0 |  N/A  |
+| 1.5.1                                                                   | 1.5.0 | 1.2.0 | 1.3.0 | 1.5.0 | 1.3.0 | 1.1.0 | 1.1.0 | 1.1.0 | 1.1.0 |  N/A  |
+| 1.4.1                                                                   | 1.4.1 | 1.1.1 | 1.2.1 | 1.4.1 | 1.2.1 | 1.0.0 | 1.0.1 | 1.0.1 | 1.0.1 |  N/A  |
+| 1.4.0                                                                   | 1.4.0 | 1.1.0 | 1.2.0 | 1.4.0 | 1.2.0 |  N/A  |  N/A  |  N/A  |  N/A  |  N/A  |
+| 1.3.0                                                                   | 1.3.0 | 1.0.0 | 1.0.1 | 1.3.0 | 1.1.0 |  N/A  |  N/A  |  N/A  |  N/A  |  N/A  |
 
 For example, if you're using ODE version 2.0.1, it's recommended to use ACM 2.0.0, PPM 1.3.0, SEC 1.4.0, SDWD 1.6.0, S3D 1.4.0, GJConverter 1.2.0, CMonitor 1.2.0, CVisualizer 1.2.0, and CVManager 1.2.0. While other combinations may work, these versions are suggested for the best compatibility.
 

jpo-ode-common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
 
   <artifactId>jpo-ode-common</artifactId>
@@ -39,12 +39,11 @@
 		<dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.5</version>
 		</dependency>
     <dependency>
-      <groupId>javax.websocket</groupId>
-      <artifactId>javax.websocket-client-api</artifactId>
-      <version>1.1</version>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-client-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.esotericsoftware</groupId>

jpo-ode-core/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
 
   <artifactId>jpo-ode-core</artifactId>
@@ -25,12 +25,12 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-common</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -57,21 +57,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka_2.11</artifactId>
-      <version>0.10.1.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-streams</artifactId>

jpo-ode-plugins/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
   <properties>
     <!-- SonarQube Properties -->
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-common</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <!-- TODO open-ode
     <dependency>

jpo-ode-svcs/pom.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
   <artifactId>jpo-ode-svcs</artifactId>
   <packaging>jar</packaging>
@@ -50,11 +50,11 @@
     <dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
+      <artifactId>spring-boot-starter-webmvc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.restdocs</groupId>
@@ -71,8 +71,12 @@
       <artifactId>spring-boot-starter-websocket</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.springframework.kafka</groupId>
-      <artifactId>spring-kafka</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-kafka</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-restclient</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.kafka</groupId>
@@ -100,8 +104,7 @@
     <!-- WEB UI Boot Dependencies -->
     <dependency>
       <groupId>org.webjars</groupId>
-      <artifactId>webjars-locator</artifactId>
-      <version>0.40</version>
+      <artifactId>webjars-locator-lite</artifactId>
     </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
@@ -127,12 +130,12 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-core</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -147,11 +150,7 @@
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
       <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3.2</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.networknt</groupId>

jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/config/MetricsConfig.java

@@ -3,7 +3,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
+import org.springframework.boot.micrometer.metrics.autoconfigure.MeterRegistryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -28,12 +28,12 @@ public MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
 
   private String getHostName() {
     try {
-      // Get hostname from environment variable if running in Kubernetes
+      // Get the hostname from the environment variable if running in Kubernetes
       String hostFromEnv = System.getenv("HOSTNAME");
       if (hostFromEnv != null && !hostFromEnv.isEmpty()) {
         return hostFromEnv;
       }
-      // Fallback to system hostname for local deployments in Docker
+      // Fallback to the system hostname for local deployments in Docker
       return InetAddress.getLocalHost().getHostName();
     } catch (UnknownHostException e) {
       return "unknown";

jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/kafka/KafkaConsumerConfig.java

@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.boot.kafka.autoconfigure.KafkaProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.EnableKafka;

jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/kafka/producer/KafkaProducerConfig.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.boot.kafka.autoconfigure.KafkaProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.EnableKafka;

jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/controller/UdpServicesController.java

@@ -1,11 +1,11 @@
 package us.dot.its.jpo.ode.udp.controller;
 
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.core.KafkaTemplate;

jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/GenericReceiver.java

@@ -1,6 +1,5 @@
 package us.dot.its.jpo.ode.udp.generic;
 
-import io.netty.handler.codec.UnsupportedMessageTypeException;
 import java.net.DatagramPacket;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.buf.HexUtils;
@@ -152,4 +151,18 @@ private void routeMessageByMessageType(
       default -> throw new UnsupportedMessageTypeException(messageType);
     }
   }
-}
+
+  /**
+   * Exception class for Unsupported Message Types.
+   */
+  public static class UnsupportedMessageTypeException extends Exception {
+    /**
+     * Constructs a new UnsupportedMessageTypeException with the specified detail message.
+     *
+     * @param message the detail message
+     */
+    public UnsupportedMessageTypeException(String message) {
+      super(message);
+    }
+  }
+}

jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/kafka/KafkaProducerConfigTest.java

@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.boot.kafka.autoconfigure.KafkaProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -27,6 +27,7 @@
 import org.springframework.kafka.core.DefaultKafkaProducerFactory;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.core.ProducerFactory;
+import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.test.annotation.DirtiesContext;
@@ -35,11 +36,11 @@
 import us.dot.its.jpo.ode.kafka.OdeKafkaProperties.Producer;
 import us.dot.its.jpo.ode.kafka.producer.KafkaProducerConfig;
 import us.dot.its.jpo.ode.model.OdeObject;
-import us.dot.its.jpo.ode.test.utilities.EmbeddedKafkaHolder;
 
 @Slf4j
 @ExtendWith(SpringExtension.class)
 @DirtiesContext
+@EmbeddedKafka
 @EnableConfigurationProperties({ KafkaProperties.class })
 @Import({ KafkaProducerConfigTest.KafkaProducerConfigTestConfig.class, SerializationConfig.class })
 class KafkaProducerConfigTest {
@@ -50,13 +51,12 @@ class KafkaProducerConfigTest {
   @Autowired
   @Qualifier("testOdeKafkaProperties")
   OdeKafkaProperties odeKafkaProperties;
-  @Autowired
-  @Qualifier("testMeterRegistry")
-  MeterRegistry meterRegistry;
+
   XmlMapper xmlMapper;
   ObjectMapper objectMapper = new ObjectMapper();
 
-  EmbeddedKafkaBroker embeddedKafka = EmbeddedKafkaHolder.getEmbeddedKafka();
+  @Autowired
+  EmbeddedKafkaBroker embeddedKafka;
 
   @Test
   void odeDataProducerFactory_shouldReturnNonNull() {
@@ -73,10 +73,14 @@ void odeDataProducerFactory_shouldReturnDefaultKafkaProducerFactory() {
 
   @Test
   void kafkaTemplateInterceptorPreventsSendingToDisabledTopics() {
-    EmbeddedKafkaHolder.addTopics(odeKafkaProperties.getDisabledTopics().toArray(new String[0]));
-    var consumerProps = KafkaTestUtils.consumerProps("interceptor-disabled",
-        "false",
-        embeddedKafka);
+    for (String topic : odeKafkaProperties.getDisabledTopics()) {
+      if (!Set.of(embeddedKafka.getTopics()).contains(topic)) {
+        embeddedKafka.addTopics(topic);
+      }
+    }
+    var consumerProps = KafkaTestUtils.consumerProps(embeddedKafka,
+        "interceptor-disabled",
+        false);
     var cf = new DefaultKafkaConsumerFactory<>(consumerProps,
         new StringDeserializer(), new StringDeserializer());
     var consumer = cf.createConsumer();
@@ -102,9 +106,11 @@ void kafkaTemplateInterceptorPreventsSendingToDisabledTopics() {
   @Test
   void kafkaTemplateInterceptorAllowsSendingToTopicsNotInDisabledSet() {
     String enabledTopic = "topic.enabled" + this.getClass().getSimpleName();
-    EmbeddedKafkaHolder.addTopics(enabledTopic);
+    if (!Set.of(embeddedKafka.getTopics()).contains(enabledTopic)) {
+      embeddedKafka.addTopics(enabledTopic);
+    }
 
-    var consumerProps = KafkaTestUtils.consumerProps("interceptor-enabled", "false", embeddedKafka);
+    var consumerProps = KafkaTestUtils.consumerProps(embeddedKafka, "interceptor-enabled", false);
     var cf = new DefaultKafkaConsumerFactory<>(consumerProps,
         new StringDeserializer(), new StringDeserializer());
     var consumer = cf.createConsumer();
@@ -124,10 +130,12 @@ void kafkaTemplateInterceptorAllowsSendingToTopicsNotInDisabledSet() {
 
   @Test
   void kafkaTemplateInterceptorCanSendAfterAttemptToSendToDisabledTopic() {
-    String enabledTopic = "topic.enabled" + this.getClass().getSimpleName();
-    EmbeddedKafkaHolder.addTopics(enabledTopic);
+    String enabledTopic = "topic.enabled" + this.getClass().getSimpleName() + "2";
+    if (!Set.of(embeddedKafka.getTopics()).contains(enabledTopic)) {
+      embeddedKafka.addTopics(enabledTopic);
+    }
 
-    var consumerProps = KafkaTestUtils.consumerProps("send-after", "false", embeddedKafka);
+    var consumerProps = KafkaTestUtils.consumerProps(embeddedKafka, "send-after", false);
     var cf = new DefaultKafkaConsumerFactory<>(consumerProps,
         new StringDeserializer(), new StringDeserializer());
     var consumer = cf.createConsumer();