update springboot to 3.2.1 (#1275)

* update springboot to 3.2.1 --------- Co-authored-by: 致节 <[email protected]>
sofastack · Dec 22, 2023 · 58a1486 · 58a1486
1 parent 956e75d
commit 58a1486
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <groupId>com.alipay.sofa</groupId>
@@ -37,7 +37,7 @@
     <properties>
         <revision>4.2.0-SNAPSHOT</revision>
         <sofa.boot.version>${revision}</sofa.boot.version>
-        <spring.boot.version>3.2.0</spring.boot.version>
+        <spring.boot.version>3.2.1</spring.boot.version>
         <!--project-->
         <java.version>17</java.version>
         <project.encoding>UTF-8</project.encoding>

diff --git a/...t-actuator/src/main/java/com/alipay/sofa/boot/actuator/health/ReadinessCheckListener.java b/...t-actuator/src/main/java/com/alipay/sofa/boot/actuator/health/ReadinessCheckListener.java
@@ -42,6 +42,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -96,7 +97,7 @@ public class ReadinessCheckListener implements ApplicationContextAware, Ordered,
     /**
      * Check result details for healthCheckerProcessor
      */
-    private final Map<String, Health>             healthCheckerDetails                      = new HashMap<>();
+    private final Map<String, Health>             healthCheckerDetails                      = new ConcurrentHashMap<>();
 
     /**
      * Check result for healthIndicatorProcessor
@@ -106,7 +107,7 @@ public class ReadinessCheckListener implements ApplicationContextAware, Ordered,
     /**
      * Check result for healthIndicatorProcessor
      */
-    private final Map<String, Health>             healthIndicatorDetails                    = new HashMap<>();
+    private final Map<String, Health>             healthIndicatorDetails                    = new ConcurrentHashMap<>();
 
     /**
      * Check result for readinessCheckCallbackProcessor
@@ -116,7 +117,7 @@ public class ReadinessCheckListener implements ApplicationContextAware, Ordered,
     /**
      * Check result details for readinessCheckCallbackProcessor
      */
-    private final Map<String, Health>             healthCallbackDetails                     = new HashMap<>();
+    private final Map<String, Health>             healthCallbackDetails                     = new ConcurrentHashMap<>();
 
     /**
      * ReadinessCheckCallbackProcessor trigger status

diff --git a/...st/java/com/alipay/sofa/boot/tracer/kafka/KafkaConsumerFactoryBeanPostProcessorTests.java b/...st/java/com/alipay/sofa/boot/tracer/kafka/KafkaConsumerFactoryBeanPostProcessorTests.java
@@ -21,6 +21,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.kafka.core.ConsumerFactory;
 
+import java.util.Properties;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -65,7 +67,8 @@ public void skipTransformedKafkaConsumerFactory() {
     static class EmptyConsumerFactory implements ConsumerFactory {
 
         @Override
-        public Consumer createConsumer(String s, String s1, String s2) {
+        public Consumer createConsumer(String groupId, String clientIdPrefix,
+                                       String clientIdSuffix, Properties properties) {
             return null;
         }