diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosConfigModifier.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosConfigModifier.java index 32ed9005d..a08528fae 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosConfigModifier.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosConfigModifier.java @@ -65,23 +65,6 @@ public class NacosConfigModifier implements PolarisConfigModifier { if (Objects.isNull(nacosContextProperties) || !nacosContextProperties.isEnabled()) { return; } - // Check if Nacos Available - boolean nacosAvailable = false; - try { - nacosAvailable = null != Class.forName("shade.polaris.com.alibaba.nacos.api.naming.NamingService"); - } - catch (Throwable ignored) { - - } - if (!nacosAvailable) { - LOGGER.error("Please import \"connector-nacos\" dependency when enabling nacos service registration and discovery.\n" - + "Add dependency configuration below to pom.xml:\n" - + "\n" - + "\tcom.tencent.polaris\n" - + "\tconnector-nacos\n" - + ""); - throw new RuntimeException("Dependency \"connector-nacos\" not found."); - } if (CollectionUtils.isEmpty(configuration.getGlobal().getServerConnectors())) { configuration.getGlobal().setServerConnectors(new ArrayList<>()); } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java index 9b0aabc10..b5f75278e 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java @@ -34,7 +34,13 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.util.CollectionUtils; +import static com.tencent.polaris.plugins.connector.common.constant.NacosConstant.MetadataMapKey.NACOS_GROUP_KEY; import static org.assertj.core.api.Assertions.assertThat; +import static shade.polaris.com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH; +import static shade.polaris.com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE; +import static shade.polaris.com.alibaba.nacos.api.PropertyKeyConst.PASSWORD; +import static shade.polaris.com.alibaba.nacos.api.PropertyKeyConst.USERNAME; + /** * Test for {@link NacosContextProperties}. @@ -82,11 +88,11 @@ public class NacosContextPropertiesTest { assertThat(DefaultPlugins.SERVER_CONNECTOR_NACOS.equals(serverConnectorConfig.getProtocol())).isTrue(); Map metadata = serverConnectorConfig.getMetadata(); - assertThat(metadata.get(NacosConfigModifier.USERNAME)).isEqualTo(nacosContextProperties.getUsername()); - assertThat(metadata.get(NacosConfigModifier.PASSWORD)).isEqualTo(nacosContextProperties.getPassword()); - assertThat(metadata.get(NacosConfigModifier.CONTEXT_PATH)).isEqualTo(nacosContextProperties.getContextPath()); - assertThat(metadata.get(NacosConfigModifier.NAMESPACE)).isEqualTo(nacosContextProperties.getNamespace()); - assertThat(metadata.get(NacosConfigModifier.NACOS_GROUP)).isEqualTo(nacosContextProperties.getGroup()); + assertThat(metadata.get(USERNAME)).isEqualTo(nacosContextProperties.getUsername()); + assertThat(metadata.get(PASSWORD)).isEqualTo(nacosContextProperties.getPassword()); + assertThat(metadata.get(CONTEXT_PATH)).isEqualTo(nacosContextProperties.getContextPath()); + assertThat(metadata.get(NAMESPACE)).isEqualTo(nacosContextProperties.getNamespace()); + assertThat(metadata.get(NACOS_GROUP_KEY)).isEqualTo(nacosContextProperties.getGroup()); } @SpringBootApplication