From 3339b772e6b318772b6c859ad0380ed768829393 Mon Sep 17 00:00:00 2001 From: fishtailfu Date: Wed, 12 Aug 2026 17:26:39 +0800 Subject: [PATCH] refactor: use generic request customizer config --- .../cloud/polaris/config/ConfigurationModifier.java | 5 ++--- .../cloud/polaris/config/ConfigurationModifierTest.java | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java index 4e65a475b..8f0d0df0f 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java @@ -37,8 +37,8 @@ import com.tencent.polaris.configuration.client.internal.ConfigWatchReportReques import com.tencent.polaris.factory.config.ConfigurationImpl; import com.tencent.polaris.factory.config.configuration.ConfigFilterConfigImpl; import com.tencent.polaris.factory.config.configuration.ConnectorConfigImpl; -import com.tencent.polaris.factory.config.global.ReportClientRequestCustomizerConfigImpl; import com.tencent.polaris.factory.config.global.ServerConnectorConfigImpl; +import com.tencent.polaris.factory.config.plugin.PluginConfigImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,9 +70,8 @@ public class ConfigurationModifier implements PolarisConfigurationConfigModifier @Override public void modify(ConfigurationImpl configuration) { configuration.getGlobal().getStatReporter().setEnable(false); - ReportClientRequestCustomizerConfigImpl customizerConfig = configuration.getGlobal() + PluginConfigImpl customizerConfig = configuration.getGlobal() .getReportClientRequestCustomizer(); - customizerConfig.setEnable(true); ConfigWatchReportRequestCustomizerConfig configWatchCustomizerConfig = customizerConfig.getPluginConfig( ConfigWatchReportRequestCustomizer.NAME, ConfigWatchReportRequestCustomizerConfig.class); configWatchCustomizerConfig.setEnable(polarisConfigProperties.getReport().isEnabled()); diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java index e6ec43c67..4f643a6c3 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java @@ -43,9 +43,9 @@ import com.tencent.polaris.factory.config.consumer.ConsumerConfigImpl; import com.tencent.polaris.factory.config.consumer.OutlierDetectionConfigImpl; import com.tencent.polaris.factory.config.global.APIConfigImpl; import com.tencent.polaris.factory.config.global.GlobalConfigImpl; -import com.tencent.polaris.factory.config.global.ReportClientRequestCustomizerConfigImpl; import com.tencent.polaris.factory.config.global.ServerConnectorConfigImpl; import com.tencent.polaris.factory.config.global.StatReporterConfigImpl; +import com.tencent.polaris.factory.config.plugin.PluginConfigImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -105,8 +105,7 @@ class ConfigurationModifierTest { GlobalConfigImpl globalConfig = mock(GlobalConfigImpl.class); StatReporterConfigImpl statReporter = mock(StatReporterConfigImpl.class); - ReportClientRequestCustomizerConfigImpl requestCustomizer = - mock(ReportClientRequestCustomizerConfigImpl.class); + PluginConfigImpl requestCustomizer = mock(PluginConfigImpl.class); ServerConnectorConfigImpl serverConnector = mock(ServerConnectorConfigImpl.class); APIConfigImpl apiConfig = mock(APIConfigImpl.class); when(globalConfig.getStatReporter()).thenReturn(statReporter); @@ -169,7 +168,6 @@ class ConfigurationModifierTest { // Assert verify(configuration.getGlobal().getStatReporter()).setEnable(false); - verify(configuration.getGlobal().getReportClientRequestCustomizer()).setEnable(true); verify(configuration.getGlobal().getReportClientRequestCustomizer() .getPluginConfig(ConfigWatchReportRequestCustomizer.NAME, ConfigWatchReportRequestCustomizerConfig.class)).setEnable(true); @@ -198,7 +196,6 @@ class ConfigurationModifierTest { // Assert verify(configuration.getGlobal().getStatReporter()).setEnable(false); - verify(configuration.getGlobal().getReportClientRequestCustomizer()).setEnable(true); verify(configuration.getGlobal().getReportClientRequestCustomizer() .getPluginConfig(ConfigWatchReportRequestCustomizer.NAME, ConfigWatchReportRequestCustomizerConfig.class)).setEnable(true);