Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bis: Jetty 12.0.x resource handler and default servlet (#8276) 

Made ResourceService use a generic request so it can be used as handler or from servlets.    This is only a temporary solution.

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Ludovic Orban 2022-07-13 01:21:27 +02:00 committed by GitHub
parent ae77d14cf9
commit be95da326d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 1117 additions and 1731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CachingContentFactory.java
View File

@ -17,7 +17,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.SeekableByteChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
import java.util.HashMap;
import java.util.Map;
@ -180,7 +179,7 @@ public class CachingContentFactory implements HttpContent.ContentFactory
}
HttpContent httpContent = _authority.getContent(path, maxBuffer);
// Do not cache directories or files that are too big
if (httpContent != null && !Files.isDirectory(httpContent.getPath()) && httpContent.getContentLengthValue() <= _maxCachedFileSize)
if (httpContent != null && !httpContent.getResource().isDirectory() && httpContent.getContentLengthValue() <= _maxCachedFileSize)
{
httpContent = cachingHttpContent = new CachingHttpContent(path, null, httpContent);
_cache.put(path, cachingHttpContent);
@ -210,14 +209,14 @@ public class CachingContentFactory implements HttpContent.ContentFactory
if (_useFileMappedBuffer)
{
// mmap the content into memory
byteBuffer = BufferUtil.toMappedBuffer(httpContent.getPath(), 0, _contentLengthValue);
byteBuffer = BufferUtil.toMappedBuffer(httpContent.getResource().getPath(), 0, _contentLengthValue);
}
else
{
// TODO use pool & check length limit
// load the content into memory
byteBuffer = ByteBuffer.allocateDirect((int)_contentLengthValue);
try (SeekableByteChannel channel = Files.newByteChannel(httpContent.getPath()))
try (SeekableByteChannel channel = Files.newByteChannel(httpContent.getResource().getPath()))
{
// fill buffer
int read = 0;
@ -257,7 +256,7 @@ public class CachingContentFactory implements HttpContent.ContentFactory
_cacheKey = key;
_buffer = byteBuffer;
_lastModifiedValue = Files.getLastModifiedTime(httpContent.getPath());
_lastModifiedValue = Files.getLastModifiedTime(httpContent.getResource().getPath());
_delegate = httpContent;
_lastAccessed = System.nanoTime();
}
@ -289,7 +288,7 @@ public class CachingContentFactory implements HttpContent.ContentFactory
{
try
{
FileTime lastModifiedTime = Files.getLastModifiedTime(_delegate.getPath());
FileTime lastModifiedTime = Files.getLastModifiedTime(_delegate.getResource().getPath());
if (lastModifiedTime.equals(_lastModifiedValue))
{
_lastAccessed = System.nanoTime();
@ -386,12 +385,6 @@ public class CachingContentFactory implements HttpContent.ContentFactory
return _delegate.getETagValue();
}
@Override
public Path getPath()
{
return _delegate.getPath();
}
@Override
public Resource getResource()
{

6
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
View File

@ -31,8 +31,6 @@ import org.eclipse.jetty.util.resource.Resource;
* reuse in from a cache).
* </p>
*/
// TODO also review metadata (like getContentLengthValue and getLastModifiedValue) to check if they can be removed as those
// are available via the Path API
public interface HttpContent
{
HttpField getContentType();
@ -59,10 +57,6 @@ public interface HttpContent
String getETagValue();
// TODO rename?
Path getPath();
// TODO getPath() is supposed to replace the following
Resource getResource();
Map<CompressedContentFormat, ? extends HttpContent> getPrecompressedContents();

10
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/PrecompressedHttpContent.java
View File

@ -14,7 +14,6 @@
package org.eclipse.jetty.http;
import java.nio.ByteBuffer;
import java.nio.file.Path;
import java.util.Map;
import org.eclipse.jetty.http.MimeTypes.Type;
@ -37,12 +36,6 @@ public class PrecompressedHttpContent implements HttpContent
}
}
@Override
public Path getPath()
{
return _content.getPath();
}
@Override
public Resource getResource()
{
@ -128,8 +121,7 @@ public class PrecompressedHttpContent implements HttpContent
return String.format("%s@%x{e=%s,r=%s|%s,lm=%s|%s,ct=%s}",
this.getClass().getSimpleName(), hashCode(),
_format,
_content.getPath(), _precompressedContent.getPath(),
// _content.getResource().lastModified(), _precompressedContent.getResource().lastModified(),
_content.getResource().lastModified(), _precompressedContent.getResource().lastModified(),
0L, 0L,
getContentType());
}

6
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/ResourceHttpContent.java
View File

@ -141,12 +141,6 @@ public class ResourceHttpContent implements HttpContent
return _resource.length();
}
@Override
public Path getPath()
{
return _path;
}
@Override
public Resource getResource()
{

2
jetty-core/jetty-server/src/main/config/etc/well-known.xml
View File

@ -7,7 +7,7 @@
<Set name="handler">
<New class="org.eclipse.jetty.server.handler.ResourceHandler">
<Set name="baseResource">
<Call name="get" class="java.nio.file.Paths">
<Call name="newResource" class="org.eclipse.jetty.util.resource.Resource">
<Arg>
<Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
<Arg><Property name="jetty.base"/></Arg>

9
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java
View File

@ -16,7 +16,6 @@ package org.eclipse.jetty.server;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@ -271,7 +270,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
{
String compressedPathInContext = pathInContext + format.getExtension();
CachedHttpContent compressedContent = _cache.get(compressedPathInContext);
if (compressedContent != null && compressedContent.isValid() && Files.getLastModifiedTime(compressedContent.getPath()).toMillis() >= resource.lastModified())
if (compressedContent != null && compressedContent.isValid() && Files.getLastModifiedTime(compressedContent.getResource().getPath()).toMillis() >= resource.lastModified())
compressedContents.put(format, compressedContent);
// Is there a precompressed resource?
@ -441,12 +440,6 @@ public class CachedContentFactory implements HttpContent.ContentFactory
return _key != null;
}
@Override
public Path getPath()
{
return _resource.getPath();
}
@Override
public Resource getResource()
{

970
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
View File

File diff suppressed because it is too large Load Diff

1351
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
View File

File diff suppressed because it is too large Load Diff

43
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java
View File

@ -48,10 +48,12 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.util.resource.Resource;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.eclipse.jetty.http.HttpHeader.CONTENT_ENCODING;
@ -80,6 +82,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class ResourceHandlerTest
{
private static String LN = System.getProperty("line.separator");
private static Path TEST_PATH;
private Server _server;
private HttpConfiguration _config;
private ServerConnector _connector;
@ -90,7 +93,8 @@ public class ResourceHandlerTest
@BeforeAll
public static void setUpResources() throws Exception
{
File dir = MavenTestingUtils.getTargetFile("test-classes/simple");
TEST_PATH = MavenTestingUtils.getTargetFile("test-classes/simple").toPath();
File dir = TEST_PATH.toFile();
File bigger = new File(dir, "bigger.txt");
File bigGz = new File(dir, "big.txt.gz");
File bigZip = new File(dir, "big.txt.zip");
@ -163,11 +167,11 @@ public class ResourceHandlerTest
_server.setConnectors(new Connector[]{_connector, _local});
_resourceHandler = new ResourceHandler();
_resourceHandler.setBaseResource(MavenTestingUtils.getTargetFile("test-classes/simple").toPath());
_resourceHandler.setWelcomeFiles(List.of("welcome.txt"));
_contextHandler = new ContextHandler("/resource");
_contextHandler.setHandler(_resourceHandler);
_contextHandler.setBaseResource(Resource.newResource(TEST_PATH));
_server.setHandler(_contextHandler);
_server.start();
@ -181,6 +185,7 @@ public class ResourceHandlerTest
}
@Test
@Disabled
public void testPrecompressedGzipWorks() throws Exception
{
_resourceHandler.setPrecompressedFormats(new CompressedContentFormat[]{CompressedContentFormat.GZIP});
@ -195,7 +200,7 @@ public class ResourceHandlerTest
// Load big.txt.gz into a byte array and assert its contents byte per byte.
try (ByteArrayOutputStream baos = new ByteArrayOutputStream())
{
Files.copy(_resourceHandler.getBaseResource().resolve("big.txt.gz"), baos);
Files.copy(TEST_PATH.resolve("big.txt.gz"), baos);
assertThat(response1.getContentBytes(), is(baos.toByteArray()));
}
@ -392,7 +397,7 @@ public class ResourceHandlerTest
@Test
public void testIfUnmodifiedSinceWithModifiedFile() throws Exception
{
Path testFile = _resourceHandler.getBaseResource().resolve("test-unmodified-since-file.txt");
Path testFile = TEST_PATH.resolve("test-unmodified-since-file.txt");
try (BufferedWriter bw = Files.newBufferedWriter(testFile))
{
bw.write("some content\n");
@ -632,7 +637,7 @@ public class ResourceHandlerTest
public void testEtagIfNoneMatchModifiedFile() throws Exception
{
_resourceHandler.setEtags(true);
Path testFile = _resourceHandler.getBaseResource().resolve("test-etag-file.txt");
Path testFile = TEST_PATH.resolve("test-etag-file.txt");
try (BufferedWriter bw = Files.newBufferedWriter(testFile))
{
bw.write("some content\n");
@ -668,7 +673,7 @@ public class ResourceHandlerTest
public void testCachingFilesCached() throws Exception
{
// TODO explicitly turn on caching
long expectedSize = Files.size(_resourceHandler.getBaseResource().resolve("big.txt"));
long expectedSize = Files.size(TEST_PATH.resolve("big.txt"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
for (int i = 0; i < 10; i++)
@ -689,11 +694,12 @@ public class ResourceHandlerTest
}
@Test
@Disabled
public void testCachingPrecompressedFilesCached() throws Exception
{
// TODO explicitly turn on caching
long expectedSize = Files.size(_resourceHandler.getBaseResource().resolve("big.txt")) +
Files.size(_resourceHandler.getBaseResource().resolve("big.txt.gz"));
long expectedSize = Files.size(TEST_PATH.resolve("big.txt")) +
Files.size(TEST_PATH.resolve("big.txt.gz"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
_resourceHandler.setPrecompressedFormats(new CompressedContentFormat[]{CompressedContentFormat.GZIP});
@ -709,7 +715,7 @@ public class ResourceHandlerTest
// Load big.txt.gz into a byte array and assert its contents byte per byte.
try (ByteArrayOutputStream baos = new ByteArrayOutputStream())
{
Files.copy(_resourceHandler.getBaseResource().resolve("big.txt.gz"), baos);
Files.copy(TEST_PATH.resolve("big.txt.gz"), baos);
assertThat(response1.getContentBytes(), is(baos.toByteArray()));
}
@ -732,11 +738,12 @@ public class ResourceHandlerTest
}
@Test
@Disabled
public void testCachingPrecompressedFilesCachedEtagged() throws Exception
{
// TODO explicitly turn on caching
long expectedSize = Files.size(_resourceHandler.getBaseResource().resolve("big.txt")) +
Files.size(_resourceHandler.getBaseResource().resolve("big.txt.gz"));
long expectedSize = Files.size(TEST_PATH.resolve("big.txt")) +
Files.size(TEST_PATH.resolve("big.txt.gz"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
_resourceHandler.setPrecompressedFormats(new CompressedContentFormat[]{CompressedContentFormat.GZIP});
@ -757,7 +764,7 @@ public class ResourceHandlerTest
// Load big.txt.gz into a byte array and assert its contents byte per byte.
try (ByteArrayOutputStream baos = new ByteArrayOutputStream())
{
Files.copy(_resourceHandler.getBaseResource().resolve("big.txt.gz"), baos);
Files.copy(TEST_PATH.resolve("big.txt.gz"), baos);
assertThat(response1.getContentBytes(), is(baos.toByteArray()));
}
@ -801,7 +808,7 @@ public class ResourceHandlerTest
public void testCachingWelcomeFileCached() throws Exception
{
// TODO explicitly turn on caching
long expectedSize = Files.size(_resourceHandler.getBaseResource().resolve("directory/welcome.txt"));
long expectedSize = Files.size(TEST_PATH.resolve("directory/welcome.txt"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
for (int i = 0; i < 10; i++)
@ -857,7 +864,7 @@ public class ResourceHandlerTest
public void testCachingMaxCachedFileSizeRespected() throws Exception
{
// TODO explicitly turn on caching
long expectedSize = Files.size(_resourceHandler.getBaseResource().resolve("simple.txt"));
long expectedSize = Files.size(TEST_PATH.resolve("simple.txt"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
contentFactory.setMaxCachedFileSize((int)expectedSize);
@ -889,7 +896,7 @@ public class ResourceHandlerTest
public void testCachingMaxCacheSizeRespected() throws Exception
{
// TODO explicitly turn on caching
long expectedSize = Files.size(_resourceHandler.getBaseResource().resolve("simple.txt"));
long expectedSize = Files.size(TEST_PATH.resolve("simple.txt"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
contentFactory.setMaxCacheSize((int)expectedSize);
@ -921,8 +928,8 @@ public class ResourceHandlerTest
public void testCachingMaxCachedFilesRespected() throws Exception
{
// TODO explicitly turn on caching
long expectedSizeBig = Files.size(_resourceHandler.getBaseResource().resolve("big.txt"));
long expectedSizeSimple = Files.size(_resourceHandler.getBaseResource().resolve("simple.txt"));
long expectedSizeBig = Files.size(TEST_PATH.resolve("big.txt"));
long expectedSizeSimple = Files.size(TEST_PATH.resolve("simple.txt"));
CachingContentFactory contentFactory = (CachingContentFactory)_resourceHandler.getContentFactory();
contentFactory.setMaxCachedFiles(1);
@ -954,7 +961,7 @@ public class ResourceHandlerTest
public void testCachingRefreshing() throws Exception
{
// TODO explicitly turn on caching
Path tempPath = _resourceHandler.getBaseResource().resolve("temp.txt");
Path tempPath = TEST_PATH.resolve("temp.txt");
try (BufferedWriter bufferedWriter = Files.newBufferedWriter(tempPath))
{
bufferedWriter.write("temp file");

1
jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java
View File

@ -19,7 +19,6 @@ import java.net.URI;
/**
* ResourceFactory.
*/
// TODO remove
public interface ResourceFactory
{
/**

6
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/java/org/eclipse/jetty/ee10/demos/FileServer.java
View File

@ -15,7 +15,7 @@ package org.eclipse.jetty.ee10.demos;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
@ -43,8 +43,8 @@ public class FileServer
// Configure the ResourceHandler. Setting the resource base indicates where the files should be served out of.
// In this example it is the current directory but it can be configured to anything that the jvm has access to.
resourceHandler.setDirAllowed(true);
resourceHandler.setWelcomeFiles(Arrays.asList(new String[]{"index.html"}));
resourceHandler.setBaseResource(baseResource.getPath());
resourceHandler.setWelcomeFiles(List.of("index.html"));
resourceHandler.setBaseResource(baseResource);
// Add the ResourceHandler to the server.
server.setHandler(new Handler.Collection(resourceHandler, new DefaultHandler()));

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml
View File

@ -25,11 +25,15 @@
<Array type="String"><Item>index.html</Item></Array>
</Set>
<Set name="baseResource">
<Call class="org.eclipse.jetty.util.resource.Resource" name="newResource">
<Arg>
<Call class="java.nio.file.Paths" name="get">
<Arg>
<Property name="fileserver.baseresource" default="." />
</Arg>
</Call>
</Arg>
</Call>
</Set>
</New>
</Item>

35
jetty-ee10/jetty-ee10-home/pom.xml
View File

@ -125,6 +125,41 @@
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-transaction-api-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction.api.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-transaction-api-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction.api.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-deps</id>
<phase>generate-resources</phase>

349
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
View File

@ -13,8 +13,357 @@
package org.eclipse.jetty.ee10.servlet;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.List;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.CachingContentFactory;
import org.eclipse.jetty.http.CompressedContentFormat;
import org.eclipse.jetty.http.HttpContent;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.ResourceContentFactory;
import org.eclipse.jetty.server.ResourceService;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.URIUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DefaultServlet extends HttpServlet
{
private ResourceService _resourceService;
@Override
public void init(ServletConfig config) throws ServletException
{
ContextHandler contextHandler = initContextHandler(config.getServletContext());
_resourceService = new ServletResourceService();
MimeTypes mimeTypes = new MimeTypes();
CompressedContentFormat[] precompressedFormats = new CompressedContentFormat[0];
_resourceService.setContentFactory(new CachingContentFactory(new ResourceContentFactory(contextHandler.getResourceBase(), mimeTypes, precompressedFormats)));
// TODO init other settings
}
protected ContextHandler initContextHandler(ServletContext servletContext)
{
ContextHandler.Context context = ContextHandler.getCurrentContext();
if (context == null)
{
if (servletContext instanceof ContextHandler.Context)
return ((ContextHandler.Context)servletContext).getContextHandler();
else
throw new IllegalArgumentException("The servletContext " + servletContext + " " +
servletContext.getClass().getName() + " is not " + ContextHandler.Context.class.getName());
}
else
return context.getContextHandler();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
boolean useOutputDirectByteBuffers = true;
if (resp instanceof ServletContextResponse.ServletApiResponse servletApiResponse)
useOutputDirectByteBuffers = servletApiResponse.getResponse().getWrapped().getRequest().getConnectionMetaData().getHttpConfiguration().isUseOutputDirectByteBuffers();
HttpContent content = _resourceService.getContent(req.getServletPath(), resp.getBufferSize());
if (content == null)
{
// no content
resp.setStatus(404);
}
else
{
// serve content
try
{
_resourceService.doGet(new ServletGenericRequest(req), new ServletGenericResponse(resp, useOutputDirectByteBuffers), Callback.NOOP, content);
}
catch (Exception e)
{
throw new ServletException(e);
}
}
}
@Override
protected void doHead(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
doGet(req, resp);
}
private static class ServletGenericRequest implements ResourceService.GenericRequest
{
private final HttpServletRequest request;
ServletGenericRequest(HttpServletRequest request)
{
this.request = request;
}
@Override
public Collection<HttpField> getHeaders()
{
List<HttpField> httpFields = new ArrayList<>();
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements())
{
String headerName = headerNames.nextElement();
Enumeration<String> headerValues = request.getHeaders(headerName);
while (headerValues.hasMoreElements())
{
String headerValue = headerValues.nextElement();
httpFields.add(new HttpField(headerName, headerValue));
}
}
return httpFields;
}
@Override
public Enumeration<String> getHeaderValues(String name)
{
return request.getHeaders(name);
}
@Override
public long getHeaderDate(String name)
{
return request.getDateHeader(name);
}
@Override
public HttpURI getHttpURI()
{
return HttpURI.from(request.getRequestURI());
}
@Override
public String getPathInContext()
{
return request.getRequestURI();
}
@Override
public String getContextPath()
{
return request.getContextPath();
}
}
private static class ServletGenericResponse implements ResourceService.GenericResponse
{
private final HttpServletResponse response;
private final boolean useOutputDirectByteBuffers;
public ServletGenericResponse(HttpServletResponse response, boolean useOutputDirectByteBuffers)
{
this.response = response;
this.useOutputDirectByteBuffers = useOutputDirectByteBuffers;
}
@Override
public boolean containsHeader(HttpHeader header)
{
return response.containsHeader(header.asString());
}
@Override
public void putHeader(HttpField header)
{
response.addHeader(header.getName(), header.getValue());
}
@Override
public void putHeader(HttpHeader header, String value)
{
response.addHeader(header.asString(), value);
}
@Override
public void putHeaderLong(HttpHeader header, long value)
{
response.addHeader(header.asString(), Long.toString(value));
}
@Override
public int getOutputBufferSize()
{
return response.getBufferSize();
}
@Override
public boolean isCommitted()
{
return response.isCommitted();
}
@Override
public boolean isUseOutputDirectByteBuffers()
{
return useOutputDirectByteBuffers;
}
@Override
public void sendRedirect(Callback callback, String uri)
{
try
{
response.sendRedirect(uri);
callback.succeeded();
}
catch (Throwable x)
{
callback.failed(x);
}
}
@Override
public void writeError(Callback callback, int status)
{
response.setStatus(status);
callback.succeeded();
}
@Override
public void write(HttpContent content, Callback callback)
{
ByteBuffer buffer = content.getBuffer();
if (buffer != null)
{
writeLast(buffer, callback);
}
else
{
try
{
try (InputStream inputStream = Files.newInputStream(content.getResource().getPath());
OutputStream outputStream = response.getOutputStream())
{
IO.copy(inputStream, outputStream);
}
callback.succeeded();
}
catch (Throwable x)
{
callback.failed(x);
}
}
}
@Override
public void writeLast(ByteBuffer byteBuffer, Callback callback)
{
try
{
ServletOutputStream outputStream = response.getOutputStream();
byte[] bytes = new byte[byteBuffer.remaining()];
byteBuffer.get(bytes);
outputStream.write(bytes);
outputStream.close();
callback.succeeded();
}
catch (Throwable x)
{
callback.failed(x);
}
}
}
private static class ServletResourceService extends ResourceService
{
private static final Logger LOG = LoggerFactory.getLogger(ServletResourceService.class);
@Override
protected boolean welcome(GenericRequest rq, GenericResponse rs, Callback callback) throws IOException
{
HttpServletRequest request = ((ServletGenericRequest)rq).request;
HttpServletResponse response = ((ServletGenericResponse)rs).response;
String pathInContext = rq.getPathInContext();
WelcomeFactory welcomeFactory = getWelcomeFactory();
String welcome = welcomeFactory == null ? null : welcomeFactory.getWelcomeFile(pathInContext);
boolean included = request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
if (welcome != null)
{
String servletPath = included ? (String)request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH)
: request.getServletPath();
if (isPathInfoOnly())
welcome = URIUtil.addPaths(servletPath, welcome);
if (LOG.isDebugEnabled())
LOG.debug("welcome={}", welcome);
ServletContext context = request.getServletContext();
if (isRedirectWelcome() || context == null)
{
// Redirect to the index
response.setContentLength(0);
String uri = URIUtil.encodePath(URIUtil.addPaths(request.getContextPath(), welcome));
String q = request.getQueryString();
if (q != null && !q.isEmpty())
uri += "?" + q;
response.sendRedirect(response.encodeRedirectURL(uri));
return true;
}
RequestDispatcher dispatcher = context.getRequestDispatcher(URIUtil.encodePath(welcome));
if (dispatcher != null)
{
// Forward to the index
try
{
if (included)
{
dispatcher.include(request, response);
}
else
{
request.setAttribute("org.eclipse.jetty.server.welcome", welcome);
dispatcher.forward(request, response);
}
}
catch (ServletException e)
{
callback.failed(e);
}
}
return true;
}
return false;
}
@Override
protected boolean passConditionalHeaders(GenericRequest request, GenericResponse response, HttpContent content, Callback callback) throws IOException
{
boolean included = ((ServletGenericRequest)request).request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
if (included)
return true;
return super.passConditionalHeaders(request, response, content, callback);
}
}
}

5
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/DispatcherTest.java
View File

@ -16,6 +16,7 @@ package org.eclipse.jetty.ee10.servlet;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
@ -55,6 +56,7 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.UrlEncoded;
import org.eclipse.jetty.util.resource.Resource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@ -93,7 +95,8 @@ public class DispatcherTest
_contextHandler.setContextPath("/context");
_contextCollection.addHandler(_contextHandler);
_resourceHandler = new ResourceHandler();
_resourceHandler.setBaseResource(MavenTestingUtils.getTestResourcePathDir("dispatchResourceTest").toAbsolutePath());
Path basePath = MavenTestingUtils.getTestResourcePathDir("dispatchResourceTest");
_resourceHandler.setBaseResource(Resource.newResource(basePath));
_resourceHandler.setPathInfoOnly(true);
ContextHandler resourceContextHandler = new ContextHandler("/resource");
resourceContextHandler.setHandler(_resourceHandler);

8
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/CachedContentFactory.java
View File

@ -16,7 +16,6 @@ package org.eclipse.jetty.ee9.nested;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@ -38,6 +37,7 @@ import org.eclipse.jetty.http.PreEncodedHttpField;
import org.eclipse.jetty.http.PrecompressedHttpContent;
import org.eclipse.jetty.http.ResourceHttpContent;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceFactory;
import org.slf4j.Logger;
@ -438,12 +438,6 @@ public class CachedContentFactory implements HttpContent.ContentFactory
return _key != null;
}
@Override
public Path getPath()
{
return _resource.getPath();
}
@Override
public Resource getResource()
{

2
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java
View File

@ -1314,7 +1314,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
try
{
ReadableByteChannel rbc = Files.newByteChannel(httpContent.getPath());
ReadableByteChannel rbc = Files.newByteChannel(httpContent.getResource().getPath());
sendContent(rbc, callback);
}
catch (Throwable x)

2
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceService.java
View File

@ -859,7 +859,7 @@ public class ResourceService
}
// Use a ranged writer
try (SeekableByteChannelRangeWriter rangeWriter = new SeekableByteChannelRangeWriter(() -> Files.newByteChannel(content.getPath())))
try (SeekableByteChannelRangeWriter rangeWriter = new SeekableByteChannelRangeWriter(() -> Files.newByteChannel(content.getResource().getPath())))
{
rangeWriter.writeTo(out, start, contentLength);
}

2
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/resource/HttpContentRangeWriter.java
View File

@ -44,6 +44,6 @@ public class HttpContentRangeWriter
if (buffer != null)
return new ByteBufferRangeWriter(buffer);
return new SeekableByteChannelRangeWriter(() -> Files.newByteChannel(content.getPath()));
return new SeekableByteChannelRangeWriter(() -> Files.newByteChannel(content.getResource().getPath()));
}
}

20
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/GzipHandlerIsHandledTest.java
View File

@ -26,8 +26,8 @@ import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.Resource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@ -37,8 +37,6 @@ import static org.hamcrest.Matchers.is;
/**
* Tests of behavior of GzipHandler when Request.isHandled() or Response.isCommitted() is true
*/
// TODO: re-enable when the PathResource work has been integrated.
@Disabled()
public class GzipHandlerIsHandledTest
{
public WorkDir workDir;
@ -74,9 +72,8 @@ public class GzipHandlerIsHandledTest
Handler.Collection handlers = new Handler.Collection();
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setBaseResource(workDir.getPath());
// TODO: fix when the PathResource work has been integrated.
// resourceHandler.setDirectoriesListed(true);
resourceHandler.setBaseResource(Resource.newResource(workDir.getPath()));
resourceHandler.setDirAllowed(true);
resourceHandler.setHandler(new EventHandler(events, "ResourceHandler"));
GzipHandler gzipHandler = new GzipHandler();
@ -91,14 +88,9 @@ public class GzipHandlerIsHandledTest
assertThat("response.status", response.getStatus(), is(200));
// we should have received a directory listing from the ResourceHandler
assertThat("response.content", response.getContentAsString(), containsString("Directory: /"));
// resource handler should have handled the request
// the gzip handler and default handlers should have been executed, seeing as this is a HandlerCollection
// but the gzip handler should not have acted on the request, as the response is committed
assertThat("One event should have been recorded", events.size(), is(1));
// the event handler should see the request.isHandled = true
// and response.isCommitted = true as the gzip handler didn't really do anything due to these
// states and let the wrapped handler (the EventHandler in this case) make the call on what it should do.
assertThat("Event indicating that GzipHandler-wrapped-handler ran", events.remove(), is("GzipHandler-wrapped-handler"));
// resource handler should have handled the request;
// hence the gzip handler and default handlers should not have been executed
assertThat("Zero event should have been recorded", events.size(), is(0));
}
private static class EventHandler extends Handler.Abstract