Repository: incubator-juneau Updated Branches: refs/heads/master c007d496e -> 685e1f2a8
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/685e1f2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/685e1f2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/685e1f2a Branch: refs/heads/master Commit: 685e1f2a8bd36dab651bf8bc186314e03270da03 Parents: c007d49 Author: JamesBognar <[email protected]> Authored: Sat Jun 10 19:59:17 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Sat Jun 10 19:59:17 2017 -0400 ---------------------------------------------------------------------- .../microservice/resources/LogsResource.java | 22 ++++++++++---------- .../org/apache/juneau/rest/RestRequest.java | 9 -------- 2 files changed, 11 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/685e1f2a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java index 52d4783..7791801 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java @@ -18,7 +18,7 @@ import static org.apache.juneau.rest.RestContext.*; import static org.apache.juneau.internal.StringUtils.*; import java.io.*; -import java.net.*; +import java.net.URI; import java.nio.charset.*; import java.util.*; @@ -103,7 +103,7 @@ public class LogsResource extends Resource { File[] files = f.listFiles(filter); if (files != null) { for (File fc : files) { - URL fUrl = new URL(req.getTrimmedRequestURL().append('/').append(fc.getName()).toString()); + URI fUrl = new URI("servlet:/" + fc.getName()); l.add(new FileResource(fc, fUrl)); } } @@ -113,7 +113,7 @@ public class LogsResource extends Resource { } res.setHtmlDescription(new StringMessage("File details on {0}", f.getAbsolutePath())); - return new FileResource(f, new URL(req.getTrimmedRequestURL().toString())); + return new FileResource(f, new URI("servlet:/")); } /** @@ -307,20 +307,20 @@ public class LogsResource extends Resource { public Object name; public Long size; @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified; - public URL view, highlighted, parsed, download, delete; + public URI view, highlighted, parsed, download, delete; - public FileResource(File f, URL url) throws IOException { + public FileResource(File f, URI uri) throws Exception { this.f = f; this.type = (f.isDirectory() ? "dir" : "file"); - this.name = f.isDirectory() ? new Link(f.getName(), url.toString()) : f.getName(); + this.name = f.isDirectory() ? new Link(f.getName(), uri.toString()) : f.getName(); this.size = f.isDirectory() ? null : f.length(); this.lastModified = new Date(f.lastModified()); if (f.canRead() && ! f.isDirectory()) { - this.view = new URL(url + "?method=VIEW"); - this.highlighted = new URL(url + "?method=VIEW&highlight=true"); - this.parsed = new URL(url + "?method=PARSE"); - this.download = new URL(url + "?method=DOWNLOAD"); - this.delete = new URL(url + "?method=DELETE"); + this.view = new URI(uri + "?method=VIEW"); + this.highlighted = new URI(uri + "?method=VIEW&highlight=true"); + this.parsed = new URI(uri + "?method=PARSE"); + this.download = new URI(uri + "?method=DOWNLOAD"); + this.delete = new URI(uri + "?method=DELETE"); } } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/685e1f2a/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 909677e..fd9fff9 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 @@ -498,15 +498,6 @@ public final class RestRequest extends HttpServletRequestWrapper { return trimTrailingSlashes(getRequestURI()); } - /** - * Same as {@link #getRequestURL()} but trims trailing slashes from the result. - * - * @return The trimmed request URL. - */ - public StringBuffer getTrimmedRequestURL() { - return trimTrailingSlashes(getRequestURL()); - } - //-------------------------------------------------------------------------------- // Labels
