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 2018/08/01 10:10:38 UTC
[incubator-servicecomb-java-chassis] branch master updated (1726385
-> 99bb27f)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 1726385 [SCB-790] disable run it-consumer during CI, will be resolved in: https://issues.apache.org/jira/browse/SCB-793
new 7c12ef9 [SCB-794]Edge invocation do not properly send servlet filter response code
new 99bb27f [SCB-794]set reason phase also
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../transport/rest/client/http/DefaultHttpClientFilter.java | 4 ++--
.../rest/client/http/TestDefaultHttpClientFilter.java | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
[incubator-servicecomb-java-chassis] 02/02: [SCB-794]set reason
phase also
Posted by 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 99bb27f9f5c6a33fda95978aa0a0e411b9d6adb7
Author: liubao <ba...@huawei.com>
AuthorDate: Wed Aug 1 16:51:37 2018 +0800
[SCB-794]set reason phase also
---
.../servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java
index d4a0829..bfaac00 100644
--- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java
+++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java
@@ -79,7 +79,7 @@ public class DefaultHttpClientFilter implements HttpClientFilter {
responseEx.getStatus(),
responseEx.getStatusType().getReasonPhrase(),
responseEx.getHeader(HttpHeaders.CONTENT_TYPE));
- return ExceptionFactory.createConsumerException(new InvocationException(responseEx.getStatus(), "", msg));
+ return ExceptionFactory.createConsumerException(new InvocationException(responseEx.getStatus(), responseEx.getStatusType().getReasonPhrase(), msg));
}
try {
[incubator-servicecomb-java-chassis] 01/02: [SCB-794]Edge
invocation do not properly send servlet filter response code
Posted by 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 7c12ef995ed2091aa4c88a78c644d9f9688346c8
Author: liubao <ba...@huawei.com>
AuthorDate: Wed Aug 1 14:26:34 2018 +0800
[SCB-794]Edge invocation do not properly send servlet filter response code
---
.../transport/rest/client/http/DefaultHttpClientFilter.java | 4 ++--
.../rest/client/http/TestDefaultHttpClientFilter.java | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java
index 097c39c..d4a0829 100644
--- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java
+++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java
@@ -30,8 +30,8 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
+import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.apache.servicecomb.swagger.invocation.response.ResponseMeta;
public class DefaultHttpClientFilter implements HttpClientFilter {
@@ -79,7 +79,7 @@ public class DefaultHttpClientFilter implements HttpClientFilter {
responseEx.getStatus(),
responseEx.getStatusType().getReasonPhrase(),
responseEx.getHeader(HttpHeaders.CONTENT_TYPE));
- return ExceptionFactory.createConsumerException(new CommonExceptionData(msg));
+ return ExceptionFactory.createConsumerException(new InvocationException(responseEx.getStatus(), "", msg));
}
try {
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
index 8e6168a..542e82c 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.foundation.vertx.http.ReadStreamPart;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.apache.servicecomb.swagger.invocation.response.ResponseMeta;
import org.junit.Assert;
@@ -120,15 +119,19 @@ public class TestDefaultHttpClientFilter {
result = operationMeta;
operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION);
result = swaggerRestOperation;
+ responseEx.getStatus();
+ result = 401;
}
};
Response response = filter.afterReceiveResponse(invocation, responseEx);
InvocationException exception = response.getResult();
- CommonExceptionData data = (CommonExceptionData) exception.getErrorData();
Assert.assertEquals(
- "method null, path null, statusCode 0, reasonPhrase null, response content-type null is not supported",
- data.getMessage());
+ 401,
+ exception.getStatusCode());
+ Assert.assertEquals(
+ "method null, path null, statusCode 401, reasonPhrase null, response content-type null is not supported",
+ exception.getErrorData());
}
@Test