[incubator-servicecomb-java-chassis] 04/06: [SCB-790] make integration test control transport easier

[li...@apache.org]

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/incubator-servicecomb-java-chassis.git

commit 68a7605bac9819fbc130607d71b7413155485ac8
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue Jul 31 11:31:08 2018 +0800

    [SCB-790] make integration test control transport easier
---
 .../java/org/apache/servicecomb/provider/pojo/Invoker.java | 14 +++++++++-----
 .../provider/springmvc/reference/CseClientHttpRequest.java |  6 +++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/Invoker.java b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/Invoker.java
index 05cd2fd..bcb4448 100644
--- a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/Invoker.java
+++ b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/Invoker.java
@@ -63,14 +63,14 @@ public class Invoker implements InvocationHandler {
   }
 
   // 原始数据
-  private String microserviceName;
+  protected String microserviceName;
 
-  private String schemaId;
+  protected String schemaId;
 
-  private Class<?> consumerIntf;
+  protected Class<?> consumerIntf;
 
   // 生成的数据
-  private InvokerMeta invokerMeta = new InvokerMeta(null, null, null, null);
+  protected InvokerMeta invokerMeta = new InvokerMeta(null, null, null, null);
 
   @SuppressWarnings("unchecked")
   public static <T> T createProxy(String microserviceName, String schemaId, Class<?> consumerIntf) {
@@ -85,7 +85,7 @@ public class Invoker implements InvocationHandler {
   }
 
   protected InvokerMeta createInvokerMeta() {
-    ReferenceConfig referenceConfig = SCBEngine.getInstance().getReferenceConfigForInvoke(microserviceName);
+    ReferenceConfig referenceConfig = findReferenceConfig();
     MicroserviceMeta microserviceMeta = referenceConfig.getMicroserviceMeta();
 
     SchemaMeta schemaMeta;
@@ -115,6 +115,10 @@ public class Invoker implements InvocationHandler {
     return new InvokerMeta(referenceConfig, microserviceMeta, schemaMeta, swaggerConsumer);
   }
 
+  protected ReferenceConfig findReferenceConfig() {
+    return SCBEngine.getInstance().getReferenceConfigForInvoke(microserviceName);
+  }
+
   @Override
   public Object invoke(Object proxy, Method method, Object[] args) {
     InvokerMeta currentInvokerMeta = invokerMeta;
diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
index ec9add3..6f33883 100644
--- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
+++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
@@ -149,7 +149,7 @@ public class CseClientHttpRequest implements ClientHttpRequest {
   protected RequestMeta createRequestMeta(String httpMethod, URI uri) {
     String microserviceName = uri.getAuthority();
 
-    ReferenceConfig referenceConfig = SCBEngine.getInstance().getReferenceConfigForInvoke(microserviceName);
+    ReferenceConfig referenceConfig = findReferenceConfig(microserviceName);
 
     MicroserviceMeta microserviceMeta = referenceConfig.getMicroserviceMeta();
     ServicePathManager servicePathManager = ServicePathManager.getServicePathManager(microserviceMeta);
@@ -166,6 +166,10 @@ public class CseClientHttpRequest implements ClientHttpRequest {
     return new RequestMeta(referenceConfig, swaggerRestOperation, pathParams);
   }
 
+  protected ReferenceConfig findReferenceConfig(String microserviceName) {
+    return SCBEngine.getInstance().getReferenceConfigForInvoke(microserviceName);
+  }
+
   protected String findUriPath(URI uri) {
     return uri.getRawPath();
   }