-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
integrate Zookeeper and Nacos as configuration centers
- Loading branch information
Showing
14 changed files
with
703 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>com.alipay.sofa</groupId> | ||
| <artifactId>sofa-rpc-config</artifactId> | ||
| <version>${revision}</version> | ||
| </parent> | ||
|
|
||
| <artifactId>sofa-rpc-config-nacos</artifactId> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.alipay.sofa</groupId> | ||
| <artifactId>sofa-rpc-log-common-tools</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.alipay.sofa</groupId> | ||
| <artifactId>sofa-rpc-log</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.alipay.sofa</groupId> | ||
| <artifactId>sofa-rpc-api</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.alibaba.nacos</groupId> | ||
| <artifactId>nacos-client</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-log4j12</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| <build> | ||
| <sourceDirectory>src/main/java</sourceDirectory> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/resources</directory> | ||
| <filtering>false</filtering> | ||
| <includes> | ||
| <include>**/**</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| <testSourceDirectory>src/test/java</testSourceDirectory> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>src/test/resources</directory> | ||
| <filtering>false</filtering> | ||
| <includes> | ||
| <include>**/**</include> | ||
| </includes> | ||
| </testResource> | ||
| </testResources> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <configuration> | ||
| <source>${maven.compiler.source}</source> | ||
| <target>${maven.compiler.source}</target> | ||
| <encoding>${project.build.sourceEncoding}</encoding> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-install-plugin</artifactId> | ||
| <configuration> | ||
| <skip>${module.install.skip}</skip> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-deploy-plugin</artifactId> | ||
| <configuration> | ||
| <skip>${module.deploy.skip}</skip> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <skipTests>${skipTests}</skipTests> | ||
| <includes> | ||
| <!-- 这里需要根据自己的需要指定要跑的单元测试 --> | ||
| <include>**/*Test.java</include> | ||
| </includes> | ||
| <!-- 如无特殊需求，将forkMode设置为once --> | ||
| <forkMode>once</forkMode> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
129 changes: 129 additions & 0 deletions
129
...nfig-nacos/src/main/java/com/alipay/sofa/rpc/dynamic/nacos/NacosDynamicConfigManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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.alipay.sofa.rpc.dynamic.nacos; | ||
|
|
||
| import com.alibaba.nacos.api.PropertyKeyConst; | ||
| import com.alipay.sofa.common.config.SofaConfigs; | ||
| import com.alipay.sofa.rpc.auth.AuthRuleGroup; | ||
| import com.alipay.sofa.rpc.common.config.RpcConfigKeys; | ||
| import com.alipay.sofa.rpc.common.utils.StringUtils; | ||
| import com.alipay.sofa.rpc.dynamic.DynamicConfigKeyHelper; | ||
| import com.alipay.sofa.rpc.dynamic.DynamicConfigManager; | ||
| import com.alipay.sofa.rpc.dynamic.DynamicHelper; | ||
| import com.alipay.sofa.rpc.ext.Extension; | ||
| import com.alibaba.nacos.api.config.ConfigService; | ||
| import com.alibaba.nacos.api.exception.NacosException; | ||
| import com.alibaba.nacos.api.config.ConfigFactory; | ||
| import com.alipay.sofa.rpc.log.Logger; | ||
| import com.alipay.sofa.rpc.log.LoggerFactory; | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| /** | ||
| * @author Narziss | ||
| * @version NaocsDynamicConfigManager.java, v 0.1 2024年07月26日 09:37 Narziss | ||
| */ | ||
|
|
||
| @Extension(value = "nacos", override = true) | ||
| public class NacosDynamicConfigManager extends DynamicConfigManager { | ||
|
|
||
| private final static Logger LOGGER = LoggerFactory.getLogger(NacosDynamicConfigManager.class); | ||
| private static final String DEFAULT_NAMESPACE = "sofa-rpc"; | ||
| private static final String ADDRESS = SofaConfigs.getOrDefault(RpcConfigKeys.NACOS_ADDRESS); | ||
| private static final String DEFAULT_GROUP = "sofa-rpc"; | ||
| private static final long DEFAULT_TIMEOUT = 5000; | ||
| private ConfigService configService; | ||
| private Properties nacosConfig = new Properties(); | ||
| private final String appName; | ||
|
|
||
| protected NacosDynamicConfigManager(String appName) { | ||
| super(appName); | ||
| if (StringUtils.isEmpty(appName)) { | ||
| this.appName = DEFAULT_GROUP; | ||
| } else { | ||
| this.appName = appName; | ||
| } | ||
| try { | ||
| nacosConfig.put(PropertyKeyConst.SERVER_ADDR, ADDRESS); | ||
| nacosConfig.put(PropertyKeyConst.NAMESPACE, DEFAULT_NAMESPACE); | ||
| configService = ConfigFactory.createConfigService(nacosConfig); | ||
|
|
||
| } catch (NacosException e) { | ||
| LOGGER.error("Failed to create ConfigService", e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void initServiceConfiguration(String service) { | ||
| //TODO not now | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public String getProviderServiceProperty(String service, String key) { | ||
| try { | ||
| String configValue = configService.getConfig( | ||
| DynamicConfigKeyHelper.buildProviderServiceProKey(service, key), | ||
| appName, DEFAULT_TIMEOUT); | ||
| return configValue != null ? configValue : DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } catch (NacosException e) { | ||
| return DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getConsumerServiceProperty(String service, String key) { | ||
| try { | ||
| String configValue = configService.getConfig( | ||
| DynamicConfigKeyHelper.buildConsumerServiceProKey(service, key), | ||
| appName, DEFAULT_TIMEOUT); | ||
| return configValue != null ? configValue : DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } catch (NacosException e) { | ||
| return DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getProviderMethodProperty(String service, String method, String key) { | ||
| try { | ||
| String configValue = configService.getConfig( | ||
| DynamicConfigKeyHelper.buildProviderMethodProKey(service, method, key), | ||
| appName, DEFAULT_TIMEOUT); | ||
| return configValue != null ? configValue : DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } catch (NacosException e) { | ||
| return DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getConsumerMethodProperty(String service, String method, String key) { | ||
| try { | ||
| String configValue = configService.getConfig( | ||
| DynamicConfigKeyHelper.buildConsumerMethodProKey(service, method, key), | ||
| appName, DEFAULT_TIMEOUT); | ||
| return configValue != null ? configValue : DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } catch (NacosException e) { | ||
| return DynamicHelper.DEFAULT_DYNAMIC_VALUE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public AuthRuleGroup getServiceAuthRule(String service) { | ||
| //TODO 暂不支持 | ||
| return null; | ||
| } | ||
| } |
2 changes: 2 additions & 0 deletions
2
...ain/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.dynamic.DynamicConfigManager
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| nacos=com.alipay.sofa.rpc.dynamic.nacos.NacosDynamicConfigManager | ||
|
|
58 changes: 58 additions & 0 deletions
58
...-nacos/src/test/java/com/alipay/sofa/rpc/dynamic/nacos/NacosDynamicConfigManagerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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.alipay.sofa.rpc.dynamic.nacos; | ||
|
|
||
| import com.alipay.sofa.rpc.dynamic.DynamicConfigManager; | ||
| import com.alipay.sofa.rpc.dynamic.DynamicConfigManagerFactory; | ||
| import com.alipay.sofa.rpc.dynamic.DynamicHelper; | ||
| import com.alipay.sofa.rpc.log.Logger; | ||
| import com.alipay.sofa.rpc.log.LoggerFactory; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| public class NacosDynamicConfigManagerTest { | ||
|
|
||
| private final static Logger logger = LoggerFactory | ||
| .getLogger(NacosDynamicConfigManagerTest.class); | ||
|
|
||
| private DynamicConfigManager nacosDynamicConfigManager = DynamicConfigManagerFactory.getDynamicManager("test", | ||
| "nacos"); | ||
|
|
||
| @Test | ||
| public void getProviderServiceProperty() { | ||
| String result = nacosDynamicConfigManager.getProviderServiceProperty("serviceName", "timeout"); | ||
| Assert.assertEquals(DynamicHelper.DEFAULT_DYNAMIC_VALUE, result); | ||
| } | ||
|
|
||
| @Test | ||
| public void getConsumerServiceProperty() { | ||
| String result = nacosDynamicConfigManager.getConsumerServiceProperty("serviceName", "timeout"); | ||
| Assert.assertEquals(DynamicHelper.DEFAULT_DYNAMIC_VALUE, result); | ||
| } | ||
|
|
||
| @Test | ||
| public void getProviderMethodProperty() { | ||
| String result = nacosDynamicConfigManager.getProviderMethodProperty("serviceName", "methodName", "timeout"); | ||
| Assert.assertEquals(DynamicHelper.DEFAULT_DYNAMIC_VALUE, result); | ||
| } | ||
|
|
||
| @Test | ||
| public void getConsumerMethodProperty() { | ||
| String result = nacosDynamicConfigManager.getConsumerMethodProperty("serviceName", "methodName", "timeout"); | ||
| Assert.assertEquals(DynamicHelper.DEFAULT_DYNAMIC_VALUE, result); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> | ||
| <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> | ||
|
|
||
| <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> | ||
| <layout class="org.apache.log4j.PatternLayout"> | ||
| <param name="ConversionPattern" value="%d %t %5p [%c:%M:%L] - %m%n"/> | ||
| </layout> | ||
| </appender> | ||
|
|
||
| <root> | ||
| <level value="INFO"/> | ||
| <appender-ref ref="CONSOLE"/> | ||
| </root> | ||
|
|
||
| </log4j:configuration> |
Oops, something went wrong.