chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5

Author: xuxiaowei-com-cn

ai-registry-adaptor/pom.xml

@@ -48,5 +48,9 @@
             <artifactId>spring-boot-test-autoconfigure</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-ldap</artifactId>
+        </dependency>
     </dependencies>
 </project>

ai-registry-adaptor/src/main/java/com/alibaba/nacos/airegistry/NacosAiRegistry.java

@@ -18,7 +18,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
+import org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration;
 import org.springframework.context.annotation.PropertySource;
 
 /**

ai-registry-adaptor/src/main/java/com/alibaba/nacos/airegistry/config/HttpPathConfiguration.java

@@ -17,7 +17,7 @@
 package com.alibaba.nacos.airegistry.config;
 
 import org.apache.tomcat.util.buf.EncodedSolidusHandling;
-import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.boot.tomcat.TomcatConnectorCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;

ai/src/test/java/com/alibaba/nacos/ai/controller/AgentSpecAdminControllerTest.java

@@ -32,12 +32,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.Executable;
-import org.mockito.Mock;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -74,8 +74,8 @@ class AgentSpecAdminControllerTest {
     private MockMvc mockMvc;
 
     private ConfigurableEnvironment cachedEnvironment;
-    
-    @Mock
+
+    @MockitoBean
     private AgentSpecOperationService agentSpecOperationService;
 
     @BeforeEach

ai/src/test/java/com/alibaba/nacos/ai/controller/McpAdminControllerTest.java

@@ -34,12 +34,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.Executable;
-import org.mockito.Mock;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -75,8 +75,8 @@ class McpAdminControllerTest {
     private MockMvc mockMvc;
 
     private ConfigurableEnvironment cachedEnvironment;
-    
-    @Mock
+
+    @MockitoBean
     private McpServerOperationService mcpServerOperationService;
 
     @BeforeEach

ai/src/test/java/com/alibaba/nacos/ai/controller/SkillAdminControllerTest.java

@@ -34,12 +34,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.Executable;
-import org.mockito.Mock;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -79,8 +79,8 @@ class SkillAdminControllerTest {
     private MockMvc mockMvc;
 
     private ConfigurableEnvironment cachedEnvironment;
-    
-    @Mock
+
+    @MockitoBean
     private SkillOperationService skillOperationService;
 
     @BeforeEach

ai/src/test/java/com/alibaba/nacos/ai/controller/SkillClientControllerTest.java

@@ -27,12 +27,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.Executable;
-import org.mockito.Mock;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -66,7 +66,7 @@ class SkillClientControllerTest {
 
     private ConfigurableEnvironment cachedEnvironment;
 
-    @Mock
+    @MockitoBean
     private SkillOperationService skillOperationService;
 
     @BeforeEach

config/pom.xml

@@ -101,7 +101,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -160,6 +160,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

config/src/test/java/com/alibaba/nacos/config/server/aspect/CapacityManagementAspectTest.java

@@ -33,9 +33,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -56,27 +56,27 @@ class CapacityManagementAspectTest {
     final String mockGroup = "mockGroup";
 
     final String mockTenant = "mockTenant";
-    
-    @Mock
+
+    @MockitoBean
     private ConfigForm configForm;
-    
-    @Mock
+
+    @MockitoBean
     private ConfigRequestInfo configRequestInfo;
-    
-    @Mock
+
+    @MockitoBean
     ProceedingJoinPoint proceedingJoinPoint;
-    
-    @Mock
+
+    @MockitoBean
     ProceedingJoinPoint localMockProceedingJoinPoint;
 
     RuntimeException mockException = new RuntimeException("mock exception");
 
     CapacityManagementAspect capacityManagementAspect;
-    
-    @Mock
+
+    @MockitoBean
     CapacityService capacityService;
-    
-    @Mock
+
+    @MockitoBean
     ConfigInfoPersistService configInfoPersistService;
 
     MockedStatic<PropertyUtil> propertyUtilMockedStatic;

config/src/test/java/com/alibaba/nacos/config/server/aspect/ConfigChangeAspectTest.java

@@ -37,9 +37,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Properties;
@@ -61,21 +61,21 @@ class ConfigChangeAspectTest {
     ConfigChangeAspect configChangeAspect;
 
     ConfigChangeConfigs configChangeConfigs;
-    
-    @Mock
+
+    @MockitoBean
     ConfigChangePluginService configChangePluginService;
 
     MockedStatic<PropertiesUtil> propertiesStatic;
 
     MockedStatic<RequestUtil> requestUtilMockedStatic;
-    
-    @Mock
+
+    @MockitoBean
     private ProceedingJoinPoint pjp;
-    
-    @Mock
+
+    @MockitoBean
     private ConfigForm configForm;
-    
-    @Mock
+
+    @MockitoBean
     private ConfigRequestInfo configRequestInfo;
 
     @BeforeEach
@@ -120,10 +120,9 @@ void testPublishOrUpdateConfigAround() throws Throwable {
         when(pjp.proceed(any())).thenReturn("Success");
 
         Object o = configChangeAspect.publishOrUpdateConfigAround(pjp);
-        Thread.sleep(20L);
 
         // expect service executed.
-        verify(configChangePluginService, Mockito.times(1))
+        verify(configChangePluginService, Mockito.timeout(1000).times(1))
                 .execute(any(ConfigChangeRequest.class), any(ConfigChangeResponse.class));
         //expect join point processed success.
         assertEquals("Success", o);
@@ -144,10 +143,9 @@ void testRemoveConfigByIdAround() throws Throwable {
         when(pjp.getArgs()).thenReturn(new Object[] {dataId, group, namespaceId, tag, clientIp, srcUser, srcType});
         Mockito.when(pjp.proceed(any())).thenReturn("mock success return");
         Object o = configChangeAspect.removeConfigByIdAround(pjp);
-        Thread.sleep(20L);
 
         // expect service executed.
-        verify(configChangePluginService, Mockito.times(1))
+        verify(configChangePluginService, Mockito.timeout(1000).times(1))
                 .execute(any(ConfigChangeRequest.class), any(ConfigChangeResponse.class));
         //expect join point processed success.
         assertEquals("mock success return", o);
@@ -213,6 +211,7 @@ void testProceedThrowsExceptionHandled() throws Throwable {
 
         Object result = configChangeAspect.publishOrUpdateConfigAround(pjp);
 
+        verify(configChangePluginService, Mockito.timeout(1000).times(1)).execute(any(), any());
         assertEquals(false, result);
     }
 
@@ -246,7 +245,7 @@ void testRpcSourceTypeHandling() throws Throwable {
 
         configChangeAspect.publishOrUpdateConfigAround(pjp);
         ArgumentCaptor<ConfigChangeRequest> requestCaptor = ArgumentCaptor.forClass(ConfigChangeRequest.class);
-        verify(configChangePluginService).execute(requestCaptor.capture(), any());
+        verify(configChangePluginService, Mockito.timeout(1000).times(1)).execute(requestCaptor.capture(), any());
         assertEquals(ConfigChangePointCutTypes.PUBLISH_BY_RPC, requestCaptor.getValue().getRequestType());
     }