You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/05/25 08:59:23 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1931] fix
consumer flag in MicroserviceMeta
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new e413d63 [SCB-1931] fix consumer flag in MicroserviceMeta
e413d63 is described below
commit e413d6367079f4b0cb7e78f30e9691e0439abcbb
Author: wujimin <wu...@huawei.com>
AuthorDate: Sun May 24 21:57:44 2020 +0800
[SCB-1931] fix consumer flag in MicroserviceMeta
---
.../src/main/java/org/apache/servicecomb/core/SCBEngine.java | 2 +-
.../apache/servicecomb/core/definition/MicroserviceMeta.java | 12 ++----------
.../servicecomb/core/definition/ServiceRegistryListener.java | 2 +-
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
index ded2504..bde8a37 100644
--- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
+++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
@@ -357,7 +357,7 @@ public class SCBEngine {
List<Handler> consumerHandlerChain = consumerHandlerManager.getOrCreate(microserviceName);
List<Handler> producerHandlerChain = producerHandlerManager.getOrCreate(microserviceName);
- producerMicroserviceMeta = new MicroserviceMeta(this, microserviceName, consumerHandlerChain, producerHandlerChain);
+ producerMicroserviceMeta = new MicroserviceMeta(this, microserviceName, consumerHandlerChain, producerHandlerChain, false);
producerMicroserviceMeta.setMicroserviceVersionsMeta(new MicroserviceVersionsMeta(this, microserviceName));
}
diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/MicroserviceMeta.java b/core/src/main/java/org/apache/servicecomb/core/definition/MicroserviceMeta.java
index 7b341a9..a5c15dc 100644
--- a/core/src/main/java/org/apache/servicecomb/core/definition/MicroserviceMeta.java
+++ b/core/src/main/java/org/apache/servicecomb/core/definition/MicroserviceMeta.java
@@ -77,7 +77,7 @@ public class MicroserviceMeta {
private VendorExtensions vendorExtensions = new VendorExtensions();
public MicroserviceMeta(SCBEngine scbEngine, String microserviceName, List<Handler> consumerHandlerChain,
- List<Handler> providerHandlerChain) {
+ List<Handler> providerHandlerChain, boolean consumer) {
this.scbEngine = scbEngine;
MicroserviceNameParser parser = scbEngine.parseMicroserviceName(microserviceName);
this.appId = parser.getAppId();
@@ -86,6 +86,7 @@ public class MicroserviceMeta {
this.consumerHandlerChain = consumerHandlerChain;
this.providerHandlerChain = providerHandlerChain;
+ this.consumer = consumer;
}
public MicroserviceConfig getMicroserviceConfig() {
@@ -108,15 +109,6 @@ public class MicroserviceMeta {
return consumer;
}
- public void setConsumer(boolean consumer) {
- this.consumer = consumer;
- }
-
- public MicroserviceMeta consumer(boolean consumer) {
- this.consumer = consumer;
- return this;
- }
-
public String getMicroserviceName() {
return microserviceName;
}
diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java b/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java
index b6c4c8e..0931864 100644
--- a/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java
+++ b/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java
@@ -84,7 +84,7 @@ public class ServiceRegistryListener {
List<Handler> producerHandlerChain = scbEngine.getProducerHandlerManager().getOrCreate(microserviceName);
MicroserviceMeta microserviceMeta = new MicroserviceMeta(scbEngine, microserviceName,
- consumerHandlerChain, producerHandlerChain);
+ consumerHandlerChain, producerHandlerChain, true);
MicroserviceVersions microserviceVersions = microserviceVersion.getMicroserviceVersions();
microserviceMeta.setMicroserviceVersionsMeta(getMicroserviceVersionsMeta(microserviceVersions));