Repository: incubator-juneau Updated Branches: refs/heads/master 7bf5e39a5 -> 2870be2d4
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/2870be2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/2870be2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/2870be2d Branch: refs/heads/master Commit: 2870be2d478b6690a5e9b495a0fa0bb340ae3970 Parents: 7bf5e39 Author: JamesBognar <[email protected]> Authored: Sat Jun 10 19:50:28 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Sat Jun 10 19:50:28 2017 -0400 ---------------------------------------------------------------------- .../apache/juneau/rest/test/PathsResource.java | 3 +- .../org/apache/juneau/rest/test/PathsTest.java | 92 -------------------- .../java/org/apache/juneau/rest/CallMethod.java | 2 - .../org/apache/juneau/rest/RestContext.java | 7 -- .../org/apache/juneau/rest/vars/RequestVar.java | 2 - 5 files changed, 1 insertion(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2870be2d/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 23c24d6..d9de449 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 @@ -64,8 +64,7 @@ public class PathsResource extends RestServletDefault { .append("requestURL", req.getRequestURL()) .append("servletPath", req.getServletPath()) .append("servletURI", req.getUriContext().getRootRelativeServletPath()) - .append("servletParentURI", req.getUriContext().getRootRelativeServletPathParent()) - .append("relativeServletURI", req.getRelativeServletURI()); + .append("servletParentURI", req.getUriContext().getRootRelativeServletPathParent()); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2870be2d/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 9c256bb..e4623ed 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 @@ -41,8 +41,6 @@ public class PathsTest extends RestTestcase { // requestParentURI:'/jazz/juneau/test', // requestURL:'https://localhost:9443/jazz/juneau/test/testPaths', // servletPath:'/juneau/test/testPaths', - // relativeServletURI:'/jazz/juneau/test/testPaths', - // pathRemainder2:null // } url = URL; r = client.doGet(url).getResponse(ObjectMap.class); @@ -55,7 +53,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths")); assertTrue(r.getString("servletPath").endsWith("/testPaths")); assertTrue(r.getString("servletURI").endsWith("/testPaths")); - assertTrue(r.getString("relativeServletURI").endsWith("/testPaths")); assertEquals(1, (int)r.getInt("method")); @@ -68,8 +65,6 @@ public class PathsTest extends RestTestcase { // requestParentURI: '/jazz/juneau/test', // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/', // servletPath: '/juneau/test/testPaths', - // relativeServletURI: '/jazz/juneau/test/testPaths', - // pathRemainder2: '' // } url = URL + '/'; r = client.doGet(url).getResponse(ObjectMap.class); @@ -82,7 +77,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/")); 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//] @@ -93,8 +87,6 @@ public class PathsTest extends RestTestcase { // requestParentURI: '/jazz/juneau/test', // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths//', // servletPath: '/juneau/test/testPaths', - // relativeServletURI: '/jazz/juneau/test/testPaths', - // pathRemainder2: '/' // } url = URL + "//"; r = client.doGet(url).getResponse(ObjectMap.class); @@ -106,7 +98,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths//")); 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///] @@ -117,8 +108,6 @@ public class PathsTest extends RestTestcase { // requestParentURI: '/jazz/juneau/test', // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths///', // servletPath: '/juneau/test/testPaths', - // relativeServletURI: '/jazz/juneau/test/testPaths', - // pathRemainder2: '//' // } url = URL + "///"; r = client.doGet(url).getResponse(ObjectMap.class); @@ -130,7 +119,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths///")); 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/bar] @@ -141,8 +129,6 @@ public class PathsTest extends RestTestcase { // requestParentURI: '/jazz/juneau/test/testPaths/foo', // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/foo/bar', // servletPath: '/juneau/test/testPaths', - // relativeServletURI: '/jazz/juneau/test/testPaths', - // pathRemainder2: 'foo/bar' // } url = URL + "/foo/bar"; r = client.doGet(url).getResponse(ObjectMap.class); @@ -154,7 +140,6 @@ public class PathsTest extends RestTestcase { 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/bar/] @@ -165,8 +150,6 @@ public class PathsTest extends RestTestcase { // requestParentURI: '/jazz/juneau/test/testPaths/foo', // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths/foo/bar/', // servletPath: '/juneau/test/testPaths', - // relativeServletURI: '/jazz/juneau/test/testPaths', - // pathRemainder2: 'foo/bar/' // } url = URL + "/foo/bar/"; r = client.doGet(url).getResponse(ObjectMap.class); @@ -178,7 +161,6 @@ public class PathsTest extends RestTestcase { 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//bar//] @@ -189,8 +171,6 @@ public class PathsTest extends RestTestcase { // requestParentURI: '/jazz/juneau/test/testPaths//foo', // requestURL: 'https://localhost:9443/jazz/juneau/test/testPaths//foo//bar//', // servletPath: '/juneau/test/testPaths', - // relativeServletURI: '/jazz/juneau/test/testPaths', - // pathRemainder2: '/foo//bar//' // } url = URL + "//foo//bar//"; r = client.doGet(url).getResponse(ObjectMap.class); @@ -202,7 +182,6 @@ public class PathsTest extends RestTestcase { 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/test2] @@ -215,8 +194,6 @@ public class PathsTest extends RestTestcase { // 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: null, // method: 2 // } url = URL + "/test2"; @@ -229,7 +206,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2")); assertTrue(r.getString("servletPath").endsWith("/testPaths")); assertTrue(r.getString("servletURI").endsWith("/testPaths")); - assertTrue(r.getString("relativeServletURI").endsWith("/testPaths")); assertEquals(2, (int)r.getInt("method")); @@ -243,8 +219,6 @@ public class PathsTest extends RestTestcase { // 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: '', // method: 2 // } url = URL + "/test2/"; @@ -257,7 +231,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2/")); 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//] @@ -270,8 +243,6 @@ public class PathsTest extends RestTestcase { // 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: '/', // method: 2 // } url = URL + "/test2//"; @@ -284,7 +255,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2//")); 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///] @@ -297,8 +267,6 @@ public class PathsTest extends RestTestcase { // 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: '//', // method: 2 // } url = URL + "/test2///"; @@ -311,7 +279,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2///")); 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/bar] @@ -324,8 +291,6 @@ public class PathsTest extends RestTestcase { // 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/bar"; @@ -338,7 +303,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2/foo/bar")); 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/bar/] @@ -351,8 +315,6 @@ public class PathsTest extends RestTestcase { // 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/bar/"; @@ -365,7 +327,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2/foo/bar/")); 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//bar//] @@ -378,8 +339,6 @@ public class PathsTest extends RestTestcase { // 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//bar//"; @@ -392,7 +351,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2//foo//bar//")); 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] @@ -405,8 +363,6 @@ public class PathsTest extends RestTestcase { // 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: null, // method: 3 // } url = URL + "/a"; @@ -420,7 +376,6 @@ public class PathsTest extends RestTestcase { 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/] @@ -433,8 +388,6 @@ public class PathsTest extends RestTestcase { // 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: '', // method: 3 // } url = URL + "/a/"; @@ -448,7 +401,6 @@ public class PathsTest extends RestTestcase { 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//] @@ -461,8 +413,6 @@ public class PathsTest extends RestTestcase { // 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: '/', // method: 3 // } url = URL + "/a//"; @@ -476,7 +426,6 @@ public class PathsTest extends RestTestcase { 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///] @@ -489,8 +438,6 @@ public class PathsTest extends RestTestcase { // 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: '//', // method: 3 // } url = URL + "/a///"; @@ -504,7 +451,6 @@ public class PathsTest extends RestTestcase { 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/bar] @@ -517,8 +463,6 @@ public class PathsTest extends RestTestcase { // 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/bar"; @@ -532,7 +476,6 @@ public class PathsTest extends RestTestcase { 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/bar/] @@ -545,8 +488,6 @@ public class PathsTest extends RestTestcase { // 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/bar/"; @@ -560,7 +501,6 @@ public class PathsTest extends RestTestcase { 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//bar//] @@ -573,8 +513,6 @@ public class PathsTest extends RestTestcase { // 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//bar//"; @@ -588,7 +526,6 @@ public class PathsTest extends RestTestcase { 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] @@ -601,8 +538,6 @@ public class PathsTest extends RestTestcase { // 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: null, // method: 4 // } url = URL + "/a/test2"; @@ -616,7 +551,6 @@ public class PathsTest extends RestTestcase { 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/] @@ -629,8 +563,6 @@ public class PathsTest extends RestTestcase { // 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: '', // method: 4 // } url = URL + "/a/test2/"; @@ -644,7 +576,6 @@ public class PathsTest extends RestTestcase { 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//] @@ -657,8 +588,6 @@ public class PathsTest extends RestTestcase { // 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: '/', // method: 4 // } url = URL + "/a/test2//"; @@ -672,7 +601,6 @@ public class PathsTest extends RestTestcase { 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///] @@ -685,8 +613,6 @@ public class PathsTest extends RestTestcase { // 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: '//', // method: 4 // } url = URL + "/a/test2///"; @@ -700,7 +626,6 @@ public class PathsTest extends RestTestcase { 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/bar] @@ -713,8 +638,6 @@ public class PathsTest extends RestTestcase { // 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/bar"; @@ -728,7 +651,6 @@ public class PathsTest extends RestTestcase { 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/bar/] @@ -741,8 +663,6 @@ public class PathsTest extends RestTestcase { // 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/bar/"; @@ -756,7 +676,6 @@ public class PathsTest extends RestTestcase { 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//bar//] @@ -769,8 +688,6 @@ public class PathsTest extends RestTestcase { // 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//bar//"; @@ -784,7 +701,6 @@ public class PathsTest extends RestTestcase { 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")); //-------------------------------------------------------------------------------- @@ -801,7 +717,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/%20")); assertTrue(r.getString("servletPath").endsWith("/testPaths")); assertTrue(r.getString("servletURI").endsWith("/testPaths")); - assertTrue(r.getString("relativeServletURI").endsWith("/testPaths")); assertEquals(1, (int)r.getInt("method")); url = URL + "/test2/%20"; @@ -815,7 +730,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2/%20")); assertTrue(r.getString("servletPath").endsWith("/testPaths")); assertTrue(r.getString("servletURI").endsWith("/testPaths")); - assertTrue(r.getString("relativeServletURI").endsWith("/testPaths")); assertEquals(2, (int)r.getInt("method")); url = URL + "/a/%20"; @@ -830,7 +744,6 @@ public class PathsTest extends RestTestcase { 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")); url = URL + "/a/test2/%20"; @@ -845,7 +758,6 @@ public class PathsTest extends RestTestcase { 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")); url = URL + "/+"; @@ -859,7 +771,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/+")); assertTrue(r.getString("servletPath").endsWith("/testPaths")); assertTrue(r.getString("servletURI").endsWith("/testPaths")); - assertTrue(r.getString("relativeServletURI").endsWith("/testPaths")); assertEquals(1, (int)r.getInt("method")); url = URL + "/test2/+"; @@ -873,7 +784,6 @@ public class PathsTest extends RestTestcase { assertTrue(r.getString("requestURL").endsWith("/testPaths/test2/+")); assertTrue(r.getString("servletPath").endsWith("/testPaths")); assertTrue(r.getString("servletURI").endsWith("/testPaths")); - assertTrue(r.getString("relativeServletURI").endsWith("/testPaths")); assertEquals(2, (int)r.getInt("method")); url = URL + "/a/+"; @@ -888,7 +798,6 @@ public class PathsTest extends RestTestcase { 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")); url = URL + "/a/test2/+"; @@ -903,7 +812,6 @@ public class PathsTest extends RestTestcase { 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")); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2870be2d/juneau-rest/src/main/java/org/apache/juneau/rest/CallMethod.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/CallMethod.java b/juneau-rest/src/main/java/org/apache/juneau/rest/CallMethod.java index 7ba5e8c..0a9ad22 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/CallMethod.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/CallMethod.java @@ -844,8 +844,6 @@ class CallMethod implements Comparable<CallMethod> { return req.getServletPath(); if (k.equals(REST_servletURI)) return req.getUriContext().getRootRelativeServletPath(); - if (k.equals(REST_relativeServletURI)) - return req.getRelativeServletURI(); if (k.equals(REST_pathInfo)) return req.getPathInfo(); if (k.equals(REST_requestURI)) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2870be2d/juneau-rest/src/main/java/org/apache/juneau/rest/RestContext.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestContext.java index e5aa62e..2422599 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestContext.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestContext.java @@ -220,13 +220,6 @@ public final class RestContext extends Context { public static final String REST_servletURI = "RestServlet.servletURI"; /** - * The request servlet URI. - * <p> - * Equivalent to the value returned by {@link RestRequest#getRelativeServletURI()} - */ - public static final String REST_relativeServletURI = "RestServlet.relativeServletURI"; - - /** * The request URI path info. * <p> * Automatically added to properties returned by {@link SerializerSession#getProperty(String)} and {@link ParserSession#getProperty(String)}. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2870be2d/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 7fecd38..f00dd6b 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 @@ -98,8 +98,6 @@ public class RequestVar extends SimpleVar { } else if (c == 'r') { if (key.equals("requestURI")) return req.getRequestURI(); - if (key.equals("relativeServletURI")) - return req.getRelativeServletURI(); if (key.equals("requestParentURI")) return req.getUriContext().getRootRelativePathInfoParent(); } else if (c == 's') {
