fix: fix NacosDiscoveryRegistryAutoConfiguration and PolarisAuthAutoConfiguration error initiation when polaris disabled.

pull/1783/head
fishtailfu 4 days ago
parent 8ce1ebefc8
commit 04644243c2

@ -20,6 +20,7 @@ package com.tencent.cloud.polaris.auth.config;
import com.tencent.cloud.common.constant.OrderConstant;
import com.tencent.cloud.polaris.auth.filter.AuthReactiveFilter;
import com.tencent.cloud.polaris.auth.filter.AuthServletFilter;
import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -41,6 +42,7 @@ import static javax.servlet.DispatcherType.REQUEST;
* @author Haotian Zhang
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnPolarisEnabled
public class PolarisAuthAutoConfiguration {
/**

@ -17,6 +17,7 @@
package com.tencent.cloud.polaris.registry.nacos;
import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
import com.tencent.cloud.polaris.extend.nacos.NacosContextProperties;
import com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration;
@ -26,6 +27,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
@ConditionalOnPolarisEnabled
@AutoConfigureBefore(PolarisServiceRegistryAutoConfiguration.class)
public class NacosDiscoveryRegistryAutoConfiguration {
@Bean

@ -0,0 +1,70 @@
/*
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
*
* Copyright (C) 2021 Tencent. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package com.tencent.cloud.polaris.registry;
import com.tencent.cloud.polaris.DiscoveryPropertiesAutoConfiguration;
import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
import com.tencent.cloud.polaris.extend.nacos.NacosContextProperties;
import com.tencent.cloud.polaris.registry.nacos.NacosDiscoveryRegistryAutoConfiguration;
import com.tencent.cloud.polaris.registry.nacos.NacosPolarisRegistrationCustomizer;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Test for {@link NacosDiscoveryRegistryAutoConfiguration}.
*
* @author Yuwei Fu
*/
public class NacosDiscoveryRegistryAutoConfigurationTest {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(
PolarisContextAutoConfiguration.class,
NacosDiscoveryRegistryAutoConfiguration.class,
DiscoveryPropertiesAutoConfiguration.class))
.withPropertyValues("spring.cloud.polaris.enabled=true");
@Test
public void testDefaultInitialization() {
this.contextRunner.run(context -> {
assertThat(context).hasSingleBean(NacosDiscoveryRegistryAutoConfiguration.class);
assertThat(context).hasSingleBean(NacosPolarisRegistrationCustomizer.class);
assertThat(context).hasSingleBean(NacosContextProperties.class);
});
}
@Test
public void testPolarisDisabled() {
new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(
PolarisContextAutoConfiguration.class,
NacosDiscoveryRegistryAutoConfiguration.class,
DiscoveryPropertiesAutoConfiguration.class))
.withPropertyValues("spring.cloud.polaris.enabled=false")
.run(context -> {
assertThat(context).doesNotHaveBean(NacosDiscoveryRegistryAutoConfiguration.class);
assertThat(context).doesNotHaveBean(NacosPolarisRegistrationCustomizer.class);
});
}
}
Loading…
Cancel
Save