Merge 785aa3b into aafc487

apache · May 30, 2019 · f3b33a4 · f3b33a4
2 parents aafc487 + 785aa3b
commit f3b33a4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/...c/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java b/...c/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
@@ -112,6 +112,11 @@ public void setRequestBody(Object requestBody) {
     this.requestBody = requestBody;
   }
 
+  public void setHttpHeaders(HttpHeaders headers) {
+    if (headers !=null) {
+      this.httpHeaders = headers;
+    }
+  }
   @Override
   public HttpMethod getMethod() {
     return method;

diff --git a/...va/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallback.java b/...va/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallback.java
@@ -34,6 +34,7 @@ public void doWithRequest(AsyncClientHttpRequest request) {
     CseAsyncClientHttpRequest cseAsyncClientHttpRequest = (CseAsyncClientHttpRequest) request;
     if (requestBody != null) {
       cseAsyncClientHttpRequest.setRequestBody(requestBody.getBody());
+      cseAsyncClientHttpRequest.setHttpHeaders(requestBody.getHeaders());
     }
 
     if (!CseHttpEntity.class.isInstance(requestBody)) {

diff --git a/...st/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequest.java b/...st/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequest.java
@@ -32,6 +32,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -84,7 +85,10 @@ protected Response doInvoke(Invocation invocation) {
           }
         };
     byte[] body = "abc".getBytes();
+    HttpHeaders headers = new HttpHeaders();
+    headers.add("token", "123");
     client.setRequestBody(body);
+    client.setHttpHeaders(headers);
 
     client.execute();