msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

refactor: rename config report request customizer

Browse Source
pull/1813/head
fishtailfu 1 month ago
parent a3c1d66d8b
commit 95faa28703
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File

19
spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java
Unescape View File

@ -32,12 +32,12 @@ import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.config.consumer.OutlierDetectionConfig; import com.tencent.polaris.api.config.consumer.OutlierDetectionConfig;
import com.tencent.polaris.api.utils.CollectionUtils; import com.tencent.polaris.api.utils.CollectionUtils;
import com.tencent.polaris.api.utils.StringUtils; import com.tencent.polaris.api.utils.StringUtils;
import com.tencent.polaris.configuration.client.internal.ConfigWatchClientReporter; import com.tencent.polaris.configuration.client.internal.ConfigWatchReportRequestCustomizer;
import com.tencent.polaris.configuration.client.internal.ConfigWatchReporterConfig; import com.tencent.polaris.configuration.client.internal.ConfigWatchReportRequestCustomizerConfig;
import com.tencent.polaris.factory.config.ConfigurationImpl; import com.tencent.polaris.factory.config.ConfigurationImpl;
import com.tencent.polaris.factory.config.configuration.ConfigFilterConfigImpl; import com.tencent.polaris.factory.config.configuration.ConfigFilterConfigImpl;
import com.tencent.polaris.factory.config.configuration.ConnectorConfigImpl; import com.tencent.polaris.factory.config.configuration.ConnectorConfigImpl;
import com.tencent.polaris.factory.config.global.ClientReporterConfigImpl; import com.tencent.polaris.factory.config.global.ReportClientRequestCustomizerConfigImpl;
import com.tencent.polaris.factory.config.global.ServerConnectorConfigImpl; import com.tencent.polaris.factory.config.global.ServerConnectorConfigImpl;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -70,12 +70,13 @@ public class ConfigurationModifier implements PolarisConfigurationConfigModifier
@Override @Override
public void modify(ConfigurationImpl configuration) { public void modify(ConfigurationImpl configuration) {
configuration.getGlobal().getStatReporter().setEnable(false); configuration.getGlobal().getStatReporter().setEnable(false);
ClientReporterConfigImpl clientReporterConfig = configuration.getGlobal().getClientReporter(); ReportClientRequestCustomizerConfigImpl customizerConfig = configuration.getGlobal()
clientReporterConfig.setEnable(true); .getReportClientRequestCustomizer();
ConfigWatchReporterConfig configWatchReporterConfig = clientReporterConfig.getPluginConfig( customizerConfig.setEnable(true);
ConfigWatchClientReporter.NAME, ConfigWatchReporterConfig.class); ConfigWatchReportRequestCustomizerConfig configWatchCustomizerConfig = customizerConfig.getPluginConfig(
configWatchReporterConfig.setEnable(polarisConfigProperties.isReportEnabled()); ConfigWatchReportRequestCustomizer.NAME, ConfigWatchReportRequestCustomizerConfig.class);
clientReporterConfig.setPluginConfig(ConfigWatchClientReporter.NAME, configWatchReporterConfig); configWatchCustomizerConfig.setEnable(polarisConfigProperties.isReportEnabled());
customizerConfig.setPluginConfig(ConfigWatchReportRequestCustomizer.NAME, configWatchCustomizerConfig);
configuration.getConsumer().getOutlierDetection().setWhen(OutlierDetectionConfig.When.never); configuration.getConsumer().getOutlierDetection().setWhen(OutlierDetectionConfig.When.never);
configuration.getConsumer().getCircuitBreaker().setEnable(false); configuration.getConsumer().getCircuitBreaker().setEnable(false);

45
spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java
Unescape View File

@ -32,8 +32,8 @@ import com.tencent.cloud.polaris.config.config.PolarisConfigProperties;
import com.tencent.cloud.polaris.config.config.PolarisCryptoConfigProperties; import com.tencent.cloud.polaris.config.config.PolarisCryptoConfigProperties;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties; import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.config.consumer.OutlierDetectionConfig; import com.tencent.polaris.api.config.consumer.OutlierDetectionConfig;
import com.tencent.polaris.configuration.client.internal.ConfigWatchClientReporter; import com.tencent.polaris.configuration.client.internal.ConfigWatchReportRequestCustomizer;
import com.tencent.polaris.configuration.client.internal.ConfigWatchReporterConfig; import com.tencent.polaris.configuration.client.internal.ConfigWatchReportRequestCustomizerConfig;
import com.tencent.polaris.factory.config.ConfigurationImpl; import com.tencent.polaris.factory.config.ConfigurationImpl;
import com.tencent.polaris.factory.config.configuration.ConfigFileConfigImpl; import com.tencent.polaris.factory.config.configuration.ConfigFileConfigImpl;
import com.tencent.polaris.factory.config.configuration.ConfigFilterConfigImpl; import com.tencent.polaris.factory.config.configuration.ConfigFilterConfigImpl;
@ -42,8 +42,8 @@ import com.tencent.polaris.factory.config.consumer.CircuitBreakerConfigImpl;
import com.tencent.polaris.factory.config.consumer.ConsumerConfigImpl; import com.tencent.polaris.factory.config.consumer.ConsumerConfigImpl;
import com.tencent.polaris.factory.config.consumer.OutlierDetectionConfigImpl; import com.tencent.polaris.factory.config.consumer.OutlierDetectionConfigImpl;
import com.tencent.polaris.factory.config.global.APIConfigImpl; import com.tencent.polaris.factory.config.global.APIConfigImpl;
import com.tencent.polaris.factory.config.global.ClientReporterConfigImpl;
import com.tencent.polaris.factory.config.global.GlobalConfigImpl; 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.ServerConnectorConfigImpl;
import com.tencent.polaris.factory.config.global.StatReporterConfigImpl; import com.tencent.polaris.factory.config.global.StatReporterConfigImpl;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -82,7 +82,7 @@ class ConfigurationModifierTest {
private PolarisContextProperties polarisContextProperties; private PolarisContextProperties polarisContextProperties;
@Mock @Mock
private ConfigWatchReporterConfig configWatchReporter; private ConfigWatchReportRequestCustomizerConfig configWatchCustomizer;
private ConfigurationModifier configurationModifier; private ConfigurationModifier configurationModifier;
@ -101,13 +101,14 @@ class ConfigurationModifierTest {
GlobalConfigImpl globalConfig = mock(GlobalConfigImpl.class); GlobalConfigImpl globalConfig = mock(GlobalConfigImpl.class);
StatReporterConfigImpl statReporter = mock(StatReporterConfigImpl.class); StatReporterConfigImpl statReporter = mock(StatReporterConfigImpl.class);
ClientReporterConfigImpl clientReporter = mock(ClientReporterConfigImpl.class); ReportClientRequestCustomizerConfigImpl requestCustomizer =
mock(ReportClientRequestCustomizerConfigImpl.class);
ServerConnectorConfigImpl serverConnector = mock(ServerConnectorConfigImpl.class); ServerConnectorConfigImpl serverConnector = mock(ServerConnectorConfigImpl.class);
APIConfigImpl apiConfig = mock(APIConfigImpl.class); APIConfigImpl apiConfig = mock(APIConfigImpl.class);
when(globalConfig.getStatReporter()).thenReturn(statReporter); when(globalConfig.getStatReporter()).thenReturn(statReporter);
when(globalConfig.getClientReporter()).thenReturn(clientReporter); when(globalConfig.getReportClientRequestCustomizer()).thenReturn(requestCustomizer);
when(clientReporter.getPluginConfig(ConfigWatchClientReporter.NAME, ConfigWatchReporterConfig.class)) when(requestCustomizer.getPluginConfig(ConfigWatchReportRequestCustomizer.NAME,
.thenReturn(configWatchReporter); ConfigWatchReportRequestCustomizerConfig.class)).thenReturn(configWatchCustomizer);
Mockito.lenient().when(globalConfig.getServerConnector()).thenReturn(serverConnector); Mockito.lenient().when(globalConfig.getServerConnector()).thenReturn(serverConnector);
Mockito.lenient().when(globalConfig.getAPI()).thenReturn(apiConfig); Mockito.lenient().when(globalConfig.getAPI()).thenReturn(apiConfig);
when(configuration.getGlobal()).thenReturn(globalConfig); when(configuration.getGlobal()).thenReturn(globalConfig);
@ -164,11 +165,12 @@ class ConfigurationModifierTest {
// Assert // Assert
verify(configuration.getGlobal().getStatReporter()).setEnable(false); verify(configuration.getGlobal().getStatReporter()).setEnable(false);
verify(configuration.getGlobal().getClientReporter()).setEnable(true); verify(configuration.getGlobal().getReportClientRequestCustomizer()).setEnable(true);
verify(configuration.getGlobal().getClientReporter() verify(configuration.getGlobal().getReportClientRequestCustomizer()
.getPluginConfig(ConfigWatchClientReporter.NAME, ConfigWatchReporterConfig.class)).setEnable(true); .getPluginConfig(ConfigWatchReportRequestCustomizer.NAME,
verify(configuration.getGlobal().getClientReporter()) ConfigWatchReportRequestCustomizerConfig.class)).setEnable(true);
.setPluginConfig(ConfigWatchClientReporter.NAME, configWatchReporter); verify(configuration.getGlobal().getReportClientRequestCustomizer())
.setPluginConfig(ConfigWatchReportRequestCustomizer.NAME, configWatchCustomizer);
verify(configuration.getConsumer().getOutlierDetection()).setWhen(OutlierDetectionConfig.When.never); verify(configuration.getConsumer().getOutlierDetection()).setWhen(OutlierDetectionConfig.When.never);
verify(configuration.getConsumer().getCircuitBreaker()).setEnable(false); verify(configuration.getConsumer().getCircuitBreaker()).setEnable(false);
verify(configuration.getConfigFile(), never()).getServerConnector(); verify(configuration.getConfigFile(), never()).getServerConnector();
@ -192,11 +194,12 @@ class ConfigurationModifierTest {
// Assert // Assert
verify(configuration.getGlobal().getStatReporter()).setEnable(false); verify(configuration.getGlobal().getStatReporter()).setEnable(false);
verify(configuration.getGlobal().getClientReporter()).setEnable(true); verify(configuration.getGlobal().getReportClientRequestCustomizer()).setEnable(true);
verify(configuration.getGlobal().getClientReporter() verify(configuration.getGlobal().getReportClientRequestCustomizer()
.getPluginConfig(ConfigWatchClientReporter.NAME, ConfigWatchReporterConfig.class)).setEnable(true); .getPluginConfig(ConfigWatchReportRequestCustomizer.NAME,
verify(configuration.getGlobal().getClientReporter()) ConfigWatchReportRequestCustomizerConfig.class)).setEnable(true);
.setPluginConfig(ConfigWatchClientReporter.NAME, configWatchReporter); verify(configuration.getGlobal().getReportClientRequestCustomizer())
.setPluginConfig(ConfigWatchReportRequestCustomizer.NAME, configWatchCustomizer);
verify(configuration.getConfigFile(), never()).getServerConnector(); verify(configuration.getConfigFile(), never()).getServerConnector();
} }
@ -209,9 +212,9 @@ class ConfigurationModifierTest {
configurationModifier.modify(configuration); configurationModifier.modify(configuration);
verify(configWatchReporter).setEnable(false); verify(configWatchCustomizer).setEnable(false);
verify(configuration.getGlobal().getClientReporter()) verify(configuration.getGlobal().getReportClientRequestCustomizer())
.setPluginConfig(ConfigWatchClientReporter.NAME, configWatchReporter); .setPluginConfig(ConfigWatchReportRequestCustomizer.NAME, configWatchCustomizer);
verify(configuration.getConfigFile(), never()).getServerConnector(); verify(configuration.getConfigFile(), never()).getServerConnector();
} }

Write Preview
Loading…
Cancel
Save