[SCB-1278] add comment on Microservice#thirdPartyService, change conf…

…ig key of clientRequestHeaderFilterEnabled
apache · May 30, 2019 · aafc487 · aafc487
1 parent d894842
commit aafc487
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 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
@@ -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/...r/src/main/java/org/apache/servicecomb/it/testcase/thirdparty/Test3rdPartyInvocation.java b/...r/src/main/java/org/apache/servicecomb/it/testcase/thirdparty/Test3rdPartyInvocation.java
@@ -116,12 +116,18 @@ public void testExposeServiceCombHeaders() {
     // 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/...istry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/Microservice.java b/...istry/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() {