tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-27 08:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf[net]: 优化consumer可以重名

Browse Source
This commit is contained in:
meiwei
2022-07-22 18:31:31 +08:00
parent 55d7139f93
commit f723437cde
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/main/java/com/zfoo/net/config/manager/ConfigManager.java
+3 -4
View File
@@ -20,6 +20,7 @@ import com.zfoo.protocol.ProtocolManager;
import com.zfoo.protocol.collection.CollectionUtils;
import com.zfoo.protocol.registration.ProtocolModule;
import com.zfoo.protocol.util.AssertionUtils;
import com.zfoo.protocol.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,8 +80,7 @@ public class ConfigManager implements IConfigManager {
var consumerConfig = localConfig.getConsumer();
if (Objects.nonNull(consumerConfig) && CollectionUtils.isNotEmpty(consumerConfig.getConsumers())) {
var set = new HashSet<String>();
var protocolModuleSet = new HashSet<ProtocolModule>();
var protocolModuleSet = new HashSet<String>();
for (var consumerModule : consumerConfig.getConsumers()) {
// 提供的接口实现 提供者名
var consumer = consumerModule.getConsumer();
@@ -88,8 +88,7 @@ public class ConfigManager implements IConfigManager {
var protocolModule = ProtocolManager.moduleByModuleName(protocolModuleName);
AssertionUtils.isTrue(protocolModule != null, "服务消费者[name:{}]在协议文件中不存在", protocolModuleName);
consumerModule.setProtocolModule(protocolModule);
AssertionUtils.isTrue(set.add(consumer), "服务消费者[name:{}]配置重复", consumer);
AssertionUtils.isTrue(protocolModuleSet.add(protocolModule), "服务消费者[name:{}]重复消费了协议模块{}", consumer, protocolModule);
AssertionUtils.isTrue(protocolModuleSet.add(StringUtils.joinWith(StringUtils.HYPHEN, protocolModuleName, consumer)), "服务消费者[name:{}]重复消费了协议模块{}", consumer, protocolModule);
}
}
net/src/main/java/com/zfoo/net/config/model/ConsumerModule.java
+4
View File
@@ -41,6 +41,10 @@ public class ConsumerModule {
this.consumer = consumer;
this.loadBalancer = loadBalancer;
}
public boolean matchProvider(ProviderModule providerModule) {
return Objects.equals(protocolModule.getName(), providerModule.getProtocolModule().getName()) && Objects.equals(consumer, providerModule.getProvider());
}
public String getConsumer() {
return consumer;
net/src/main/java/com/zfoo/net/consumer/registry/RegisterVO.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class RegisterVO {
return false;
}
for (var provider : providerVO.getProviderConfig().getProviders()) {
if (consumerVO.getConsumerConfig().getConsumers().stream().anyMatch(it -> provider.getProvider().equals(it.getConsumer()))) {
if (consumerVO.getConsumerConfig().getConsumers().stream().anyMatch(it -> it.matchProvider(provider))) {
return true;
}
}