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 22:55:13 UTC
incubator-juneau git commit: Remove duplicate methods.
Repository: incubator-juneau
Updated Branches:
refs/heads/master b2bd0a4f4 -> 5d9a98947
Remove duplicate 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/5d9a9894
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/5d9a9894
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/5d9a9894
Branch: refs/heads/master
Commit: 5d9a9894725329e493c661e7d8d7aa139675a031
Parents: b2bd0a4
Author: JamesBognar <ja...@apache.org>
Authored: Sat Jun 10 18:55:11 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Jun 10 18:55:11 2017 -0400
----------------------------------------------------------------------
.../apache/juneau/rest/test/UrisResource.java | 3 -
.../org/apache/juneau/rest/test/UrisTest.java | 188 -------------------
.../org/apache/juneau/rest/RestRequest.java | 22 ---
3 files changed, 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/5d9a9894/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 b5579d2..ce548bf 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
@@ -113,9 +113,6 @@ public class UrisResource extends RestServletDefault {
m.put("requestURL", req.getRequestURL());
m.put("servletPath", req.getServletPath());
m.put("servletURI", req.getServletURI());
- m.put("testURL1", req.getURL("testURL"));
- m.put("testURL2", req.getURL("/testURL"));
- m.put("testURL3", req.getURL("http://testURL"));
return m;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/5d9a9894/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 9917e3c..962d2e6 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
@@ -47,10 +47,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/foo
@@ -65,10 +61,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/foo/bar
@@ -83,10 +75,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/foo/bar%2Fbaz
@@ -101,10 +89,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test2
@@ -119,10 +103,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test2/foo
@@ -137,10 +117,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test2/foo/bar
@@ -155,10 +131,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test3%2Ftest3
@@ -173,10 +145,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test3%2Ftest3/foo
@@ -191,10 +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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test3%2Ftest3/foo/bar
@@ -209,10 +173,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test3%2Ftest3/foo/bar%2Fbaz
@@ -227,10 +187,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test4/test4
@@ -245,10 +201,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test4/test4/foo
@@ -263,10 +215,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test4/test4/foo/bar
@@ -281,10 +229,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/test4/test4/foo/bar%2Fbaz
@@ -299,10 +243,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
}
//====================================================================================================
@@ -326,10 +266,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/foo
@@ -344,10 +280,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/foo/bar
@@ -362,10 +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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/foo/bar%2Fbaz
@@ -380,10 +308,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2
@@ -398,10 +322,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2/foo
@@ -416,10 +336,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2/foo/bar
@@ -434,10 +350,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2/foo/bar%2Fbaz
@@ -452,10 +364,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3
@@ -470,10 +378,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo
@@ -488,10 +392,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar
@@ -506,10 +406,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar%2Fbaz
@@ -524,10 +420,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4
@@ -542,10 +434,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4/foo
@@ -560,10 +448,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4/foo/bar
@@ -578,10 +462,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4/foo/bar%2Fbaz
@@ -596,10 +476,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
}
//====================================================================================================
@@ -623,10 +499,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/foo
@@ -641,10 +513,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/foo/bar
@@ -659,10 +527,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/foo/bar%2Fbaz
@@ -677,10 +541,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2
@@ -695,10 +555,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2/foo
@@ -713,10 +569,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2/foo/bar
@@ -731,10 +583,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test2/foo/bar%2Fbaz
@@ -749,10 +597,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3
@@ -767,10 +611,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo
@@ -785,10 +625,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar
@@ -803,10 +639,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar%2Fbaz
@@ -821,10 +653,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4
@@ -839,10 +667,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4/foo
@@ -857,10 +681,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4/foo/bar
@@ -875,10 +695,6 @@ 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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
//--------------------------------------------------------------------------------
// http://localhost:8080/sample/testuris/child/test4/test4/foo/bar%2Fbaz
@@ -893,9 +709,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"));
- assertTrue(r.getString("testURL1").endsWith(port + path + "/testuris/child/grandchild/testURL"));
- // Always the same
- assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
- assertEquals("http://testURL", r.getString("testURL3"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/5d9a9894/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 bddda81..39784d2 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
@@ -20,7 +20,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
import java.lang.reflect.*;
-import java.net.*;
import java.nio.charset.*;
import java.text.*;
import java.util.*;
@@ -488,27 +487,6 @@ public final class RestRequest extends HttpServletRequestWrapper {
}
/**
- * Returns a resolved URL.
- * <p>
- * <ul class='spaced-list'>
- * <li>Fully-qualified absolute URLs (e.g. <js>"http://..."</js>, <js>"https://"</js>) are simply converted to a URL.
- * <li>Absolute URLs (e.g. <js>"/foo/..."</js>) are interpreted as relative to the server hostname.
- * <li>Relative URLs (e.g. <js>"foo/..."</js>) are interpreted as relative to this servlet path.
- * </ul>
- *
- * @param path The URL path to resolve.
- * @return The resolved URL.
- * @throws MalformedURLException If path is not a valid URL component.
- */
- public URL getURL(String path) throws MalformedURLException {
- if (path.startsWith("http://") || path.startsWith("https://"))
- return new URL(path);
- if (startsWith(path, '/'))
- return new URL(getScheme(), getLocalName(), getLocalPort(), path);
- return new URL(getScheme(), getLocalName(), getLocalPort(), getContextPath() + getServletPath() + (isEmpty(path) ? "" : ('/' + path)));
- }
-
- /**
* Returns the URI of the parent of this servlet.
*
* @return The URI of the parent of this servlet.