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

cleanups of HttpContentWrapper and ResourceService 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2022-10-13 17:25:47 +11:00
parent 6771db40bf
commit 2d161bfecd
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.eclipse.jetty.util.NanoTime;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.resource.Resource;
/**
* HttpContent.ContentFactory implementation that wraps any other HttpContent.ContentFactory instance
@ -223,23 +224,24 @@ public class CachingContentFactory implements HttpContent.ContentFactory
{
super(httpContent);
if (_delegate.getResource() == null)
Resource resource = getResource();
if (resource == null)
throw new IllegalArgumentException("Null Resource");
if (!_delegate.getResource().exists())
throw new IllegalArgumentException("Resource doesn't exist: " + _delegate.getResource());
if (_delegate.getResource().isDirectory())
throw new IllegalArgumentException("Directory Resources not supported: " + _delegate.getResource());
if (_delegate.getResource().getPath() == null) // only required because we need the Path to access the mapped ByteBuffer or SeekableByteChannel.
throw new IllegalArgumentException("Resource not backed by Path not supported: " + _delegate.getResource());
if (!resource.exists())
throw new IllegalArgumentException("Resource doesn't exist: " + resource);
if (resource.isDirectory())
throw new IllegalArgumentException("Directory Resources not supported: " + resource);
if (resource.getPath() == null) // only required because we need the Path to access the mapped ByteBuffer or SeekableByteChannel.
throw new IllegalArgumentException("Resource not backed by Path not supported: " + resource);
// Resources with negative length cannot be cached.
// But allow resources with zero length.
long resourceSize = _delegate.getResource().length();
long resourceSize = resource.length();
if (resourceSize < 0)
throw new IllegalArgumentException("Resource with negative size: " + _delegate.getResource());
throw new IllegalArgumentException("Resource with negative size: " + resource);
// TODO: do all the following lazily and asynchronously.
HttpField etagField = _delegate.getETag();
HttpField etagField = httpContent.getETag();
if (StringUtil.isNotBlank(etagValue))
{
etagField = new PreEncodedHttpField(HttpHeader.ETAG, etagValue);
@ -250,7 +252,7 @@ public class CachingContentFactory implements HttpContent.ContentFactory
// Map the content into memory if possible.
_buffer = httpContent.getBuffer();
_cacheKey = key;
_lastModifiedValue = _delegate.getResource().lastModified();
_lastModifiedValue = resource.lastModified();
_lastAccessed.set(NanoTime.now());
}
@ -279,11 +281,7 @@ public class CachingContentFactory implements HttpContent.ContentFactory
(NanoTime.since(lastChecked) > TimeUnit.SECONDS.toNanos(1)) ? now : lastChecked) != now)
return true;
Instant lastModifiedTime = _delegate.getResource().lastModified();
if (lastModifiedTime.equals(_lastModifiedValue))
return true;
release();
return false;
return getLastModifiedInstant().equals(_lastModifiedValue);
}
@Override

7
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContentWrapper.java
View File

@ -24,13 +24,18 @@ import org.eclipse.jetty.util.resource.Resource;
*/
public class HttpContentWrapper implements HttpContent
{
protected final HttpContent _delegate;
private final HttpContent _delegate;
public HttpContentWrapper(HttpContent content)
{
_delegate = content;
}
public HttpContent getWrapped()
{
return _delegate;
}
@Override
public HttpField getContentType()
{

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

@ -209,7 +209,7 @@ public class ResourceService
HttpField contentEncoding = content.getContentEncoding();
if (contentEncoding != null)
response.getHeaders().put(contentEncoding);
else if (isGzippedContent(pathInContext))
else if (isImplicitlyGzippedContent(pathInContext))
response.getHeaders().put(HttpHeader.CONTENT_ENCODING, "gzip");
// Send the data
@ -285,7 +285,7 @@ public class ResourceService
return values;
}
private boolean isGzippedContent(String path)
private boolean isImplicitlyGzippedContent(String path)
{
if (path == null || _gzipEquivalentFileExtensions == null)
return false;

1
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceHandler.java
View File

@ -95,6 +95,7 @@ public class ResourceHandler extends HandlerWrapper implements ResourceFactory,
if (_mimeTypes == null)
_mimeTypes = _context == null ? new MimeTypes() : _context.getMimeTypes();
// TODO: SHOULD BE CACHING AND EXTENSIBLE.
_resourceService.setContentFactory(new ResourceContentFactory(this, _mimeTypes));
_resourceService.setWelcomeFactory(this);