[#1537] Clearing the EOS service component commons-configuration (#1538) (#1539)

chengyouling · web-flow · commit 43a2b1d04520 · 2026-03-20T16:08:35.000+08:00
diff --git a/integration-tests/discovery-nacos-tests/order-consumer/src/main/java/com/huaweicloud/sample/OrderController.java b/integration-tests/discovery-nacos-tests/order-consumer/src/main/java/com/huaweicloud/sample/OrderController.java
@@ -16,7 +16,7 @@
  */
 package com.huaweicloud.sample;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.http.MediaType;
diff --git a/integration-tests/discovery-nacos-tests/price-provider/src/main/java/com/huaweicloud/sample/PriceController.java b/integration-tests/discovery-nacos-tests/price-provider/src/main/java/com/huaweicloud/sample/PriceController.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/integration-tests/discovery-servicecomb-tests/discovery-tests-client/src/test/java/com/huaweicloud/sample/GovernanceControllerIT.java b/integration-tests/discovery-servicecomb-tests/discovery-tests-client/src/test/java/com/huaweicloud/sample/GovernanceControllerIT.java
@@ -203,7 +203,8 @@ public void run() {
   }
 
   @Test
-  public void testCircuitBreakerHeader() {
+  public void testCircuitBreakerHeader() throws InterruptedException {
+    Thread.sleep(50000);
     AtomicBoolean notExpectedFailed = new AtomicBoolean(false);
     AtomicLong successCount = new AtomicLong(0);
     AtomicLong rejectedCount = new AtomicLong(0);
diff --git a/integration-tests/discovery-servicecomb-tests/order-consumer/src/main/java/com/huaweicloud/sample/OrderController.java b/integration-tests/discovery-servicecomb-tests/order-consumer/src/main/java/com/huaweicloud/sample/OrderController.java
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.http.MediaType;
diff --git a/integration-tests/discovery-servicecomb-tests/price-provider/src/main/java/com/huaweicloud/sample/PriceController.java b/integration-tests/discovery-servicecomb-tests/price-provider/src/main/java/com/huaweicloud/sample/PriceController.java
@@ -22,9 +22,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
      import spring-framework-bom. No need configure spring version. -->
     <spring-cloud.version>2021.0.9</spring-cloud.version>
     <spring-boot.version>2.7.18</spring-boot.version>
-    <servicecomb.version>2.8.30</servicecomb.version>
+    <servicecomb.version>2.8.31</servicecomb.version>
   </properties>
 
   <modules>
diff --git a/spring-cloud-huawei-common/pom.xml b/spring-cloud-huawei-common/pom.xml
@@ -68,13 +68,15 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
       <artifactId>foundation-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
@@ -83,6 +85,16 @@
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
       <artifactId>http-client-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-configuration</groupId>
+          <artifactId>commons-configuration</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
diff --git a/spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/ConfigEnvironmentPostProcessor.java b/spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/ConfigEnvironmentPostProcessor.java
@@ -0,0 +1,30 @@
+/*
+
+ * Copyright (C) 2020-2026 Huawei Technologies Co., Ltd. All rights reserved.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.huaweicloud.common;
+
+import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+public class ConfigEnvironmentPostProcessor implements EnvironmentPostProcessor {
+  @Override
+  public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
+    LegacyPropertyFactory.setEnvironment(environment);
+  }
+}
diff --git a/spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/adapters/webflux/InvocationContextWebFilter.java b/spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/adapters/webflux/InvocationContextWebFilter.java
@@ -17,7 +17,7 @@
 
 package com.huaweicloud.common.adapters.webflux;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.web.reactive.filter.OrderedWebFilter;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
diff --git a/spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/adapters/webmvc/InvocationContextFilter.java b/spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/adapters/webmvc/InvocationContextFilter.java
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 
 import com.huaweicloud.common.configration.dynamic.ContextProperties;
diff --git a/spring-cloud-huawei-common/src/main/resources/META-INF/spring.factories b/spring-cloud-huawei-common/src/main/resources/META-INF/spring.factories
@@ -31,3 +31,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.huaweicloud.common.configration.DynamicPropertiesConfiguration,\
   com.huaweicloud.common.transport.ClientTransportConfiguration,\
   com.huaweicloud.common.metrics.MetricsConfiguration
+
+org.springframework.boot.env.EnvironmentPostProcessor=\
+  com.huaweicloud.common.ConfigEnvironmentPostProcessor
diff --git a/spring-cloud-huawei-dependencies/pom.xml b/spring-cloud-huawei-dependencies/pom.xml
@@ -50,6 +50,7 @@
     <nacos.client.version>2.3.0</nacos.client.version>
     <alibaba.context.support.version>1.0.11</alibaba.context.support.version>
     <spring-framework.version>5.3.39</spring-framework.version>
+    <netty.version>4.1.131.Final</netty.version>
   </properties>
 
   <dependencyManagement>
@@ -71,6 +72,15 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <scope>import</scope>
+        <version>${netty.version}</version>
+        <type>pom</type>
+      </dependency>
+
+      <!-- core dependencies of spring cloud huawei, put it in the begging -->
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
diff --git a/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/adapters/loadbalancer/DecorateServiceInstanceListSupplier.java b/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/adapters/loadbalancer/DecorateServiceInstanceListSupplier.java
@@ -23,6 +23,8 @@
 
 import javax.annotation.PostConstruct;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.Request;
@@ -33,6 +35,7 @@
 
 @SuppressWarnings({"rawtype", "unchecked"})
 public class DecorateServiceInstanceListSupplier implements ServiceInstanceListSupplier {
+  private static final Logger LOGGER = LoggerFactory.getLogger(DecorateServiceInstanceListSupplier.class);
 
   private List<ServiceInstanceFilter> filters;
 
@@ -81,6 +84,9 @@ private List<ServiceInstance> filter(List<ServiceInstance> instances, @SuppressW
     for (ServiceInstanceFilter instanceFilter : filters) {
       filteredInstances = instanceFilter.filter(this, filteredInstances, request);
     }
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("number of final instances after filtering is: {}.", filteredInstances.size());
+    }
     return filteredInstances;
   }
 }
diff --git a/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/authentication/AuthRequestExtractorUtils.java b/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/authentication/AuthRequestExtractorUtils.java
@@ -18,7 +18,7 @@
 package com.huaweicloud.governance.authentication;
 
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 
 import com.huaweicloud.common.context.InvocationContext;
diff --git a/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/authentication/RSATokenCheckUtils.java b/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/authentication/RSATokenCheckUtils.java
@@ -19,7 +19,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.foundation.common.utils.KeyPairUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/authentication/whiteBlack/WhiteBlackAccessController.java b/spring-cloud-huawei-governance/src/main/java/com/huaweicloud/governance/authentication/whiteBlack/WhiteBlackAccessController.java
@@ -17,7 +17,7 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/spring-cloud-huawei-nacos/spring-cloud-huawei-nacos-discovery/src/main/java/com/huaweicloud/nacos/discovery/registry/NacosMicroserviceHandler.java b/spring-cloud-huawei-nacos/spring-cloud-huawei-nacos-discovery/src/main/java/com/huaweicloud/nacos/discovery/registry/NacosMicroserviceHandler.java
@@ -17,13 +17,14 @@
 
 package com.huaweicloud.nacos.discovery.registry;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.env.Environment;
 
@@ -71,9 +72,8 @@ public static Instance createMicroserviceInstance(NacosDiscoveryProperties prope
     return instance;
   }
 
-  public static Map<String, String> createMicroserviceMetadata() {
-    EnvironmentConfiguration envConfig = new EnvironmentConfiguration();
-    String[] instancePropArray = envConfig.getStringArray(SERVICE_PROPS);
+  public static Map<String, String> createMicroserviceMetadata(Environment environment) {
+    String[] instancePropArray = parseArrayValue(environment.getProperty(SERVICE_PROPS)).toArray(new String[0]);
     if (instancePropArray.length != 0) {
       return parseProps(instancePropArray);
     }
@@ -101,15 +101,26 @@ private static Map<String, String> genCasProperties(Environment environment) {
         !StringUtils.isEmpty(environment.getProperty(environment.getProperty(VERSION_MAPPING)))) {
       properties.put("version", environment.getProperty(environment.getProperty(VERSION_MAPPING)));
     }
-    EnvironmentConfiguration envConfig = new EnvironmentConfiguration();
-    String[] instancePropArray = envConfig.getStringArray(INSTANCE_PROPS);
+    String[] instancePropArray = parseArrayValue(environment.getProperty(INSTANCE_PROPS)).toArray(new String[0]);
     if (instancePropArray.length != 0) {
       properties.putAll(parseProps(instancePropArray));
     }
 
     return properties;
   }
 
+  public static List<String> parseArrayValue(String value) {
+    if (value == null) {
+      return new ArrayList<>(0);
+    }
+    String[] tokens = value.split(",");
+    List<String> result = new ArrayList<>(tokens.length);
+    for (String t : tokens) {
+      result.add(t.trim());
+    }
+    return result;
+  }
+
   private static Map<String, String> parseProps(String... value) {
     return Arrays.stream(value).map(v -> v.split(":"))
         .filter(v -> v.length == 2)
diff --git a/spring-cloud-huawei-nacos/spring-cloud-huawei-nacos-discovery/src/main/java/com/huaweicloud/nacos/discovery/registry/NacosServiceRegistry.java b/spring-cloud-huawei-nacos/spring-cloud-huawei-nacos-discovery/src/main/java/com/huaweicloud/nacos/discovery/registry/NacosServiceRegistry.java
@@ -51,12 +51,15 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
 
   private final EventBus eventBus;
 
+  private final Environment environment;
+
   public NacosServiceRegistry(List<NamingServiceManager> namingServiceManagers,
       NacosDiscoveryProperties nacosDiscoveryProperties, Environment environment) {
     this.nacosDiscoveryProperties = nacosDiscoveryProperties;
     this.namingServiceManagers = namingServiceManagers.stream().sorted(Comparator.comparingInt(Ordered::getOrder))
         .collect(Collectors.toList());
     this.instance = NacosMicroserviceHandler.createMicroserviceInstance(nacosDiscoveryProperties, environment);
+    this.environment = environment;
     eventBus = EventManager.getEventBus();
   }
 
@@ -90,7 +93,7 @@ public void register(Registration registration) {
   }
 
   private void updateServiceMetadata(NamingMaintainService maintainService, String serviceId, String group) {
-    Map<String, String> serviceMetadata = NacosMicroserviceHandler.createMicroserviceMetadata();
+    Map<String, String> serviceMetadata = NacosMicroserviceHandler.createMicroserviceMetadata(environment);
     if (!CollectionUtils.isEmpty(serviceMetadata)) {
       tryUpdateService(maintainService, serviceId, group, serviceMetadata);
     }
diff --git a/spring-cloud-huawei-service-engine/service-engine-common/pom.xml b/spring-cloud-huawei-service-engine/service-engine-common/pom.xml
@@ -67,13 +67,15 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
       <artifactId>foundation-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
@@ -82,6 +84,16 @@
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
       <artifactId>http-client-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-configuration</groupId>
+          <artifactId>commons-configuration</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
diff --git a/spring-cloud-huawei-service-engine/service-engine-dashboard/pom.xml b/spring-cloud-huawei-service-engine/service-engine-dashboard/pom.xml
@@ -57,6 +57,20 @@
     <dependency>
       <groupId>org.apache.servicecomb</groupId>
       <artifactId>dashboard-client</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-configuration</groupId>
+          <artifactId>commons-configuration</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
     </dependency>
     <dependency>
       <groupId>io.github.resilience4j</groupId>
diff --git a/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/MicroserviceHandler.java b/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/MicroserviceHandler.java
diff --git a/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/ServiceCombDiscoveryClient.java b/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/ServiceCombDiscoveryClient.java
diff --git a/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/registry/ServiceCombRegistration.java b/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/registry/ServiceCombRegistration.java
diff --git a/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/registry/ServiceCombRegistryAutoConfiguration.java b/spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/registry/ServiceCombRegistryAutoConfiguration.java

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,8 @@ public void run() {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`@Test`
`206`		`- public void testCircuitBreakerHeader() {`
	`206`	`+ public void testCircuitBreakerHeader() throws InterruptedException {`
	`207`	`+ Thread.sleep(50000);`
`207`	`208`	`AtomicBoolean notExpectedFailed = new AtomicBoolean(false);`
`208`	`209`	`AtomicLong successCount = new AtomicLong(0);`
`209`	`210`	`AtomicLong rejectedCount = new AtomicLong(0);`