Repository: incubator-juneau Updated Branches: refs/heads/master 685e1f2a8 -> f57ec350f
Remove unused 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/f57ec350 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/f57ec350 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/f57ec350 Branch: refs/heads/master Commit: f57ec350fd098025a50c8b392be6860735f76f78 Parents: 685e1f2 Author: JamesBognar <[email protected]> Authored: Sat Jun 10 20:02:02 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Sat Jun 10 20:02:02 2017 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/juneau/rest/RestRequest.java | 10 ---------- .../main/java/org/apache/juneau/rest/vars/RequestVar.java | 4 ---- 2 files changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f57ec350/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 fd9fff9..b4ef754 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 @@ -16,7 +16,6 @@ import static java.util.Collections.*; import static java.util.logging.Level.*; import static javax.servlet.http.HttpServletResponse.*; import static org.apache.juneau.internal.IOUtils.*; -import static org.apache.juneau.internal.StringUtils.*; import java.io.*; import java.lang.reflect.*; @@ -489,15 +488,6 @@ public final class RestRequest extends HttpServletRequestWrapper { return new UriResolver(UriResolution.ROOT_RELATIVE, UriRelativity.RESOURCE, getUriContext()); } - /** - * Same as {@link #getRequestURI()} but trims trailing slashes from the result. - * - * @return The trimmed request URI. - */ - public String getTrimmedRequestURI() { - return trimTrailingSlashes(getRequestURI()); - } - //-------------------------------------------------------------------------------- // Labels http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f57ec350/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 f00dd6b..aeaefbd 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 @@ -34,7 +34,6 @@ import org.apache.juneau.svl.*; * <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 UriContext#getRootRelativeServletPath()}. - * <li><code>$R{trimmedRequestURI}</code> - Value returned by {@link RestRequest#getTrimmedRequestURI()}. * </ul> * <p> * This variable resolver requires that a {@link RestRequest} object be set as a context object on the resolver or a @@ -111,9 +110,6 @@ public class RequestVar extends SimpleVar { return req.getServletTitle(); if (key.equals("servletDescription")) return req.getServletDescription(); - } else if (c == 't') { - if (key.equals("trimmedRequestURI")) - return req.getTrimmedRequestURI(); } Object o = req.getProperties().get(key); if (o != null)
