From 3e7c6840b032289de1fd279615428c5547191475 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 26 Apr 2021 12:54:19 -0500 Subject: [PATCH] provide jetty-compatible entity types for zip resources --- .../docsys/endpoints/DocsysMarkdownEndpoint.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java index a4a544927..724e24822 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java @@ -82,7 +82,7 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { StringBuilder sb = new StringBuilder(); for (java.nio.file.Path path : enabled.getPaths()) { PathWalker.findAll(path).forEach(f -> { - sb.append(path.relativize(f).toString()).append("\n"); + sb.append(path.relativize(f)).append("\n"); }); } return sb.toString(); @@ -103,7 +103,7 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { for (java.nio.file.Path path : enabled.getPaths()) { PathWalker.findAll(path).forEach(f -> { if (f.toString().endsWith(".md")) { - sb.append(path.relativize(f).toString()).append("\n"); + sb.append(path.relativize(f)).append("\n"); } }); } @@ -131,16 +131,19 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { /** * @param pathspec the path as known to the manifest * @return The contents of a file + * + * @see jersey providers + * */ @GET @Path(value = "{pathspec:.*}") public Response getFileInPath(@PathParam("pathspec") String pathspec) { + init(false); try { java.nio.file.Path path = findPath(pathspec); String contentType = Files.probeContentType(path); MediaType mediaType = MediaType.valueOf(contentType); - - return Response.ok(path.toFile(),mediaType).build(); + return Response.ok(Files.newBufferedReader(path), mediaType).build(); } catch (Exception e) { return Response.serverError().entity(e.getMessage()).build(); }