This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit c2437e376a2350643391f8e63b9c281e11ad3b4e
Author: liubao <bi...@qq.com>
AuthorDate: Sat Oct 7 18:02:53 2023 +0800
[SCB-2008]remove archaius dependency: remove ArchaiusUtils usage
---
.../rest/RestProducerInvocationCreatorTest.java | 2 -
.../common/rest/TestRestEngineSchemaListener.java | 2 -
.../codec/param/TestQueryProcessorCreator.java | 2 -
.../rest/definition/TestRestOperationMeta.java | 2 -
.../filter/inner/RestServerCodecFilterTest.java | 3 -
.../common/rest/locator/TestMicroservicePaths.java | 2 -
.../rest/locator/TestServicePathManager.java | 2 -
.../core/TestConfigurationSpringInitializer.java | 3 -
.../core/TestSCBApplicationListener.java | 2 -
.../core/executor/TestGroupExecutor.java | 2 -
.../discovery/TestEndpointDiscoveryFilter.java | 6 +-
.../apache/servicecomb/demo/jaxrs/JaxrsClient.java | 10 +--
.../pojoDefault/DefaultModelServiceClient.java | 4 +-
.../client/validation/ValidationServiceClient.java | 8 +--
.../servicecomb/demo/pojo/client/PojoClient.java | 8 +--
.../demo/CategorizedTestCaseRunner.java | 4 +-
.../servicecomb/demo/CodeFirstRestTemplate.java | 2 +-
.../springboot/pojo/client/PojoClientTest.java | 4 +-
.../demo/springmvc/SpringmvcClient.java | 4 +-
.../servicecomb/deployment/TestDeployment.java | 2 -
.../TestConfigCenterDefaultDeploymentProvider.java | 13 ++--
.../TestKieCenterDefaultDeploymentProvider.java | 12 ++--
.../config/ConfigurationChangedEvent.java | 6 +-
.../config/InMemoryDynamicPropertiesSource.java | 18 +++++-
.../registry/discovery/TestDiscoveryTree.java | 2 -
.../foundation/vertx/TestVertxUtils.java | 3 -
.../TestConsumerAbortFaultFilter.java | 28 --------
.../servicecomb/qps/QpsControllerManagerTest.java | 1 +
.../loadbalance/TestLoadBalanceCreator.java | 3 -
.../loadbalance/TestLoadBalanceFilter.java | 2 -
.../loadbalance/TestLoadBalanceFilter2.java | 6 --
.../authentication/TestAccessController.java | 2 -
.../TestAuthenticationBootListener.java | 2 -
.../provider/TestProviderTokenManager.java | 4 --
.../inspector/internal/InspectorBootListener.java | 11 +---
.../inspector/internal/InspectorConfiguration.java | 6 +-
.../inspector/internal/InspectorImpl.java | 75 ----------------------
.../internal/TestInspectorBootListener.java | 6 +-
.../inspector/internal/TestInspectorImpl.java | 44 -------------
.../metrics/core/TestHealthBootListener.java | 3 -
.../core/publish/TestDefaultLogPublisher.java | 6 --
.../core/publish/TestSlowInvocationLogger.java | 5 +-
.../prometheus/TestPrometheusPublisher.java | 8 +--
.../pojo/reference/PojoReferenceMetaTest.java | 4 --
.../pojo/reference/TestRpcReferenceProcessor.java | 4 --
.../generator/core/TestSwaggerGenerator.java | 1 +
.../rest/vertx/TestRestServerVerticle.java | 2 -
.../rest/vertx/TestVertxRestDispatcher.java | 4 +-
48 files changed, 73 insertions(+), 282 deletions(-)
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
index 88f340566..ea326b912 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
@@ -37,7 +37,6 @@ import
org.apache.servicecomb.core.definition.MicroserviceMeta;
import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.definition.SchemaMeta;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
@@ -97,7 +96,6 @@ public class RestProducerInvocationCreatorTest {
@AfterAll
public static void afterClass() {
engine.destroy();
- ArchaiusUtils.resetConfig();
}
@BeforeEach
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
index 7efbbeee8..4f782eeb9 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.core.executor.ExecutorManager;
import org.apache.servicecomb.core.transport.TransportManager;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
@@ -71,7 +70,6 @@ public class TestRestEngineSchemaListener {
@AfterAll
public static void teardown() {
scbEngine.destroy();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
index d1f98da4e..a75e1df2b 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
@@ -19,7 +19,6 @@ package org.apache.servicecomb.common.rest.codec.param;
import
org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -96,6 +95,5 @@ public class TestQueryProcessorCreator {
result = (String) processor.convertValue(null,
TypeFactory.defaultInstance().constructType(String.class));
result = (String) processor.getValue(request);
Assertions.assertNull(result);
- ArchaiusUtils.resetConfig();
}
}
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
index f5e5a88a9..86662b3a2 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
@@ -35,7 +35,6 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.definition.SchemaMeta;
import org.apache.servicecomb.core.executor.ExecutorManager;
import org.apache.servicecomb.core.transport.TransportManager;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -191,7 +190,6 @@ public class TestRestOperationMeta {
@AfterAll
public static void classTeardown() {
scbEngine.destroy();
- ArchaiusUtils.resetConfig();
}
private void findOperation(String operationId) {
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
index 2b48ce520..8ac941cd8 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
@@ -41,7 +41,6 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.definition.SchemaMeta;
import org.apache.servicecomb.core.filter.FilterNode;
import org.apache.servicecomb.core.invocation.InvocationFactory;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import
org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
@@ -99,7 +98,6 @@ public class RestServerCodecFilterTest {
@BeforeAll
public static void beforeClass() {
- ArchaiusUtils.resetConfig();
ConfigUtil.installDynamicConfig();
engine = SCBBootstrap.createSCBEngineForTest();
@@ -113,7 +111,6 @@ public class RestServerCodecFilterTest {
@AfterAll
public static void afterClass() {
engine.destroy();
- ArchaiusUtils.resetConfig();
}
@BeforeEach
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
index 442368b0a..e1d53e7f5 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.core.executor.ExecutorManager;
import org.apache.servicecomb.core.transport.TransportManager;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -72,7 +71,6 @@ public class TestMicroservicePaths {
@AfterAll
public static void teardown() {
scbEngine.destroy();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
index 85476f627..f7843353e 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.core.executor.ExecutorManager;
import org.apache.servicecomb.core.transport.TransportManager;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import org.apache.servicecomb.foundation.common.utils.ClassLoaderScopeContext;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -62,7 +61,6 @@ public class TestServicePathManager {
@AfterEach
public void tearDown() {
scbEngine.destroy();
- ArchaiusUtils.resetConfig();
ClassLoaderScopeContext.clearClassLoaderScopeProperty();
}
diff --git
a/core/src/test/java/org/apache/servicecomb/core/TestConfigurationSpringInitializer.java
b/core/src/test/java/org/apache/servicecomb/core/TestConfigurationSpringInitializer.java
index e6c448657..a5fbd6f2c 100644
---
a/core/src/test/java/org/apache/servicecomb/core/TestConfigurationSpringInitializer.java
+++
b/core/src/test/java/org/apache/servicecomb/core/TestConfigurationSpringInitializer.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.servicecomb.config.ConfigUtil;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +41,6 @@ public class TestConfigurationSpringInitializer {
Configurator.setRootLevel(Level.OFF);
ConfigUtil.clearExtraConfig();
- ArchaiusUtils.resetConfig();
Configurator.setRootLevel(Level.INFO);
}
@@ -50,7 +48,6 @@ public class TestConfigurationSpringInitializer {
@AfterEach
public void afterTest() {
ConfigUtil.clearExtraConfig();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/core/src/test/java/org/apache/servicecomb/core/TestSCBApplicationListener.java
b/core/src/test/java/org/apache/servicecomb/core/TestSCBApplicationListener.java
index ec4045741..37eebd201 100644
---
a/core/src/test/java/org/apache/servicecomb/core/TestSCBApplicationListener.java
+++
b/core/src/test/java/org/apache/servicecomb/core/TestSCBApplicationListener.java
@@ -21,7 +21,6 @@ import static
org.apache.servicecomb.core.SCBEngine.DEFAULT_TURN_DOWN_STATUS_WAI
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +37,6 @@ public class TestSCBApplicationListener {
@AfterAll
public static void classTeardown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
b/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
index f44496d8a..d92ca3bb2 100644
---
a/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
+++
b/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
@@ -55,7 +54,6 @@ public class TestGroupExecutor {
@AfterAll
public static void teardown() {
- ArchaiusUtils.resetConfig();
}
Environment environment = Mockito.mock(Environment.class);
diff --git
a/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
b/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
index a445b5967..cc79ba2f6 100644
---
a/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
+++
b/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
@@ -17,14 +17,12 @@
package org.apache.servicecomb.core.registry.discovery;
-import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.core.transport.TransportManager;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.discovery.DiscoveryContext;
import org.apache.servicecomb.registry.discovery.StatefulDiscoveryInstance;
import org.junit.jupiter.api.AfterEach;
@@ -42,13 +40,11 @@ public class TestEndpointDiscoveryFilter {
@BeforeEach
public void setup() {
- ArchaiusUtils.resetConfig();
- ConfigUtil.installDynamicConfig();
+
}
@AfterEach
public void teardown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
index e54a8f000..133760548 100644
---
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
+++
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.http.HttpStatus;
import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory;
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.demo.CategorizedTestCaseRunner;
import org.apache.servicecomb.demo.CodeFirstRestTemplate;
import org.apache.servicecomb.demo.DemoConst;
@@ -35,7 +36,6 @@ import
org.apache.servicecomb.demo.jaxrs.client.pojoDefault.DefaultModelServiceC
import
org.apache.servicecomb.demo.jaxrs.client.validation.ValidationServiceClient;
import org.apache.servicecomb.demo.validator.Student;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
import org.apache.servicecomb.springboot.starter.EnableServiceComb;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
@@ -105,7 +105,7 @@ public class JaxrsClient {
private static void testOnlyRest(RestTemplate template) {
String microserviceName = "jaxrs";
String cseUrlPrefix = "cse://" + microserviceName;
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, "rest");
+ InMemoryDynamicPropertiesSource.update("servicecomb.references.transport."
+ microserviceName, "rest");
testGetRest(template, cseUrlPrefix);
testSpringMvcDefaultValuesJavaPrimitiveRest(templateNew);
@@ -114,7 +114,7 @@ public class JaxrsClient {
private static void testCompute(RestTemplate template) throws Exception {
String microserviceName = "jaxrs";
for (String transport : DemoConst.transports) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport." +
microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
String cseUrlPrefix = "cse://" + microserviceName;
@@ -131,7 +131,7 @@ public class JaxrsClient {
private static void testValidator(RestTemplate template) {
String microserviceName = "jaxrs";
for (String transport : DemoConst.transports) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport." +
microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
String cseUrlPrefix = "cse://" + microserviceName + "/validator/";
@@ -198,7 +198,7 @@ public class JaxrsClient {
private static void testJaxRSDefaultValuesAllTransport(RestTemplate
template) {
String microserviceName = "jaxrs";
for (String transport : DemoConst.transports) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport." +
microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
String cseUrlPrefix = "cse://" + microserviceName +
"/JaxRSDefaultValues/";
diff --git
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/pojoDefault/DefaultModelServiceClient.java
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/pojoDefault/DefaultModelServiceClient.java
index 99744957e..d5ef35517 100644
---
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/pojoDefault/DefaultModelServiceClient.java
+++
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/pojoDefault/DefaultModelServiceClient.java
@@ -17,9 +17,9 @@
package org.apache.servicecomb.demo.jaxrs.client.pojoDefault;
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.demo.TestMgr;
import
org.apache.servicecomb.demo.jaxrs.server.pojoDefault.DefaultResponseModel;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
import org.springframework.web.client.RestTemplate;
@@ -30,7 +30,7 @@ public class DefaultModelServiceClient {
public static void run() {
// highway do not support this feature
- ArchaiusUtils.setProperty("servicecomb.references.transport.jaxrs",
"rest");
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport.jaxrs",
"rest");
testDefaultModelService();
}
diff --git
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
index d36bc0cfa..6ca9d5b7d 100644
---
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
+++
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
@@ -19,17 +19,17 @@ package org.apache.servicecomb.demo.jaxrs.client.validation;
import java.util.ArrayList;
-import jakarta.ws.rs.core.Response.Status;
-
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.demo.jaxrs.server.validation.ValidationModel;
import org.apache.servicecomb.demo.validator.Teacher;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.springframework.web.client.RestTemplate;
+import jakarta.ws.rs.core.Response.Status;
+
public class ValidationServiceClient {
private static RestTemplate template = RestTemplateBuilder.create();
@@ -37,7 +37,7 @@ public class ValidationServiceClient {
public static void run() {
// highway do not support this feature
- ArchaiusUtils.setProperty("servicecomb.references.transport.jaxrs",
"rest");
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport.jaxrs",
"rest");
testValidation();
}
diff --git
a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
index ad70588cf..7fc990aac 100644
---
a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
+++
b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
@@ -26,6 +26,7 @@ import java.util.Set;
import java.util.concurrent.ForkJoinPool;
import java.util.stream.IntStream;
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.provider.consumer.InvokerUtils;
import org.apache.servicecomb.demo.CategorizedTestCaseRunner;
@@ -38,7 +39,6 @@ import org.apache.servicecomb.demo.smartcare.Application;
import org.apache.servicecomb.demo.smartcare.Group;
import org.apache.servicecomb.demo.smartcare.SmartCare;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.client.http.HttpClients;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.apache.servicecomb.springboot.starter.EnableServiceComb;
@@ -115,7 +115,7 @@ public class PojoClient {
String microserviceName = "pojo";
for (String transport : DemoConst.transports) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport." +
microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
LOGGER.info("test {}, transport {}", microserviceName, transport);
@@ -125,9 +125,9 @@ public class PojoClient {
// This test case shows destroy of WeightedResponseTimeRule timer task.
after test finished will not print:
// "Weight adjusting job started" and thread
"NFLoadBalancer-serverWeightTimer-unknown" destroyed.
- ArchaiusUtils.setProperty("servicecomb.loadbalance.strategy.name",
"WeightedResponse");
+
InMemoryDynamicPropertiesSource.update("servicecomb.loadbalance.strategy.name",
"WeightedResponse");
testStringArray(test);
- ArchaiusUtils.setProperty("servicecomb.loadbalance.strategy.name",
"RoundRobin");
+
InMemoryDynamicPropertiesSource.update("servicecomb.loadbalance.strategy.name",
"RoundRobin");
testStringArray(test);
boolean checkerDestroyed = true;
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
index 531be9280..acb821903 100644
---
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
+++
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
@@ -19,8 +19,8 @@ package org.apache.servicecomb.demo;
import java.util.Map;
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ public class CategorizedTestCaseRunner {
}
public static void changeTransport(String microserviceName, String
transport) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+ InMemoryDynamicPropertiesSource.update("servicecomb.references.transport."
+ microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
}
}
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java
index dfdafb0d8..681b5c0a0 100644
---
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java
+++
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java
@@ -50,7 +50,7 @@ public class CodeFirstRestTemplate {
}
protected void changeTransport(String microserviceName, String transport) {
-
InMemoryDynamicPropertiesSource.DYNAMIC.put("servicecomb.references.transport."
+ microserviceName, transport);
+ InMemoryDynamicPropertiesSource.update("servicecomb.references.transport."
+ microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
}
diff --git
a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/client/PojoClientTest.java
b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/client/PojoClientTest.java
index 05fdfd776..e087b0b62 100644
---
a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/client/PojoClientTest.java
+++
b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/client/PojoClientTest.java
@@ -21,11 +21,11 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.core.provider.consumer.InvokerUtils;
import org.apache.servicecomb.demo.springboot.pojo.server.schema.server.Test;
import
org.apache.servicecomb.demo.springboot.pojo.server.schema.server.TestRequest;
import org.apache.servicecomb.demo.springboot.pojo.server.schema.server.User;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ public class PojoClientTest {
String microserviceName = "spring-boot-pojo-server";
for (String transport : DemoConst.transports) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+
InMemoryDynamicPropertiesSource.update("servicecomb.references.transport." +
microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
LOGGER.info("test {}, transport {}", microserviceName, transport);
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/SpringmvcClient.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/SpringmvcClient.java
index 3b10de632..a9902b524 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/SpringmvcClient.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/SpringmvcClient.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.http.HttpStatus;
+import org.apache.servicecomb.config.InMemoryDynamicPropertiesSource;
import org.apache.servicecomb.demo.CategorizedTestCaseRunner;
import org.apache.servicecomb.demo.DemoConst;
import org.apache.servicecomb.demo.TestMgr;
@@ -31,7 +32,6 @@ import
org.apache.servicecomb.demo.springmvc.client.CodeFirstRestTemplateSpringm
import org.apache.servicecomb.demo.springmvc.client.ThirdSvc.ThirdSvcClient;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.client.http.HttpClients;
import org.apache.servicecomb.provider.springmvc.reference.CseRestTemplate;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
@@ -83,7 +83,7 @@ public class SpringmvcClient {
}
private static void changeTransport(String microserviceName, String
transport) {
- ArchaiusUtils.setProperty("servicecomb.references.transport." +
microserviceName, transport);
+ InMemoryDynamicPropertiesSource.update("servicecomb.references.transport."
+ microserviceName, transport);
TestMgr.setMsg(microserviceName, transport);
}
diff --git
a/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
b/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
index 41d6476bd..99637c4eb 100644
---
a/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
+++
b/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.deployment;
import org.apache.servicecomb.config.ConfigUtil;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -26,7 +25,6 @@ import org.junit.jupiter.api.Test;
public class TestDeployment {
@AfterEach
public void tearDown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/cc/TestConfigCenterDefaultDeploymentProvider.java
b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/cc/TestConfigCenterDefaultDeploymentProvider.java
index be3c4b207..51af1da3f 100644
---
a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/cc/TestConfigCenterDefaultDeploymentProvider.java
+++
b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/cc/TestConfigCenterDefaultDeploymentProvider.java
@@ -18,10 +18,8 @@
package org.apache.servicecomb.config.cc;
import org.apache.servicecomb.config.ConfigUtil;
-import org.apache.servicecomb.config.cc.ConfigCenterDefaultDeploymentProvider;
import org.apache.servicecomb.deployment.Deployment;
import org.apache.servicecomb.deployment.SystemBootstrapInfo;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -30,18 +28,17 @@ import org.junit.jupiter.api.Test;
public class TestConfigCenterDefaultDeploymentProvider {
@BeforeEach
public void start() {
- ArchaiusUtils.resetConfig();
}
@AfterEach
public void tearDown() {
- ArchaiusUtils.resetConfig();
}
@Test
public void testConfiguration() {
ConfigCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
- SystemBootstrapInfo info =
Deployment.getSystemBootStrapInfo(ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
+ SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(
+ ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
Assertions.assertEquals("https://172.16.8.7:30103";,
info.getAccessURL().get(0));
Assertions.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
}
@@ -50,7 +47,8 @@ public class TestConfigCenterDefaultDeploymentProvider {
public void testConfigurationEnv() {
System.setProperty("servicecomb.config.client.serverUri",
"https://localhost:9988";);
ConfigCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
- SystemBootstrapInfo info =
Deployment.getSystemBootStrapInfo(ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
+ SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(
+ ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
Assertions.assertEquals("https://localhost:9988";,
info.getAccessURL().get(0));
System.getProperties().remove("servicecomb.config.client.serverUri");
}
@@ -59,7 +57,8 @@ public class TestConfigCenterDefaultDeploymentProvider {
public void testConfigurationEnvTwo() {
System.setProperty("servicecomb.config.client.serverUri",
"https://localhost:9988,https://localhost:9987";);
ConfigCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
- SystemBootstrapInfo info =
Deployment.getSystemBootStrapInfo(ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
+ SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(
+ ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
Assertions.assertEquals(2, info.getAccessURL().size());
Assertions.assertEquals("https://localhost:9988";,
info.getAccessURL().get(0));
Assertions.assertEquals("https://localhost:9987";,
info.getAccessURL().get(1));
diff --git
a/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
b/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
index 805336c23..fa659843d 100644
---
a/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
+++
b/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.config.kie.collect;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.deployment.Deployment;
import org.apache.servicecomb.deployment.SystemBootstrapInfo;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -29,18 +28,17 @@ import org.junit.jupiter.api.Test;
public class TestKieCenterDefaultDeploymentProvider {
@BeforeEach
public void start() {
- ArchaiusUtils.resetConfig();
}
@AfterEach
public void tearDown() {
- ArchaiusUtils.resetConfig();
}
@Test
public void testConfiguration() {
KieCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
- SystemBootstrapInfo info =
Deployment.getSystemBootStrapInfo(KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
+ SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(
+ KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
Assertions.assertEquals("https://172.16.8.7:30110";,
info.getAccessURL().get(0));
Assertions.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
}
@@ -49,7 +47,8 @@ public class TestKieCenterDefaultDeploymentProvider {
public void testConfigurationEnv() {
System.setProperty("servicecomb.kie.serverUri", "https://localhost:30110";);
KieCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
- SystemBootstrapInfo info =
Deployment.getSystemBootStrapInfo(KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
+ SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(
+ KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
Assertions.assertEquals("https://localhost:30110";,
info.getAccessURL().get(0));
System.getProperties().remove("servicecomb.kie.serverUri");
}
@@ -59,7 +58,8 @@ public class TestKieCenterDefaultDeploymentProvider {
System.setProperty("servicecomb.kie.serverUri",
"http://127.0.0.1:30110,http://127.0.0.2:30110";);
KieCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
- SystemBootstrapInfo info =
Deployment.getSystemBootStrapInfo(KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
+ SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(
+ KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
Assertions.assertEquals(2, info.getAccessURL().size());
Assertions.assertEquals("http://127.0.0.1:30110";,
info.getAccessURL().get(0));
Assertions.assertEquals("http://127.0.0.2:30110";,
info.getAccessURL().get(1));
diff --git
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationChangedEvent.java
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationChangedEvent.java
index ff56ae202..ba2590c17 100644
---
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationChangedEvent.java
+++
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationChangedEvent.java
@@ -68,11 +68,15 @@ public class ConfigurationChangedEvent {
return event;
}
- private static ConfigurationChangedEvent createIncremental(Map<String,
Object> added, Map<String, Object> updated,
+ public static ConfigurationChangedEvent createIncremental(Map<String,
Object> added, Map<String, Object> updated,
Map<String, Object> deleted, boolean changed) {
return new ConfigurationChangedEvent(added, updated, deleted, changed);
}
+ public static ConfigurationChangedEvent createIncremental(Map<String,
Object> updated) {
+ return new ConfigurationChangedEvent(new HashMap<>(), updated, new
HashMap<>(), true);
+ }
+
public final Map<String, Object> getAdded() {
return added;
}
diff --git
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java
index 515d5ae82..e9a450f92 100644
---
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java
+++
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java
@@ -19,14 +19,18 @@ package org.apache.servicecomb.config;
import java.util.HashMap;
import java.util.Map;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.Environment;
import org.springframework.core.env.MapPropertySource;
+/**
+ * This DynamicPropertiesSource is created for easier system tests.
+ */
public class InMemoryDynamicPropertiesSource implements
DynamicPropertiesSource<Map<String, Object>> {
public static final String SOURCE_NAME = "in-memory";
- public static final Map<String, Object> DYNAMIC = new HashMap<>();
+ private static final Map<String, Object> DYNAMIC = new HashMap<>();
@Override
public EnumerablePropertySource<Map<String, Object>> create(Environment
environment) {
@@ -37,4 +41,16 @@ public class InMemoryDynamicPropertiesSource implements
DynamicPropertiesSource<
public int getOrder() {
return -100;
}
+
+ public static void update(String key, Object value) {
+ DYNAMIC.put(key, value);
+
+ HashMap<String, Object> updated = new HashMap<>();
+ updated.put(key, value);
+ EventManager.post(ConfigurationChangedEvent.createIncremental(updated));
+ }
+
+ public static void reset() {
+ DYNAMIC.clear();
+ }
}
diff --git
a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
index c68592fbd..1d161792c 100644
---
a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
+++
b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
@@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.foundation.common.cache.VersionedCache;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.DiscoveryManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -50,7 +49,6 @@ public class TestDiscoveryTree {
@AfterEach
public void tearDown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxUtils.java
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxUtils.java
index e675efa7c..399d0b1f6 100644
---
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxUtils.java
+++
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxUtils.java
@@ -26,7 +26,6 @@ import java.util.concurrent.CountDownLatch;
import org.apache.commons.io.FileUtils;
import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.stream.BufferInputStream;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -86,8 +85,6 @@ public class TestVertxUtils {
VertxUtils.getOrCreateVertxByName("testCreateVertxWithFileCPResolvingTrue",
null);
Assertions.assertFalse(isCacheFileExists());
VertxUtils.blockCloseVertxByName("testCreateVertxWithFileCPResolvingTrue");
-
- ArchaiusUtils.resetConfig();
}
private void deleteCacheFile() {
diff --git
a/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/TestConsumerAbortFaultFilter.java
b/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/TestConsumerAbortFaultFilter.java
index fbc0409ee..d44fd849b 100644
---
a/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/TestConsumerAbortFaultFilter.java
+++
b/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/TestConsumerAbortFaultFilter.java
@@ -25,7 +25,6 @@ import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.core.filter.FilterNode;
import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
@@ -37,8 +36,6 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.core.env.Environment;
-import com.netflix.config.DynamicProperty;
-
public class TestConsumerAbortFaultFilter {
private Invocation invocation;
@@ -140,17 +137,6 @@ public class TestConsumerAbortFaultFilter {
@Test
public void injectFaultNoError() throws Exception {
- ArchaiusUtils
-
.setProperty("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.httpStatus",
"421");
-
ArchaiusUtils.setProperty("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.percent",
"0");
-
- Assertions.assertEquals("421", DynamicProperty
-
.getInstance("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.httpStatus")
- .getString());
- Assertions.assertEquals("0", DynamicProperty
-
.getInstance("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.percent")
- .getString());
-
ConsumerAbortFaultFilter abortFault = new ConsumerAbortFaultFilter();
FilterNode filterNode = Mockito.mock(FilterNode.class);
Mockito.when(filterNode.onFilter(invocation))
@@ -161,13 +147,6 @@ public class TestConsumerAbortFaultFilter {
@Test
public void injectFaultNoPercentageConfig() throws Exception {
- ArchaiusUtils
-
.setProperty("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.percent",
null);
-
- Assertions.assertNull(DynamicProperty
-
.getInstance("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.percent")
- .getString());
-
ConsumerAbortFaultFilter abortFault = new ConsumerAbortFaultFilter();
FilterNode filterNode = Mockito.mock(FilterNode.class);
Mockito.when(filterNode.onFilter(invocation))
@@ -178,13 +157,6 @@ public class TestConsumerAbortFaultFilter {
@Test
public void injectFaultNoErrorCodeConfig() throws Exception {
- ArchaiusUtils
-
.setProperty("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.percent",
"10");
-
- Assertions.assertEquals("10", DynamicProperty
-
.getInstance("servicecomb.governance.Consumer._global.policy.fault.protocols.rest.abort.percent")
- .getString());
-
ConsumerAbortFaultFilter abortFault = new ConsumerAbortFaultFilter();
FilterNode filterNode = Mockito.mock(FilterNode.class);
Mockito.when(filterNode.onFilter(invocation))
diff --git
a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
index 8554968aa..8f4aaf135 100644
---
a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
+++
b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
@@ -32,6 +32,7 @@ public class QpsControllerManagerTest {
@BeforeEach
public void beforeTest() {
+ // TODO: fix DynamicProperty
ArchaiusUtils.resetConfig();
}
diff --git
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceCreator.java
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceCreator.java
index 3d329333c..71e74d76c 100644
---
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceCreator.java
+++
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceCreator.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.Transport;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.api.DiscoveryInstance;
import org.apache.servicecomb.registry.discovery.StatefulDiscoveryInstance;
import org.junit.Test;
@@ -237,11 +236,9 @@ public class TestLoadBalanceCreator {
long time = Deencapsulation.getField(rule, "lastAccessedTime");
Deencapsulation.setField(rule, "lastAccessedTime", time - 1000 * 300);
-
ArchaiusUtils.setProperty("cse.loadbalance.service.SessionStickinessRule.sessionTimeoutInSeconds",
9);
s = lb.chooseServer(invocation);
Assertions.assertEquals(server2, s);
-
ArchaiusUtils.setProperty("cse.loadbalance.service.SessionStickinessRule.successiveFailedTimes",
5);
lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
diff --git
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
index 512240542..bdc657b81 100644
---
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
+++
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
@@ -31,7 +31,6 @@ import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.core.transport.TransportManager;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.DiscoveryManager;
import org.apache.servicecomb.registry.discovery.DiscoveryTree;
import org.apache.servicecomb.registry.discovery.TelnetInstancePing;
@@ -124,7 +123,6 @@ public class TestLoadBalanceFilter {
@After
public void teardown() {
scbEngine.destroy();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
index 954c6b4bb..5e4c47e9c 100644
---
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
+++
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
@@ -35,7 +35,6 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.definition.SchemaMeta;
import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
import org.apache.servicecomb.core.transport.TransportManager;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.loadbalance.filter.ServerDiscoveryFilter;
import org.apache.servicecomb.loadbalance.filter.ZoneAwareDiscoveryFilter;
import org.apache.servicecomb.registry.DiscoveryManager;
@@ -244,7 +243,6 @@ public class TestLoadBalanceFilter2 {
@Test
public void testZoneAwareFilterWorksEmptyInstanceProtectionEnabled() {
-
ArchaiusUtils.setProperty("servicecomb.loadbalance.filter.isolation.emptyInstanceProtectionEnabled",
"true");
ReferenceConfig referenceConfig = Mockito.mock(ReferenceConfig.class);
OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
InvocationRuntimeType invocationRuntimeType =
Mockito.mock(InvocationRuntimeType.class);
@@ -261,7 +259,6 @@ public class TestLoadBalanceFilter2 {
SCBEngine scbEngine = Mockito.mock(SCBEngine.class);
Mockito.when(scbEngine.getTransportManager()).thenReturn(transportManager);
Mockito.when(scbEngine.getEnvironment()).thenReturn(environment);
-
ArchaiusUtils.setProperty("servicecomb.loadbalance.filter.operation.enabled",
"false");
// set up data
DataCenterProperties myself = new DataCenterProperties();
@@ -455,12 +452,9 @@ public class TestLoadBalanceFilter2 {
@Test
public void testStatusFilterUsingMockedInvocationWorks() {
- ArchaiusUtils.setProperty("servicecomb.loadbalance.filter.status.enabled",
"false");
-
Invocation invocation = new NonSwaggerInvocation("testApp",
"testMicroserviceName");
TransportManager transportManager = Mockito.mock(TransportManager.class);
Transport transport = Mockito.mock(Transport.class);
-
ArchaiusUtils.setProperty("servicecomb.loadbalance.filter.operation.enabled",
"false");
SCBEngine scbEngine = Mockito.mock(SCBEngine.class);
Mockito.when(scbEngine.getTransportManager()).thenReturn(transportManager);
Mockito.when(scbEngine.getEnvironment()).thenReturn(environment);
diff --git
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAccessController.java
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAccessController.java
index ad4b47326..0c6c6afd3 100644
---
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAccessController.java
+++
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAccessController.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.servicecomb.authentication.provider.AccessController;
import org.apache.servicecomb.config.ConfigurationChangedEvent;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.api.DiscoveryInstance;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -135,7 +134,6 @@ public class TestAccessController {
Mockito.when(service.getServiceName()).thenReturn("Customer_trust_not");
Assertions.assertTrue(controller.isAllowed(service));
-
ArchaiusUtils.setProperty("servicecomb.publicKey.accessControl.black.list1.rule",
"trust");
Mockito.when(environment.getProperty("servicecomb.publicKey.accessControl.black.list1.rule"))
.thenReturn("trust");
latest = new HashMap<>();
diff --git
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAuthenticationBootListener.java
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAuthenticationBootListener.java
index fa0469cdf..99f6877f5 100644
---
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAuthenticationBootListener.java
+++
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/TestAuthenticationBootListener.java
@@ -27,7 +27,6 @@ import org.apache.servicecomb.core.BootListener;
import org.apache.servicecomb.core.BootListener.BootEvent;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.token.Keypair4Auth;
import org.apache.servicecomb.registry.RegistrationManager;
import org.apache.servicecomb.registry.definition.DefinitionConst;
@@ -55,7 +54,6 @@ public class TestAuthenticationBootListener {
@AfterEach
public void teardown() {
engine.destroy();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestProviderTokenManager.java
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestProviderTokenManager.java
index 4e584c7ca..f058ef6bc 100644
---
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestProviderTokenManager.java
+++
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestProviderTokenManager.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.authentication.provider;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.endsWith;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +27,6 @@ import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.config.MicroserviceProperties;
import org.apache.servicecomb.foundation.common.utils.KeyPairEntry;
import org.apache.servicecomb.foundation.common.utils.KeyPairUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.token.Keypair4Auth;
import org.apache.servicecomb.registry.api.DiscoveryInstance;
import org.apache.servicecomb.registry.definition.DefinitionConst;
@@ -40,7 +38,6 @@ import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
import org.springframework.core.env.MutablePropertySources;
import com.google.common.cache.Cache;
@@ -55,7 +52,6 @@ public class TestProviderTokenManager {
@AfterEach
public void teardown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorBootListener.java
b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorBootListener.java
index 076364a7e..c694817f1 100644
---
a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorBootListener.java
+++
b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorBootListener.java
@@ -16,9 +16,8 @@
*/
package org.apache.servicecomb.inspector.internal;
-import org.apache.servicecomb.config.priority.PriorityPropertyFactory;
-import org.apache.servicecomb.core.BootListener;
import org.apache.servicecomb.config.MicroserviceProperties;
+import org.apache.servicecomb.core.BootListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,13 +27,10 @@ public class InspectorBootListener implements BootListener {
private final InspectorConfig inspectorConfig;
- private final PriorityPropertyFactory propertyFactory;
-
private MicroserviceProperties microserviceProperties;
- public InspectorBootListener(InspectorConfig inspectorConfig,
PriorityPropertyFactory propertyFactory) {
+ public InspectorBootListener(InspectorConfig inspectorConfig) {
this.inspectorConfig = inspectorConfig;
- this.propertyFactory = propertyFactory;
}
@Autowired
@@ -57,9 +53,8 @@ public class InspectorBootListener implements BootListener {
// will not register this schemas to service registry
InspectorImpl inspector = new InspectorImpl()
- .setPropertyFactory(propertyFactory)
.setServiceName(microserviceProperties.getName());
- // TODO: inspector get schemas
+ // TODO: inspector get schemas
//
.setSchemas(RegistrationManager.INSTANCE.getMicroservice().getSchemaMap())
// .correctBasePathForOnlineTest(event.getScbEngine());
event.getScbEngine().getProducerProviderManager().registerSchema("inspector",
inspector);
diff --git
a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorConfiguration.java
b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorConfiguration.java
index afdfb3943..47ac953dc 100644
---
a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorConfiguration.java
+++
b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorConfiguration.java
@@ -16,16 +16,14 @@
*/
package org.apache.servicecomb.inspector.internal;
-import org.apache.servicecomb.config.priority.PriorityPropertyFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class InspectorConfiguration {
@Bean
- public InspectorBootListener inspectorBootListener(InspectorConfig
inspectorConfig,
- PriorityPropertyFactory propertyFactory) {
- return new InspectorBootListener(inspectorConfig, propertyFactory);
+ public InspectorBootListener inspectorBootListener(InspectorConfig
inspectorConfig) {
+ return new InspectorBootListener(inspectorConfig);
}
@Bean
diff --git
a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java
b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java
index 8045bb77b..cfe7de0a5 100644
---
a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java
+++
b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java
@@ -19,14 +19,7 @@ package org.apache.servicecomb.inspector.internal;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.zip.ZipEntry;
@@ -35,16 +28,11 @@ import java.util.zip.ZipOutputStream;
import org.apache.commons.lang3.StringUtils;
import
org.apache.servicecomb.common.rest.resource.ClassPathStaticResourceHandler;
import org.apache.servicecomb.common.rest.resource.StaticResourceHandler;
-import org.apache.servicecomb.config.ConfigUtil;
-import org.apache.servicecomb.config.priority.PriorityProperty;
-import org.apache.servicecomb.config.priority.PriorityPropertyFactory;
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.foundation.common.part.InputStreamPart;
import org.apache.servicecomb.foundation.common.utils.ClassLoaderScopeContext;
-import org.apache.servicecomb.inspector.internal.model.DynamicPropertyView;
-import org.apache.servicecomb.inspector.internal.model.PriorityPropertyView;
import org.apache.servicecomb.inspector.internal.swagger.SchemaFormat;
import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.apache.servicecomb.swagger.SwaggerUtils;
@@ -54,7 +42,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
-import com.netflix.config.DynamicProperty;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -73,21 +60,12 @@ import jakarta.ws.rs.core.Response.Status;
public class InspectorImpl {
private static final Logger LOGGER =
LoggerFactory.getLogger(InspectorImpl.class);
- private static final DateTimeFormatter FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
private final StaticResourceHandler resourceHandler = new
ClassPathStaticResourceHandler();
private Map<String, String> schemas;
- private PriorityPropertyFactory propertyFactory;
-
private String serviceName;
- public InspectorImpl setPropertyFactory(PriorityPropertyFactory
propertyFactory) {
- this.propertyFactory = propertyFactory;
- return this;
- }
-
@VisibleForTesting
public Map<String, String> getSchemas() {
return schemas;
@@ -206,57 +184,4 @@ public class InspectorImpl {
public Response getStaticResource(@PathParam("path") String path) {
return resourceHandler.handle(path);
}
-
- @Path("/dynamicProperties")
- @GET
- public List<DynamicPropertyView> dynamicProperties() {
- List<DynamicPropertyView> views = new ArrayList<>();
- for (DynamicProperty property :
ConfigUtil.getAllDynamicProperties().values()) {
- views.add(createDynamicPropertyView(property));
- }
-
- // show more callback first, because maybe there is memory leak problem
- // show recently changed second
- // and sort by key
- views.sort(Comparator
- .comparing(DynamicPropertyView::getCallbackCount)
- .thenComparing(DynamicPropertyView::getChangedTime).reversed()
- .thenComparing(DynamicPropertyView::getKey));
- return views;
- }
-
- private DynamicPropertyView createDynamicPropertyView(DynamicProperty
property) {
- DynamicPropertyView view = new DynamicPropertyView();
- view.setKey(property.getName());
- view.setValue(property.getString());
-
- if (property.getChangedTimestamp() != 0) {
- LocalDateTime localDatetime = LocalDateTime
- .ofInstant(Instant.ofEpochMilli(property.getChangedTimestamp()),
ZoneId.systemDefault());
- view.setChangedTime(localDatetime.format(FORMATTER));
- }
-
- view.setCallbackCount(ConfigUtil.getCallbacks(property).size());
- return view;
- }
-
- @Path("/priorityProperties")
- @GET
- public List<PriorityPropertyView> priorityProperties() {
- List<PriorityPropertyView> views = new ArrayList<>();
- propertyFactory.getProperties()
- .forEach(p -> views.add(createPriorityPropertyView(p)));
- return views;
- }
-
- private PriorityPropertyView createPriorityPropertyView(PriorityProperty<?>
priorityProperty) {
- PriorityPropertyView view = new PriorityPropertyView();
- view.setDynamicProperties(new ArrayList<>());
- for (DynamicProperty property : priorityProperty.getProperties()) {
- view.getDynamicProperties().add(createDynamicPropertyView(property));
- }
- view.setDefaultValue(String.valueOf(priorityProperty.getDefaultValue()));
- view.setValue(String.valueOf(priorityProperty.getValue()));
- return view;
- }
}
diff --git
a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
index e6ce70c36..9203082dd 100644
---
a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
+++
b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
@@ -45,13 +45,13 @@ public class TestInspectorBootListener {
@Test
public void getOrder() {
- Assertions.assertEquals(Short.MAX_VALUE, new InspectorBootListener(null,
null).getOrder());
+ Assertions.assertEquals(Short.MAX_VALUE, new
InspectorBootListener(null).getOrder());
}
@Test
public void filterEvent() {
BootEvent event = new BootEvent();
- InspectorBootListener listener = new InspectorBootListener(new
InspectorConfig(), null);
+ InspectorBootListener listener = new InspectorBootListener(new
InspectorConfig());
try (LogCollector logCollector = new LogCollector()) {
for (EventType eventType : EventType.values()) {
@@ -73,7 +73,7 @@ public class TestInspectorBootListener {
InspectorConfig inspectorConfig = new InspectorConfig()
.setEnabled(false);
- new InspectorBootListener(inspectorConfig, null)
+ new InspectorBootListener(inspectorConfig)
.onAfterTransport(new BootEvent(scbEngine, EventType.AFTER_TRANSPORT));
Assertions.assertNull(scbEngine.getProducerMicroserviceMeta().findSchemaMeta("inspector"));
diff --git
a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java
b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java
index 8febcb69b..b99d6a58d 100644
---
a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java
+++
b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java
@@ -24,27 +24,19 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.servicecomb.config.ConfigUtil;
-import org.apache.servicecomb.config.priority.PriorityPropertyFactory;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import org.apache.servicecomb.foundation.common.utils.ClassLoaderScopeContext;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import
org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
-import org.apache.servicecomb.inspector.internal.model.DynamicPropertyView;
-import org.apache.servicecomb.inspector.internal.model.PriorityPropertyView;
import org.apache.servicecomb.inspector.internal.swagger.SchemaFormat;
import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.apache.servicecomb.swagger.invocation.Response;
@@ -63,8 +55,6 @@ import org.junit.jupiter.api.condition.JRE;
import org.mockito.Mockito;
import org.springframework.core.env.Environment;
-import com.netflix.config.DynamicProperty;
-
import io.vertx.core.file.impl.FileResolverImpl;
import jakarta.servlet.http.Part;
import jakarta.ws.rs.core.HttpHeaders;
@@ -116,7 +106,6 @@ public class TestInspectorImpl {
@AfterAll
public static void teardown() {
- ArchaiusUtils.resetConfig();
SCBEngine.getInstance().destroy();
ClassLoaderScopeContext.clearClassLoaderScopeProperty();
}
@@ -266,39 +255,6 @@ public class TestInspectorImpl {
}
}
- @Test
- public void dynamicProperties() {
- DynamicProperty.getInstance("zzz");
- ArchaiusUtils.setProperty("zzz", "abc");
- DynamicProperty.getInstance("yyy").addCallback(() -> {
- });
-
- List<DynamicPropertyView> views = inspector.dynamicProperties();
- Map<String, DynamicPropertyView> viewMap = views.stream()
- .collect(Collectors.toMap(DynamicPropertyView::getKey,
Function.identity()));
- Assertions.assertEquals(1, viewMap.get("yyy").getCallbackCount());
- Assertions.assertEquals(0, viewMap.get("zzz").getCallbackCount());
-
- int count = ConfigUtil.getAllDynamicProperties().size();
- ConfigUtil.getAllDynamicProperties().remove("yyy");
- ConfigUtil.getAllDynamicProperties().remove("zzz");
- Assertions.assertEquals(count - 2,
ConfigUtil.getAllDynamicProperties().size());
- }
-
- @Test
- public void priorityProperties() {
- PriorityPropertyFactory propertyFactory = new PriorityPropertyFactory();
- inspector.setPropertyFactory(propertyFactory);
-
- propertyFactory.getOrCreate(int.class, 0, 0, "high", "low");
-
- List<PriorityPropertyView> views = inspector.priorityProperties();
- Assertions.assertEquals(1, views.size());
- MatcherAssert.assertThat(
-
views.get(0).getDynamicProperties().stream().map(DynamicPropertyView::getKey).collect(Collectors.toList()),
- Matchers.contains("high", "low"));
- }
-
@Test
public void urlPrefix() {
Mockito.when(environment.getProperty("servicecomb.transport.eventloop.size",
int.class, -1))
diff --git
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
index ed87a5809..c99141cf3 100644
---
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
+++
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
@@ -24,7 +24,6 @@ import org.apache.servicecomb.core.BootListener.BootEvent;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.provider.producer.ProducerMeta;
import org.apache.servicecomb.core.provider.producer.ProducerProviderManager;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.metrics.core.publish.HealthCheckerRestPublisher;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
@@ -38,12 +37,10 @@ public class TestHealthBootListener {
@Before
public void setUp() {
- ArchaiusUtils.resetConfig();
}
@After
public void tearDown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
index 0c36b84fa..2b136e7b5 100644
---
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
+++
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.foundation.metrics.PolledEvent;
import
org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementNode;
import
org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementTree;
import org.apache.servicecomb.foundation.metrics.registry.GlobalRegistry;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import
org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
@@ -87,7 +86,6 @@ public class TestDefaultLogPublisher {
@After
public void teardown() {
collector.teardown();
- ArchaiusUtils.resetConfig();
}
@Test
@@ -116,8 +114,6 @@ public class TestDefaultLogPublisher {
}
};
- ArchaiusUtils.setProperty(DefaultLogPublisher.ENABLED, true);
-
publisher.init(globalRegistry, eventBus, new
MetricsBootstrapConfig(environment));
Assertions.assertTrue(registered.value);
}
@@ -133,8 +129,6 @@ public class TestDefaultLogPublisher {
}
};
- ArchaiusUtils.setProperty(DefaultLogPublisher.ENABLED, false);
-
publisher.init(globalRegistry, eventBus, new
MetricsBootstrapConfig(environment));
Assertions.assertNull(registered.value);
}
diff --git
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
index 6a2b883bd..dad92b737 100644
---
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
+++
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
@@ -26,17 +26,16 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.invocation.InvocationStageTrace;
import org.apache.servicecomb.core.tracing.TraceIdLogger;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.swagger.invocation.Response;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import mockit.Expectations;
import mockit.Mocked;
-import org.junit.jupiter.api.Assertions;
public class TestSlowInvocationLogger {
@Mocked
@@ -70,14 +69,12 @@ public class TestSlowInvocationLogger {
public void setup() {
logger = new SlowInvocationLogger(scbEngine);
event = new InvocationFinishEvent(invocation, response);
- ArchaiusUtils.resetConfig();
logCollector = new LogCollector();
}
@After
public void teardown() {
logCollector.teardown();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
b/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
index c9b0d605f..a8549059f 100644
---
a/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
+++
b/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
@@ -34,7 +34,6 @@ import org.apache.servicecomb.config.MicroserviceProperties;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
import org.apache.servicecomb.foundation.metrics.registry.GlobalRegistry;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -69,21 +68,22 @@ public class TestPrometheusPublisher {
@AfterAll
public static void teardown() {
- ArchaiusUtils.resetConfig();
}
@Test
public void testBadPublishAddress() {
+ Mockito.when(environment.getProperty(METRICS_PROMETHEUS_ADDRESS,
String.class, "0.0.0.0:9696"))
+ .thenReturn("a:b:c");
Assertions.assertThrows(ServiceCombException.class, () -> {
- ArchaiusUtils.setProperty(METRICS_PROMETHEUS_ADDRESS, "a:b:c");
publisher.init(globalRegistry, null, null);
});
}
@Test
public void testBadPublishAddress_BadPort() {
+ Mockito.when(environment.getProperty(METRICS_PROMETHEUS_ADDRESS,
String.class, "0.0.0.0:9696"))
+ .thenReturn("localhost:xxxx");
Assertions.assertThrows(ServiceCombException.class, () -> {
- ArchaiusUtils.setProperty(METRICS_PROMETHEUS_ADDRESS, "localhost:xxxx");
publisher.init(globalRegistry, null, null);
});
}
diff --git
a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
index 5e529f40c..98ba2de92 100644
---
a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
+++
b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
@@ -19,11 +19,9 @@ package org.apache.servicecomb.provider.pojo.reference;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.provider.pojo.IPerson;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterEach;
@@ -34,12 +32,10 @@ import org.junit.jupiter.api.Test;
public class PojoReferenceMetaTest {
@BeforeEach
public void setUp() {
- ConfigUtil.installDynamicConfig();
}
@AfterEach
public void teardown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
index d32a9b9c5..b20c3785b 100644
---
a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
+++
b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
@@ -17,10 +17,8 @@
package org.apache.servicecomb.provider.pojo.reference;
-import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
import org.apache.servicecomb.provider.pojo.Person;
import org.apache.servicecomb.provider.pojo.PersonReference;
@@ -34,12 +32,10 @@ public class TestRpcReferenceProcessor {
@BeforeEach
public void setUp() {
- ConfigUtil.installDynamicConfig();
}
@AfterEach
public void teardown() {
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
index 2bae07fe8..79c7890f7 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
@@ -38,6 +38,7 @@ public class TestSwaggerGenerator {
@Test
public void testBasePathPlaceHolder() {
+ // TODO: fix PlaceholderResolver
ArchaiusUtils.setProperty("var", "varValue");
PojoSwaggerGenerator swaggerGenerator = new PojoSwaggerGenerator(null);
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
index d4d73d759..ed2247da3 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
@@ -49,7 +49,6 @@ import
org.apache.servicecomb.core.transport.AbstractTransport;
import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.client.tcp.TcpClientConfig;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
@@ -180,7 +179,6 @@ public class TestRestServerVerticle {
instance = null;
startPromise = null;
SCBEngine.getInstance().destroy();
- ArchaiusUtils.resetConfig();
}
@Test
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
index a0758445f..aeab3878b 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
@@ -19,11 +19,10 @@ package org.apache.servicecomb.transport.rest.vertx;
import org.apache.http.HttpHeaders;
import org.apache.servicecomb.common.rest.RestConst;
-import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.core.transport.TransportManager;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.apache.servicecomb.foundation.common.LegacyPropertyFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
@@ -75,7 +74,6 @@ public class TestVertxRestDispatcher {
@After
public void teardown() {
SCBEngine.getInstance().destroy();
- ArchaiusUtils.resetConfig();
}
@Test
