diff --git a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java index 47b3a1b2d52..0c211b088aa 100644 --- a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java @@ -64,4 +64,9 @@ public void setHeader(String name, String value) { public void addHeader(String name, String value) { clientRequest.headers().add(name, value); } + + @Override + public String getContextPath() { + return ""; + } } diff --git a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java index e6897975238..e361ed9b761 100644 --- a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java @@ -195,6 +195,11 @@ public String getServletPath() { return this.getPathInfo(); } + @Override + public String getContextPath() { + return ""; + } + @Override public ServletInputStream getInputStream() throws IOException { if (inputStream == null) { diff --git a/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java index ebca9da805c..858bf1c20ab 100644 --- a/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java @@ -138,4 +138,9 @@ public void testAddHeader() { request.addHeader("name", "v2"); Assert.assertThat(headers.getAll("name"), Matchers.contains("v1", "v2")); } + + @Test + public void testGetContextPath() { + Assert.assertEquals("", request.getContextPath()); + } } diff --git a/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java index f6dbd3bfd10..f5a666e483e 100644 --- a/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/test/java/io/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java @@ -395,6 +395,11 @@ public void testGetServletPath() { Assert.assertEquals("/path", request.getServletPath()); } + @Test + public void testGetContextPath() { + Assert.assertEquals("", request.getContextPath()); + } + @Test public void testGetInputStream() throws IOException { Buffer body = Buffer.buffer(); diff --git a/providers/provider-rest-common/src/main/java/io/servicecomb/provider/rest/common/InvocationToHttpServletRequest.java b/providers/provider-rest-common/src/main/java/io/servicecomb/provider/rest/common/InvocationToHttpServletRequest.java index b51355c3824..bde8c8e07dc 100644 --- a/providers/provider-rest-common/src/main/java/io/servicecomb/provider/rest/common/InvocationToHttpServletRequest.java +++ b/providers/provider-rest-common/src/main/java/io/servicecomb/provider/rest/common/InvocationToHttpServletRequest.java @@ -38,7 +38,7 @@ public class InvocationToHttpServletRequest extends AbstractHttpServletRequest { public InvocationToHttpServletRequest(Invocation invocation) { this.swaggerOperation = invocation.getOperationMeta().getExtData(RestConst.SWAGGER_REST_OPERATION); this.args = invocation.getArgs(); - this.sockerAddress = (SocketAddress)invocation.getHandlerContext().get(Const.REMOTE_ADDRESS); + this.sockerAddress = (SocketAddress) invocation.getHandlerContext().get(Const.REMOTE_ADDRESS); } @Override @@ -109,14 +109,19 @@ public String getPathInfo() { public String getRemoteAddr() { return this.sockerAddress == null ? "" : this.sockerAddress.host(); } - + @Override public String getRemoteHost() { return this.sockerAddress == null ? "" : this.sockerAddress.host(); } - + @Override public int getRemotePort() { return this.sockerAddress == null ? 0 : this.sockerAddress.port(); } + + @Override + public String getContextPath() { + return ""; + } } diff --git a/providers/provider-rest-common/src/test/java/io/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java b/providers/provider-rest-common/src/test/java/io/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java index 4f5c012f856..1d7a7592629 100644 --- a/providers/provider-rest-common/src/test/java/io/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java +++ b/providers/provider-rest-common/src/test/java/io/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java @@ -51,10 +51,10 @@ public class TestInvocationToHttpServletRequest { @Mocked Object[] args; - + @Mocked SocketAddress socketAddress; - + Map handlerContext = new HashMap<>(); HttpServletRequest request; @@ -316,4 +316,10 @@ public void testGetRemoteAddressEmpty(@Mocked Invocation invocation) throws Exce Assert.assertEquals(host, ""); Assert.assertEquals(port, 0); } + + @Test + public void testGetContextPath(@Mocked Invocation invocation) throws Exception { + InvocationToHttpServletRequest request = new InvocationToHttpServletRequest(invocation); + Assert.assertEquals("", request.getContextPath()); + } }