Fix running problem after upgrade to spring boot 3 (#13029)

* Fix running problem after upgrade to spring boot 3 * Fix Unit test problem.
alibaba · Jan 10, 2025 · 76647c4 · 76647c4
1 parent c6e8c9f
commit 76647c4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
@@ -722,6 +722,7 @@ ClientConfigMetricResponse handleClientMetricsRequest(ClientConfigMetricRequest
             return response;
         }
 
+        @SuppressWarnings("PMD.MethodTooLongRule")
         private void initRpcClientHandler(final RpcClient rpcClientInner) {
             /*
              * Register Config Change /Config ReSync Handler

diff --git a/common/src/test/java/com/alibaba/nacos/common/utils/FuzzyGroupKeyPatternTest.java b/common/src/test/java/com/alibaba/nacos/common/utils/FuzzyGroupKeyPatternTest.java
@@ -36,7 +36,7 @@ public void testGetGroupKeyPattern() {
 
         String groupKeyPattern = FuzzyGroupKeyPattern.generatePattern(dataIdPattern, group, namespace);
 
-        assertEquals("exampleNamespace>>exampleGroup@@examplePattern*", groupKeyPattern);
+        assertEquals("exampleNamespace>>exampleGroup>>examplePattern*", groupKeyPattern);
     }
 
 }

diff --git a/config/src/test/java/com/alibaba/nacos/config/server/utils/MD5UtilTest.java b/config/src/test/java/com/alibaba/nacos/config/server/utils/MD5UtilTest.java
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
+import org.springframework.mock.env.MockEnvironment;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
@@ -47,22 +48,21 @@
 
 class MD5UtilTest {
 
-    MockedStatic<EnvUtil> envUtilMockedStatic;
-
     MockedStatic<ConfigCacheService> configCacheServiceMockedStatic;
 
     MockedStatic<Md5ComparatorDelegate> md5ComparatorDelegateMockedStatic;
 
     @BeforeEach
     void setUp() {
-        envUtilMockedStatic = Mockito.mockStatic(EnvUtil.class);
+        MockEnvironment environment = new MockEnvironment();
+        environment.setProperty("nacos.config.cache.type", "nacos");
+        EnvUtil.setEnvironment(environment);
         configCacheServiceMockedStatic = Mockito.mockStatic(ConfigCacheService.class);
         md5ComparatorDelegateMockedStatic = Mockito.mockStatic(Md5ComparatorDelegate.class);
     }
 
     @AfterEach
     void tearDown() {
-        envUtilMockedStatic.close();
         configCacheServiceMockedStatic.close();
         md5ComparatorDelegateMockedStatic.close();
     }
@@ -81,7 +81,6 @@ void testCompareMd5() {
         request.addHeader("Vipserver-Tag", "test");
         MockHttpServletResponse response = new MockHttpServletResponse();
 
-        envUtilMockedStatic.when(() -> EnvUtil.getProperty("nacos.config.cache.type", "nacos")).thenReturn("nacos");
         when(md5ComparatorDelegate.compareMd5(request, response, clientMd5Map)).thenReturn(new ArrayList<>());
         MD5Util.compareMd5(request, response, clientMd5Map);
 
@@ -138,7 +137,8 @@ void testCompareMd5ResultString() {
     void testGetClientMd5Map() {
 
         String configKeysString =
-                "test0" + MD5Util.WORD_SEPARATOR_CHAR + "test1" + MD5Util.WORD_SEPARATOR_CHAR + "test2" + MD5Util.LINE_SEPARATOR_CHAR;
+                "test0" + MD5Util.WORD_SEPARATOR_CHAR + "test1" + MD5Util.WORD_SEPARATOR_CHAR + "test2"
+                        + MD5Util.LINE_SEPARATOR_CHAR;
 
         Map<String, String> actualValueMap = MD5Util.getClientMd5Map(configKeysString);
 
@@ -149,8 +149,8 @@ void testGetClientMd5Map() {
     @Test
     void testGetClientMd5MapForNewProtocol() {
         String configKeysString =
-                "test0" + MD5Util.WORD_SEPARATOR_CHAR + "test1" + MD5Util.WORD_SEPARATOR_CHAR + "test2" + MD5Util.WORD_SEPARATOR_CHAR
-                        + "test3" + MD5Util.LINE_SEPARATOR_CHAR;
+                "test0" + MD5Util.WORD_SEPARATOR_CHAR + "test1" + MD5Util.WORD_SEPARATOR_CHAR + "test2"
+                        + MD5Util.WORD_SEPARATOR_CHAR + "test3" + MD5Util.LINE_SEPARATOR_CHAR;
 
         Map<String, String> actualValueMap = MD5Util.getClientMd5Map(configKeysString);
 

diff --git a/console/pom.xml b/console/pom.xml
@@ -112,7 +112,8 @@
                 <includes>
                     <include>META-INF/**</include>
                     <include>static/**</include>
-                    <include>application.properties</include>
+                    <include>nacos-console.properties</include>
+                    <include>nacos-console-banner.txt</include>
                     <include>org/apache/derby/modules.properties</include>
                     <include>librocksdbjni-${hints.os.rocksdb}</include>
                 </includes>

diff --git a/...src/test/java/com/alibaba/nacos/naming/core/v2/index/ClientServiceIndexesManagerTest.java b/...src/test/java/com/alibaba/nacos/naming/core/v2/index/ClientServiceIndexesManagerTest.java
@@ -120,7 +120,7 @@ void testSubscribeTypes() {
         List<Class<? extends Event>> classes = clientServiceIndexesManager.subscribeTypes();
 
         assertNotNull(classes);
-        assertEquals(7, classes.size());
+        assertEquals(5, classes.size());
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ public void testGetGroupKeyPattern() { @@
             String groupKeyPattern = FuzzyGroupKeyPattern.generatePattern(dataIdPattern, group, namespace);
-            assertEquals("exampleNamespace>>exampleGroup@@examplePattern*", groupKeyPattern);
+            assertEquals("exampleNamespace>>exampleGroup>>examplePattern*", groupKeyPattern);
         }
     }
@@ Expand Down @@