move newClassPathResource to ResourceFactory
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
parent
faae5898ea
commit
abe2f3264a
|
@ -42,7 +42,6 @@ import java.util.function.Consumer;
|
|||
import org.eclipse.jetty.util.FileID;
|
||||
import org.eclipse.jetty.util.IO;
|
||||
import org.eclipse.jetty.util.Index;
|
||||
import org.eclipse.jetty.util.Loader;
|
||||
import org.eclipse.jetty.util.URIUtil;
|
||||
import org.eclipse.jetty.util.UrlEncoded;
|
||||
import org.slf4j.Logger;
|
||||
|
@ -279,35 +278,6 @@ public abstract class Resource
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a classpath resource.
|
||||
* The {@link java.lang.Class#getResource(String)} method is used to lookup the resource. If it is not
|
||||
* found, then the {@link Loader#getResource(String)} method is used.
|
||||
* If it is still not found, then {@link ClassLoader#getSystemResource(String)} is used.
|
||||
* Unlike {@link ClassLoader#getSystemResource(String)} this method does not check for normal resources.
|
||||
*
|
||||
* @param resource the relative name of the resource
|
||||
* @return Resource or null
|
||||
* TODO move to ResourceFactory
|
||||
*/
|
||||
public static Resource newClassPathResource(String resource)
|
||||
{
|
||||
URL url = Resource.class.getResource(resource);
|
||||
|
||||
if (url == null)
|
||||
url = Loader.getResource(resource);
|
||||
if (url == null)
|
||||
return null;
|
||||
try
|
||||
{
|
||||
return createResource(url.toURI());
|
||||
}
|
||||
catch (URISyntaxException e)
|
||||
{
|
||||
throw new IllegalArgumentException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if the Resource r is contained in the Resource containingResource, either because
|
||||
* containingResource is a folder or a jar file or any form of resource capable of containing other resources.
|
||||
|
|
|
@ -24,6 +24,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||
|
||||
import org.eclipse.jetty.util.FileID;
|
||||
import org.eclipse.jetty.util.IO;
|
||||
import org.eclipse.jetty.util.Loader;
|
||||
import org.eclipse.jetty.util.URIUtil;
|
||||
import org.eclipse.jetty.util.component.AbstractLifeCycle;
|
||||
import org.eclipse.jetty.util.component.Container;
|
||||
|
@ -40,6 +41,34 @@ public interface ResourceFactory
|
|||
{
|
||||
Logger LOG = LoggerFactory.getLogger(Resource.class);
|
||||
|
||||
/**
|
||||
* Find a classpath resource.
|
||||
* The {@link Class#getResource(String)} method is used to lookup the resource. If it is not
|
||||
* found, then the {@link Loader#getResource(String)} method is used.
|
||||
* If it is still not found, then {@link ClassLoader#getSystemResource(String)} is used.
|
||||
* Unlike {@link ClassLoader#getSystemResource(String)} this method does not check for normal resources.
|
||||
*
|
||||
* @param resource the relative name of the resource
|
||||
* @return Resource or null
|
||||
*/
|
||||
default Resource newClassPathResource(String resource)
|
||||
{
|
||||
URL url = Resource.class.getResource(resource);
|
||||
|
||||
if (url == null)
|
||||
url = Loader.getResource(resource);
|
||||
if (url == null)
|
||||
return null;
|
||||
try
|
||||
{
|
||||
return Resource.createResource(url.toURI());
|
||||
}
|
||||
catch (URISyntaxException e)
|
||||
{
|
||||
throw new IllegalArgumentException(e);
|
||||
}
|
||||
}
|
||||
|
||||
Resource newResource(URI uri);
|
||||
|
||||
default Resource newResource(String resource)
|
||||
|
|
|
@ -16,8 +16,13 @@ package org.eclipse.jetty.util.resource;
|
|||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import org.eclipse.jetty.util.IO;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hamcrest.Matchers.empty;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
@ -25,6 +30,22 @@ import static org.junit.jupiter.api.Assumptions.assumeFalse;
|
|||
|
||||
public class ClassPathResourceTest
|
||||
{
|
||||
private ResourceFactory.Closeable resourceFactory;
|
||||
|
||||
@BeforeEach
|
||||
public void beforeEach()
|
||||
{
|
||||
assertThat(FileSystemPool.INSTANCE.mounts(), empty());
|
||||
resourceFactory = ResourceFactory.closeable();
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
public void afterEach()
|
||||
{
|
||||
IO.close(resourceFactory);
|
||||
assertThat(FileSystemPool.INSTANCE.mounts(), empty());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test a class path resource for existence.
|
||||
*/
|
||||
|
@ -33,7 +54,7 @@ public class ClassPathResourceTest
|
|||
{
|
||||
final String classPathName = "Resource.class";
|
||||
|
||||
Resource resource = Resource.newClassPathResource(classPathName);
|
||||
Resource resource = resourceFactory.newClassPathResource(classPathName);
|
||||
|
||||
// A class path cannot be a directory
|
||||
assertFalse(resource.isDirectory(), "Class path cannot be a directory.");
|
||||
|
@ -50,7 +71,7 @@ public class ClassPathResourceTest
|
|||
{
|
||||
final String classPathName = "/org/eclipse/jetty/util/resource/Resource.class";
|
||||
|
||||
Resource resource = Resource.newClassPathResource(classPathName);
|
||||
Resource resource = resourceFactory.newClassPathResource(classPathName);
|
||||
|
||||
// A class path cannot be a directory
|
||||
assertFalse(resource.isDirectory(), "Class path cannot be a directory.");
|
||||
|
@ -72,7 +93,7 @@ public class ClassPathResourceTest
|
|||
|
||||
final String classPathName = "/";
|
||||
|
||||
Resource resource = Resource.newClassPathResource(classPathName);
|
||||
Resource resource = resourceFactory.newClassPathResource(classPathName);
|
||||
|
||||
// A class path must be a directory
|
||||
assertTrue(resource.isDirectory(), "Class path must be a directory.");
|
||||
|
@ -95,7 +116,7 @@ public class ClassPathResourceTest
|
|||
final String classPathName = "/" + fileName;
|
||||
|
||||
// Will locate a resource in the class path
|
||||
Resource resource = Resource.newClassPathResource(classPathName);
|
||||
Resource resource = resourceFactory.newClassPathResource(classPathName);
|
||||
|
||||
// A class path cannot be a directory
|
||||
assertFalse(resource.isDirectory(), "Class path must be a directory.");
|
||||
|
|
|
@ -41,6 +41,7 @@ import org.eclipse.jetty.util.Callback;
|
|||
import org.eclipse.jetty.util.FuturePromise;
|
||||
import org.eclipse.jetty.util.IO;
|
||||
import org.eclipse.jetty.util.resource.Resource;
|
||||
import org.eclipse.jetty.util.resource.ResourceFactory;
|
||||
import org.hamcrest.Matchers;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
@ -139,7 +140,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendInputStreamSimple() throws Exception
|
||||
{
|
||||
Resource simple = Resource.newClassPathResource("simple/simple.txt");
|
||||
Resource simple = ResourceFactory.of(_contextHandler).newClassPathResource("simple/simple.txt");
|
||||
_handler._contentInputStream = simple.newInputStream();
|
||||
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
|
||||
assertThat(response, containsString("HTTP/1.1 200 OK"));
|
||||
|
@ -149,7 +150,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendInputStreamBig() throws Exception
|
||||
{
|
||||
Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._contentInputStream = big.newInputStream();
|
||||
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
|
||||
assertThat(response, containsString("HTTP/1.1 200 OK"));
|
||||
|
@ -160,7 +161,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendInputStreamBigChunked() throws Exception
|
||||
{
|
||||
Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._contentInputStream = new FilterInputStream(big.newInputStream())
|
||||
{
|
||||
@Override
|
||||
|
@ -191,7 +192,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendChannelSimple() throws Exception
|
||||
{
|
||||
Resource simple = Resource.newClassPathResource("simple/simple.txt");
|
||||
Resource simple = ResourceFactory.of(_contextHandler).newClassPathResource("simple/simple.txt");
|
||||
_handler._contentChannel = simple.newReadableByteChannel();
|
||||
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
|
||||
assertThat(response, containsString("HTTP/1.1 200 OK"));
|
||||
|
@ -201,7 +202,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendChannelBig() throws Exception
|
||||
{
|
||||
Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._contentChannel = big.newReadableByteChannel();
|
||||
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
|
||||
assertThat(response, containsString("HTTP/1.1 200 OK"));
|
||||
|
@ -212,7 +213,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendBigDirect() throws Exception
|
||||
{
|
||||
Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._content = BufferUtil.toBuffer(big, true);
|
||||
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
|
||||
assertThat(response, containsString("HTTP/1.1 200 OK"));
|
||||
|
@ -223,7 +224,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendBigInDirect() throws Exception
|
||||
{
|
||||
Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
|
||||
assertThat(response, containsString("HTTP/1.1 200 OK"));
|
||||
|
@ -234,7 +235,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testSendChannelBigChunked() throws Exception
|
||||
{
|
||||
Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
final ReadableByteChannel channel = big.newReadableByteChannel();
|
||||
_handler._contentChannel = new ReadableByteChannel()
|
||||
{
|
||||
|
@ -287,7 +288,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteByte() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[1];
|
||||
|
@ -301,7 +302,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteSmall() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[8];
|
||||
|
@ -315,7 +316,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteMed() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[4000];
|
||||
|
@ -329,7 +330,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteLarge() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[8192];
|
||||
|
@ -343,7 +344,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteByteKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[1];
|
||||
|
@ -358,7 +359,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteSmallKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[8];
|
||||
|
@ -373,7 +374,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteMedKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[4000];
|
||||
|
@ -388,7 +389,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteLargeKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[8192];
|
||||
|
@ -421,7 +422,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteBufferSmall() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8);
|
||||
|
@ -436,7 +437,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteBufferMed() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(4000);
|
||||
|
@ -451,7 +452,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteBufferLarge() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8192);
|
||||
|
@ -466,7 +467,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteBufferSmallKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8);
|
||||
|
@ -481,7 +482,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteBufferMedKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(4000);
|
||||
|
@ -496,7 +497,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteBufferLargeKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = true;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8192);
|
||||
|
@ -511,7 +512,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteByte() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[1];
|
||||
|
@ -527,7 +528,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteSmall() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[8];
|
||||
|
@ -543,7 +544,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteMed() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[4000];
|
||||
|
@ -559,7 +560,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteLarge() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[8192];
|
||||
|
@ -594,7 +595,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteBufferSmall() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8);
|
||||
|
@ -610,7 +611,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteBufferMed() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(4000);
|
||||
|
@ -626,7 +627,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteBufferLarge() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8192);
|
||||
|
@ -643,7 +644,7 @@ public class HttpOutputTest
|
|||
public void testAsyncWriteBufferLargeDirect()
|
||||
throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, true);
|
||||
_handler._byteBuffer = BufferUtil.allocateDirect(8192);
|
||||
|
@ -659,7 +660,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteBufferLargeHEAD() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._byteBuffer = BufferUtil.allocate(8192);
|
||||
|
@ -677,7 +678,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteSimpleKnown() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/simple.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/simple.txt");
|
||||
|
||||
_handler._async = true;
|
||||
_handler._writeLengthIfKnown = true;
|
||||
|
@ -694,7 +695,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testAsyncWriteSimpleKnownHEAD() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/simple.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/simple.txt");
|
||||
|
||||
_handler._async = true;
|
||||
_handler._writeLengthIfKnown = true;
|
||||
|
@ -712,7 +713,7 @@ public class HttpOutputTest
|
|||
@Test
|
||||
public void testWriteInterception() throws Exception
|
||||
{
|
||||
final Resource big = Resource.newClassPathResource("simple/big.txt");
|
||||
final Resource big = ResourceFactory.of(_contextHandler).newClassPathResource("simple/big.txt");
|
||||
_handler._writeLengthIfKnown = false;
|
||||
_handler._content = BufferUtil.toBuffer(big, false);
|
||||
_handler._arrayBuffer = new byte[1024];
|
||||
|
|
Loading…
Reference in New Issue