[servicecomb-java-chassis] 03/03: [SCB-1278] add comment on Microservice#thirdPartyService, change config key of clientRequestHeaderFilterEnabled

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

commit aafc4873898525e22afcbb9da45ee858baa778aa
Author: yhs0092 <yh...@163.com>
AuthorDate: Wed May 29 11:49:43 2019 +0800

    [SCB-1278] add comment on Microservice#thirdPartyService, change config key of clientRequestHeaderFilterEnabled
---
 .../apache/servicecomb/core/definition/OperationConfig.java    |  3 +--
 .../it/testcase/thirdparty/Test3rdPartyInvocation.java         | 10 ++++++++--
 .../servicecomb/serviceregistry/api/registry/Microservice.java |  6 ++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/OperationConfig.java b/core/src/main/java/org/apache/servicecomb/core/definition/OperationConfig.java
index 58ee306..6b670e6 100644
--- a/core/src/main/java/org/apache/servicecomb/core/definition/OperationConfig.java
+++ b/core/src/main/java/org/apache/servicecomb/core/definition/OperationConfig.java
@@ -64,8 +64,7 @@ public class OperationConfig {
   /**
    * whether to remove certain headers from the 3rd party invocations
    */
-  @InjectProperty(keys = {"request.${op-any-priority}.clientRequestHeaderFilterEnabled",
-      "request.clientRequestHeaderFilterEnabled"}, defaultValue = "true")
+  @InjectProperty(keys = {"request.clientRequestHeaderFilterEnabled${consumer-op-priority}"}, defaultValue = "true")
   private boolean clientRequestHeaderFilterEnabled = true;
 
   /**
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/thirdparty/Test3rdPartyInvocation.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/thirdparty/Test3rdPartyInvocation.java
index 6a2416e..d966f48 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/thirdparty/Test3rdPartyInvocation.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/thirdparty/Test3rdPartyInvocation.java
@@ -116,12 +116,18 @@ public class Test3rdPartyInvocation {
     // user defined header, even though start with x-cse, will not be removed
     Assert.assertThat(response, Matchers.contains("host", "x-cse-test", "x-cse-test2"));
 
-    ArchaiusUtils.setProperty("servicecomb.request.3rdPartyDataTypeJaxrs.clientRequestHeaderFilterEnabled", "false");
+    ArchaiusUtils.setProperty("servicecomb.request.clientRequestHeaderFilterEnabled", "false");
     response = dataTypeJaxrsSchema.getRequestHeaders(testParam, testParam2);
     Assert.assertThat(response,
         Matchers.contains("host", "x-cse-context", "x-cse-target-microservice", "x-cse-test", "x-cse-test2"));
 
-    ArchaiusUtils.setProperty("servicecomb.request.3rdPartyDataTypeJaxrs.clientRequestHeaderFilterEnabled", "true");
+    ArchaiusUtils.setProperty("servicecomb.request.clientRequestHeaderFilterEnabled", "true");
+    ArchaiusUtils.setProperty("servicecomb.request.clientRequestHeaderFilterEnabled.3rdPartyDataTypeJaxrs", "false");
+    response = dataTypeJaxrsSchema.getRequestHeaders(testParam, testParam2);
+    Assert.assertThat(response,
+        Matchers.contains("host", "x-cse-context", "x-cse-target-microservice", "x-cse-test", "x-cse-test2"));
+
+    ArchaiusUtils.setProperty("servicecomb.request.clientRequestHeaderFilterEnabled.3rdPartyDataTypeJaxrs", "true");
   }
 
   @Test
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/Microservice.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/Microservice.java
index d9d146b..63d6504 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/Microservice.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/Microservice.java
@@ -70,6 +70,12 @@ public class Microservice {
   @JsonIgnore
   private MicroserviceInstance instance;
 
+  /**
+   * Currently this field only exists in ServiceComb-Java-Chassis,
+   * and ServiceComb-Service-Center does not hold this field.
+   * Once the 3rd party services are supported to be registered into ServiceComb-Service-Center,
+   * the corresponding field should be added into Service-Center.
+   */
   private boolean thirdPartyService;
 
   public Microservice() {