You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/06/10 23:27:09 UTC
incubator-juneau git commit: Remove deprecated methods.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 5d9a98947 -> bc3a393c2
Remove deprecated methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/bc3a393c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/bc3a393c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/bc3a393c
Branch: refs/heads/master
Commit: bc3a393c255dcf75076962276baf7b8bb100fc18
Parents: 5d9a989
Author: JamesBognar <ja...@apache.org>
Authored: Sat Jun 10 19:27:06 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Jun 10 19:27:06 2017 -0400
----------------------------------------------------------------------
.../apache/juneau/rest/test/PathsResource.java | 4 +-
.../apache/juneau/rest/test/UrisResource.java | 2 +-
.../org/apache/juneau/rest/test/PathsTest.java | 241 +---------------
.../org/apache/juneau/rest/test/UrisTest.java | 280 -------------------
.../org/apache/juneau/rest/RestRequest.java | 67 +----
.../org/apache/juneau/rest/vars/RequestVar.java | 9 +-
6 files changed, 16 insertions(+), 587 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bc3a393c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
index 54d2921..ea29610 100644
--- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
+++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
@@ -60,11 +60,11 @@ public class PathsResource extends RestServletDefault {
.append("pathRemainder", req.getPathMatch().getRemainder())
.append("pathRemainderUndecoded", req.getPathMatch().getRemainderUndecoded())
.append("requestURI", req.getRequestURI())
- .append("requestParentURI", req.getRequestParentURI())
+ .append("requestParentURI", req.getUriContext().getRootRelativePathInfoParent())
.append("requestURL", req.getRequestURL())
.append("servletPath", req.getServletPath())
.append("servletURI", req.getServletURI())
- .append("servletParentURI", req.getServletParentURI())
+ .append("servletParentURI", req.getUriContext().getRootRelativeServletPathParent())
.append("relativeServletURI", req.getRelativeServletURI());
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bc3a393c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
index ce548bf..89d5172 100644
--- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
+++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
@@ -108,7 +108,7 @@ public class UrisResource extends RestServletDefault {
m.put("pathInfo", req.getPathInfo());
m.put("pathRemainder", req.getPathMatch().getRemainder());
m.put("pathTranslated", req.getPathTranslated());
- m.put("requestParentURI", req.getRequestParentURI());
+ m.put("requestParentURI", req.getUriContext().getRootRelativePathInfoParent());
m.put("requestURI", req.getRequestURI());
m.put("requestURL", req.getRequestURL());
m.put("servletPath", req.getServletPath());
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bc3a393c/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java
index f2b8ec3..9c256bb 100644
--- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java
+++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java
@@ -198,71 +198,13 @@ public class PathsTest extends RestTestcase {
assertEquals("/foo//bar//", r.getString("pathRemainder"));
assertEquals("/foo//bar//", r.getString("pathRemainder2"));
assertTrue(r.getString("requestURI").endsWith("/testPaths//foo//bar//"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths//foo/"));
+ assertTrue(r.getString("requestParentURI").endsWith("/testPaths/foo/"));
assertTrue(r.getString("requestURL").endsWith("/testPaths//foo//bar//"));
assertTrue(r.getString("servletPath").endsWith("/testPaths"));
assertTrue(r.getString("servletURI").endsWith("/testPaths"));
assertTrue(r.getString("relativeServletURI").endsWith("/testPaths"));
assertEquals(1, (int)r.getInt("method"));
- // [/test/testPaths/foo%2Fbar]
- // {
- // pathInfo: '/foo//bar',
- // pathRemainder: 'foo//bar',
- // pathRemainderUndecoded: 'foo%2F%2Fbar',
- // requestURI: '/jazz/juneau/test/testPaths/foo%2F%2Fbar',
- // requestParentURI: '/jazz/juneau/test/testPaths',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/foo%2F%2Fbar',
- // servletPath: '/juneau/test/testPaths',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test',
- // relativeServletURI: '/jazz/juneau/test/testPaths',
- // pathRemainder2: 'foo//bar',
- // method: 1
- // }
- url = URL + "/foo%2F%2Fbar";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("/foo//bar", r.getString("pathInfo"));
- assertEquals("foo//bar", r.getString("pathRemainder"));
- assertEquals("foo%2F%2Fbar", r.getString("pathRemainderUndecoded"));
- assertEquals("foo//bar", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/foo%2F%2Fbar"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/foo%2F%2Fbar"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths"));
- assertEquals(1, (int)r.getInt("method"));
-
- // [/test/testPaths//foo%2Fbar//]
- // {
- // pathInfo: '//foo//bar//',
- // pathRemainder: '/foo//bar//',
- // pathRemainderUndecoded: '/foo%2F%2Fbar//',
- // requestURI: '/jazz/juneau/test/testPaths//foo%2F%2Fbar//',
- // requestParentURI: '/jazz/juneau/test/testPaths/',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths//foo%2F%2Fbar//',
- // servletPath: '/juneau/test/testPaths',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test',
- // relativeServletURI: '/jazz/juneau/test/testPaths',
- // pathRemainder2: '/foo//bar//',
- // method: 1
- // }
- url = URL + "//foo%2F%2Fbar//";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("//foo//bar//", r.getString("pathInfo"));
- assertEquals("/foo//bar//", r.getString("pathRemainder"));
- assertEquals("/foo%2F%2Fbar//", r.getString("pathRemainderUndecoded"));
- assertEquals("/foo//bar//", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths//foo%2F%2Fbar//"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths//foo%2F%2Fbar//"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths"));
- assertEquals(1, (int)r.getInt("method"));
-
// [/test/testPaths/test2]
// {
// pathInfo: '/test2',
@@ -453,64 +395,6 @@ public class PathsTest extends RestTestcase {
assertTrue(r.getString("relativeServletURI").endsWith("/testPaths"));
assertEquals(2, (int)r.getInt("method"));
- // [/test/testPaths/test2/foo%2Fbar]
- // {
- // pathInfo: '/test2/foo//bar',
- // pathRemainder: 'foo//bar',
- // pathRemainderUndecoded: 'foo%2F%2Fbar',
- // requestURI: '/jazz/juneau/test/testPaths/test2/foo%2F%2Fbar',
- // requestParentURI: '/jazz/juneau/test/testPaths/test2',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/test2/foo%2F%2Fbar',
- // servletPath: '/juneau/test/testPaths',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test',
- // relativeServletURI: '/jazz/juneau/test/testPaths',
- // pathRemainder2: 'foo//bar',
- // method: 2
- // }
- url = URL + "/test2/foo%2F%2Fbar";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("/test2/foo//bar", r.getString("pathInfo"));
- assertEquals("foo//bar", r.getString("pathRemainder"));
- assertEquals("foo%2F%2Fbar", r.getString("pathRemainderUndecoded"));
- assertEquals("foo//bar", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/test2/foo%2F%2Fbar"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/test2"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/test2/foo%2F%2Fbar"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths"));
- assertEquals(2, (int)r.getInt("method"));
-
- // [/test/testPaths/test2//foo%2Fbar//]
- // {
- // pathInfo: '/test2//foo//bar//',
- // pathRemainder: '/foo//bar//',
- // pathRemainderUndecoded: '/foo%2F%2Fbar//',
- // requestURI: '/jazz/juneau/test/testPaths/test2//foo%2F%2Fbar//',
- // requestParentURI: '/jazz/juneau/test/testPaths/test2/',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/test2//foo%2F%2Fbar//',
- // servletPath: '/juneau/test/testPaths',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test',
- // relativeServletURI: '/jazz/juneau/test/testPaths',
- // pathRemainder2: '/foo//bar//',
- // method: 2
- // }
- url = URL + "/test2//foo%2F%2Fbar//";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("/test2//foo//bar//", r.getString("pathInfo"));
- assertEquals("/foo//bar//", r.getString("pathRemainder"));
- assertEquals("/foo%2F%2Fbar//", r.getString("pathRemainderUndecoded"));
- assertEquals("/foo//bar//", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/test2//foo%2F%2Fbar//"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/test2/"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/test2//foo%2F%2Fbar//"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths"));
- assertEquals(2, (int)r.getInt("method"));
-
// [/test/testPaths/a]
// {
// pathInfo: null,
@@ -699,7 +583,7 @@ public class PathsTest extends RestTestcase {
assertEquals("/foo//bar//", r.getString("pathRemainder"));
assertEquals("/foo//bar//", r.getString("pathRemainder2"));
assertTrue(r.getString("requestURI").endsWith("/testPaths/a//foo//bar//"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/a//foo/"));
+ assertTrue(r.getString("requestParentURI").endsWith("/testPaths/a/foo/"));
assertTrue(r.getString("requestURL").endsWith("/testPaths/a//foo//bar//"));
assertTrue(r.getString("servletPath").endsWith("/testPaths/a"));
assertTrue(r.getString("servletURI").endsWith("/testPaths/a"));
@@ -707,67 +591,6 @@ public class PathsTest extends RestTestcase {
assertTrue(r.getString("relativeServletURI").endsWith("/testPaths/a"));
assertEquals(3, (int)r.getInt("method"));
- // [/test/testPaths/a/foo%2Fbar]
- // {
- // pathInfo: '/foo//bar',
- // pathRemainder: 'foo//bar',
- // pathRemainderUndecoded: 'foo%2F%2Fbar',
- // requestURI: '/jazz/juneau/test/testPaths/a/foo%2F%2Fbar',
- // requestParentURI: '/jazz/juneau/test/testPaths/a',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/a/foo%2F%2Fbar',
- // servletPath: '/juneau/test/testPaths/a',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths/a',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // relativeServletURI: '/jazz/juneau/test/testPaths/a',
- // pathRemainder2: 'foo//bar',
- // method: 3
- // }
- url = URL + "/a/foo%2F%2Fbar";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("/foo//bar", r.getString("pathInfo"));
- assertEquals("foo//bar", r.getString("pathRemainder"));
- assertEquals("foo%2F%2Fbar", r.getString("pathRemainderUndecoded"));
- assertEquals("foo//bar", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/a/foo%2F%2Fbar"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/a"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/a/foo%2F%2Fbar"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletParentURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths/a"));
- assertEquals(3, (int)r.getInt("method"));
-
- // [/test/testPaths/a//foo%2Fbar//]
- // {
- // pathInfo: '//foo//bar//',
- // pathRemainder: '/foo//bar//',
- // pathRemainderUndecoded: '/foo%2F%2Fbar//',
- // requestURI: '/jazz/juneau/test/testPaths/a//foo%2F%2Fbar//',
- // requestParentURI: '/jazz/juneau/test/testPaths/a/',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/a//foo%2F%2Fbar//',
- // servletPath: '/juneau/test/testPaths/a',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths/a',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // relativeServletURI: '/jazz/juneau/test/testPaths/a',
- // pathRemainder2: '/foo//bar//',
- // method: 3
- // }
- url = URL + "/a//foo%2F%2Fbar//";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("//foo//bar//", r.getString("pathInfo"));
- assertEquals("/foo//bar//", r.getString("pathRemainder"));
- assertEquals("/foo%2F%2Fbar//", r.getString("pathRemainderUndecoded"));
- assertEquals("/foo//bar//", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/a//foo%2F%2Fbar//"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/a/"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/a//foo%2F%2Fbar//"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletParentURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths/a"));
- assertEquals(3, (int)r.getInt("method"));
-
-
// [/test/testPaths/a/test2]
// {
// pathInfo: '/test2',
@@ -964,66 +787,6 @@ public class PathsTest extends RestTestcase {
assertTrue(r.getString("relativeServletURI").endsWith("/testPaths/a"));
assertEquals(4, (int)r.getInt("method"));
- // [/test/testPaths/a/test2/foo%2Fbar]
- // {
- // pathInfo: '/test2/foo//bar',
- // pathRemainder: 'foo//bar',
- // pathRemainderUndecoded: 'foo%2F%2Fbar',
- // requestURI: '/jazz/juneau/test/testPaths/a/test2/foo%2F%2Fbar',
- // requestParentURI: '/jazz/juneau/test/testPaths/a/test2',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/a/test2/foo%2F%2Fbar',
- // servletPath: '/juneau/test/testPaths/a',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths/a',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // relativeServletURI: '/jazz/juneau/test/testPaths/a',
- // pathRemainder2: 'foo//bar',
- // method: 4
- // }
- url = URL + "/a/test2/foo%2F%2Fbar";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("/test2/foo//bar", r.getString("pathInfo"));
- assertEquals("foo//bar", r.getString("pathRemainder"));
- assertEquals("foo%2F%2Fbar", r.getString("pathRemainderUndecoded"));
- assertEquals("foo//bar", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/a/test2/foo%2F%2Fbar"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/a/test2"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/a/test2/foo%2F%2Fbar"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletParentURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths/a"));
- assertEquals(4, (int)r.getInt("method"));
-
- // [/test/testPaths/a/test2//foo%2Fbar//]
- // {
- // pathInfo: '/test2//foo//bar//',
- // pathRemainder: '/foo//bar//',
- // pathRemainderUndecoded: '/foo%2F%2Fbar//',
- // requestURI: '/jazz/juneau/test/testPaths/a/test2//foo%2F%2Fbar//',
- // requestParentURI: '/jazz/juneau/test/testPaths/a/test2/',
- // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/a/test2//foo%2F%2Fbar//',
- // servletPath: '/juneau/test/testPaths/a',
- // servletURI: 'https://localhost:9443/jazz/juneau/test/testPaths/a',
- // servletParentURI: 'https://localhost:9443/jazz/juneau/test/testPaths',
- // relativeServletURI: '/jazz/juneau/test/testPaths/a',
- // pathRemainder2: '/foo//bar//',
- // method: 4
- // }
- url = URL + "/a/test2//foo%2F%2Fbar//";
- r = client.doGet(url).getResponse(ObjectMap.class);
- assertEquals("/test2//foo//bar//", r.getString("pathInfo"));
- assertEquals("/foo//bar//", r.getString("pathRemainder"));
- assertEquals("/foo%2F%2Fbar//", r.getString("pathRemainderUndecoded"));
- assertEquals("/foo//bar//", r.getString("pathRemainder2"));
- assertTrue(r.getString("requestURI").endsWith("/testPaths/a/test2//foo%2F%2Fbar//"));
- assertTrue(r.getString("requestParentURI").endsWith("/testPaths/a/test2/"));
- assertTrue(r.getString("requestURL").endsWith("/testPaths/a/test2//foo%2F%2Fbar//"));
- assertTrue(r.getString("servletPath").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletURI").endsWith("/testPaths/a"));
- assertTrue(r.getString("servletParentURI").endsWith("/testPaths"));
- assertTrue(r.getString("relativeServletURI").endsWith("/testPaths/a"));
- assertEquals(4, (int)r.getInt("method"));
-
//--------------------------------------------------------------------------------
// Spaces
//--------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bc3a393c/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java
index 962d2e6..2460dd4 100644
--- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java
+++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java
@@ -77,20 +77,6 @@ public class UrisTest extends RestTestcase {
assertEquals(URL2, r.getString("servletURI"));
//--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("root.test1", r.getString("testMethod"));
- assertEquals("/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2, r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test2
//--------------------------------------------------------------------------------
r = client.doGet("/testuris/test2").getResponse(ObjectMap.class);
@@ -133,62 +119,6 @@ public class UrisTest extends RestTestcase {
assertEquals(URL2, r.getString("servletURI"));
//--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/test3%2Ftest3
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/test3%2Ftest3").getResponse(ObjectMap.class);
- assertEquals("root.test3", r.getString("testMethod"));
- assertEquals("/test3/test3", r.getString("pathInfo"));
- assertNull(r.getString("pathRemainder"));
- assertEquals(path + "/testuris", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/test3%2Ftest3", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/test3%2Ftest3"));
- // Same for servlet
- assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2, r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/test3%2Ftest3/foo
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/test3%2Ftest3/foo").getResponse(ObjectMap.class);
- assertEquals("root.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo", r.getString("pathInfo"));
- assertEquals("foo", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/test3%2Ftest3", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/test3%2Ftest3/foo", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/test3%2Ftest3/foo"));
- // Same for servlet
- assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2, r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/test3%2Ftest3/foo/bar
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/test3%2Ftest3/foo/bar").getResponse(ObjectMap.class);
- assertEquals("root.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo/bar", r.getString("pathInfo"));
- assertEquals("foo/bar", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/test3%2Ftest3/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/test3%2Ftest3/foo/bar", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/test3%2Ftest3/foo/bar"));
- // Same for servlet
- assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2, r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/test3%2Ftest3/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/test3%2Ftest3/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("root.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/test3%2Ftest3/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/test3%2Ftest3/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/test3%2Ftest3/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2, r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test4/test4
//--------------------------------------------------------------------------------
r = client.doGet("/testuris/test4/test4").getResponse(ObjectMap.class);
@@ -229,20 +159,6 @@ public class UrisTest extends RestTestcase {
// Same for servlet
assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
assertEquals(URL2, r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/test4/test4/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/test4/test4/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("root.test4", r.getString("testMethod"));
- assertEquals("/test4/test4/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/test4/test4/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/test4/test4/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/test4/test4/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2, r.getString("servletURI"));
}
//====================================================================================================
@@ -296,20 +212,6 @@ public class UrisTest extends RestTestcase {
assertEquals(URL2 + "/child", r.getString("servletURI"));
//--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("child.test1", r.getString("testMethod"));
- assertEquals("/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2
//--------------------------------------------------------------------------------
r = client.doGet("/testuris/child/test2").getResponse(ObjectMap.class);
@@ -352,76 +254,6 @@ public class UrisTest extends RestTestcase {
assertEquals(URL2 + "/child", r.getString("servletURI"));
//--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test2/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/test2/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("child.test2", r.getString("testMethod"));
- assertEquals("/test2/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/test2/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/test2/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/test2/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/test3%2Ftest3").getResponse(ObjectMap.class);
- assertEquals("child.test3", r.getString("testMethod"));
- assertEquals("/test3/test3", r.getString("pathInfo"));
- assertNull(r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/test3%2Ftest3", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/test3%2Ftest3"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/test3%2Ftest3/foo").getResponse(ObjectMap.class);
- assertEquals("child.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo", r.getString("pathInfo"));
- assertEquals("foo", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/test3%2Ftest3", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/test3%2Ftest3/foo", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/test3%2Ftest3/foo"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/test3%2Ftest3/foo/bar").getResponse(ObjectMap.class);
- assertEquals("child.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo/bar", r.getString("pathInfo"));
- assertEquals("foo/bar", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/test3%2Ftest3/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/test3%2Ftest3/foo/bar", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/test3%2Ftest3/foo/bar"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/test3%2Ftest3/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("child.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/test3%2Ftest3/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/test3%2Ftest3/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/test3%2Ftest3/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4
//--------------------------------------------------------------------------------
r = client.doGet("/testuris/child/test4/test4").getResponse(ObjectMap.class);
@@ -462,20 +294,6 @@ public class UrisTest extends RestTestcase {
// Same for servlet
assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
assertEquals(URL2 + "/child", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test4/test4/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/test4/test4/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("child.test4", r.getString("testMethod"));
- assertEquals("/test4/test4/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/test4/test4/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/test4/test4/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/test4/test4/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child", r.getString("servletURI"));
}
//====================================================================================================
@@ -529,20 +347,6 @@ public class UrisTest extends RestTestcase {
assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
//--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("grandchild.test1", r.getString("testMethod"));
- assertEquals("/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2
//--------------------------------------------------------------------------------
r = client.doGet("/testuris/child/grandchild/test2").getResponse(ObjectMap.class);
@@ -585,76 +389,6 @@ public class UrisTest extends RestTestcase {
assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
//--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test2/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/test2/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("grandchild.test2", r.getString("testMethod"));
- assertEquals("/test2/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild/test2/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/test2/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/test2/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/test3%2Ftest3").getResponse(ObjectMap.class);
- assertEquals("grandchild.test3", r.getString("testMethod"));
- assertEquals("/test3/test3", r.getString("pathInfo"));
- assertNull(r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/test3%2Ftest3"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/test3%2Ftest3/foo").getResponse(ObjectMap.class);
- assertEquals("grandchild.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo", r.getString("pathInfo"));
- assertEquals("foo", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3/foo", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/test3%2Ftest3/foo"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/test3%2Ftest3/foo/bar").getResponse(ObjectMap.class);
- assertEquals("grandchild.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo/bar", r.getString("pathInfo"));
- assertEquals("foo/bar", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3/foo/bar", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/test3%2Ftest3/foo/bar"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/test3%2Ftest3/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("grandchild.test3", r.getString("testMethod"));
- assertEquals("/test3/test3/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/test3%2Ftest3/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4
//--------------------------------------------------------------------------------
r = client.doGet("/testuris/child/grandchild/test4/test4").getResponse(ObjectMap.class);
@@ -695,19 +429,5 @@ public class UrisTest extends RestTestcase {
// Same for servlet
assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
-
- //--------------------------------------------------------------------------------
- // http://localhost:8080/sample/testuris/child/test4/test4/foo/bar%2Fbaz
- //--------------------------------------------------------------------------------
- r = client.doGet("/testuris/child/grandchild/test4/test4/foo/bar%2Fbaz").getResponse(ObjectMap.class);
- assertEquals("grandchild.test4", r.getString("testMethod"));
- assertEquals("/test4/test4/foo/bar/baz", r.getString("pathInfo"));
- assertEquals("foo/bar/baz", r.getString("pathRemainder"));
- assertEquals(path + "/testuris/child/grandchild/test4/test4/foo", r.getString("requestParentURI"));
- assertEquals(path + "/testuris/child/grandchild/test4/test4/foo/bar%2Fbaz", r.getString("requestURI"));
- assertTrue(r.getString("requestURL").endsWith(port + path + "/testuris/child/grandchild/test4/test4/foo/bar%2Fbaz"));
- // Same for servlet
- assertEquals(path + "/testuris/child/grandchild", r.getString("contextPath") + r.getString("servletPath")); // App may not have context path, but combination should always equal path.
- assertEquals(URL2 + "/child/grandchild", r.getString("servletURI"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bc3a393c/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
index 39784d2..c921a55 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -460,8 +460,12 @@ public final class RestRequest extends HttpServletRequestWrapper {
*/
public UriContext getUriContext() {
if (uriContext == null) {
- String authority = getAuthorityUri(super.getRequestURL().toString());
- uriContext = new UriContext(authority, super.getContextPath(), super.getServletPath(), super.getPathInfo());
+ String scheme = getScheme();
+ int port = getServerPort();
+ StringBuilder authority = new StringBuilder(getScheme()).append("://").append(getServerName());
+ if (! (port == 80 && "http".equals(scheme) || port == 443 && "https".equals(scheme)))
+ authority.append(':').append(port);
+ uriContext = new UriContext(authority.toString(), super.getContextPath(), super.getServletPath(), super.getPathInfo());
}
return uriContext;
}
@@ -487,65 +491,6 @@ public final class RestRequest extends HttpServletRequestWrapper {
}
/**
- * Returns the URI of the parent of this servlet.
- *
- * @return The URI of the parent of this servlet.
- */
- public String getServletParentURI() {
- String s = getServletURI();
- return s.substring(0, s.lastIndexOf('/'));
- }
-
- /**
- * Returns the URI of the parent resource.
- * <p>
- * Trailing slashes in the path are ignored by this method.
- * <p>
- * The behavior is shown below:
- * <table class='styled'>
- * <tr>
- * <th>getRequestURI</th>
- * <th>getRequestParentURI</th>
- * </tr>
- * <tr>
- * <td><code>/foo/bar</code></td>
- * <td><code>/foo</code></td>
- * </tr>
- * <tr>
- * <td><code>/foo/bar?baz=bing</code></td>
- * <td><code>/foo</code></td>
- * </tr>
- * <tr>
- * <td><code>/foo/bar/</code></td>
- * <td><code>/foo</code></td>
- * </tr>
- * <tr>
- * <td><code>/foo/bar//</code></td>
- * <td><code>/foo</code></td>
- * </tr>
- * <tr>
- * <td><code>/foo//bar//</code></td>
- * <td><code>/foo/</code></td>
- * </tr>
- * <tr>
- * <td><code>/foo</code></td>
- * <td>/</td>
- * </tr>
- * </table>
- *
- * @return The request parent URI.
- */
- public String getRequestParentURI() {
- String uri = getRequestURI();
- while (endsWith(uri, '/'))
- uri = uri.substring(0, uri.length()-1);
- int i = uri.lastIndexOf('/');
- if (i <= 0)
- return "/";
- return uri.substring(0, i);
- }
-
- /**
* Same as {@link #getRequestURI()} but trims trailing slashes from the result.
*
* @return The trimmed request URI.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bc3a393c/juneau-rest/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/vars/RequestVar.java b/juneau-rest/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
index 0df3a5b..c23e2c0 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.vars;
+import org.apache.juneau.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.svl.*;
@@ -26,11 +27,11 @@ import org.apache.juneau.svl.*;
* <li><code>$R{method}</code> - Value returned by {@link RestRequest#getMethod()}.
* <li><code>$R{methodDescription}</code> - Value returned by {@link RestRequest#getMethodDescription()}.
* <li><code>$R{pathInfo}</code> - Value returned by {@link RestRequest#getPathInfo()}.
- * <li><code>$R{requestParentURI}</code> - Value returned by {@link RestRequest#getRequestParentURI()}.
+ * <li><code>$R{requestParentURI}</code> - Value returned by {@link UriContext#getRootRelativePathInfoParent()}.
* <li><code>$R{requestURI}</code> - Value returned by {@link RestRequest#getRequestURI()}.
* <li><code>$R{servletDescription}</code> - Value returned by {@link RestRequest#getServletDescription()}.
* <li><code>$R{servletTitle}</code> - Value returned by {@link RestRequest#getServletTitle()}.
- * <li><code>$R{servletParentURI}</code> - Value returned by {@link RestRequest#getServletParentURI()}.
+ * <li><code>$R{servletParentURI}</code> - Value returned by {@link UriContext#getRootRelativeServletPathParent()}.
* <li><code>$R{servletPath}</code> - Value returned by {@link RestRequest#getServletPath()}.
* <li><code>$R{servletURI}</code> - Value returned by {@link RestRequest#getServletURI()}.
* <li><code>$R{trimmedRequestURI}</code> - Value returned by {@link RestRequest#getTrimmedRequestURI()}.
@@ -100,14 +101,14 @@ public class RequestVar extends SimpleVar {
if (key.equals("relativeServletURI"))
return req.getRelativeServletURI();
if (key.equals("requestParentURI"))
- return req.getRequestParentURI();
+ return req.getUriContext().getRootRelativePathInfoParent();
} else if (c == 's') {
if (key.equals("servletPath"))
return req.getServletPath();
if (key.equals("servletURI"))
return req.getServletURI();
if (key.equals("servletParentURI"))
- return req.getServletParentURI();
+ return req.getUriContext().getRootRelativeServletPathParent();
if (key.equals("servletTitle"))
return req.getServletTitle();
if (key.equals("servletDescription"))