refactor: use generic request customizer config

pull/1813/head
fishtailfu 1 month ago
parent 2dce251633
commit 3339b772e6

@ -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());

@ -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);

Loading…
Cancel
Save