Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet
parent
8eb9522775
commit
3a44648e46
|
|
@ -34,7 +34,6 @@ import java.util.stream.Stream;
|
|||
import javax.net.ssl.SSLSocket;
|
||||
import javax.servlet.AsyncContext;
|
||||
import javax.servlet.ReadListener;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.ServletInputStream;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
|
@ -61,8 +60,6 @@ import org.eclipse.jetty.util.IO;
|
|||
import org.eclipse.jetty.util.ssl.SslContextFactory;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.condition.DisabledOnJre;
|
||||
import org.junit.jupiter.api.condition.JRE;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
|
|
@ -78,13 +75,8 @@ public class HttpInputIntegrationTest
|
|||
BLOCKING, ASYNC_DISPATCHED, ASYNC_OTHER_DISPATCHED, ASYNC_OTHER_WAIT
|
||||
}
|
||||
|
||||
public static final String EOF = "__EOF__";
|
||||
public static final String DELAY = "__DELAY__";
|
||||
public static final String ABORT = "__ABORT__";
|
||||
|
||||
private static Server __server;
|
||||
private static HttpConfiguration __config;
|
||||
private static HttpConfiguration __sslConfig;
|
||||
private static SslContextFactory.Server __sslContextFactory;
|
||||
|
||||
@BeforeAll
|
||||
|
|
@ -107,14 +99,15 @@ public class HttpInputIntegrationTest
|
|||
__sslContextFactory.setKeyStorePassword("storepwd");
|
||||
|
||||
// HTTPS Configuration
|
||||
__sslConfig = new HttpConfiguration(__config);
|
||||
__sslConfig.addCustomizer(new SecureRequestCustomizer());
|
||||
HttpConfiguration sslConfig = new HttpConfiguration(__config);
|
||||
sslConfig.addCustomizer(new SecureRequestCustomizer());
|
||||
|
||||
// HTTP/1 Connection Factory
|
||||
HttpConnectionFactory h1 = new HttpConnectionFactory(__sslConfig);
|
||||
HttpConnectionFactory h1 = new HttpConnectionFactory(sslConfig);
|
||||
|
||||
/* TODO
|
||||
// HTTP/2 Connection Factory
|
||||
HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(__sslConfig);
|
||||
HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(sslConfig);
|
||||
|
||||
NegotiatingServerConnectionFactory.checkProtocolNegotiationAvailable();
|
||||
ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory();
|
||||
|
|
@ -145,7 +138,6 @@ public class HttpInputIntegrationTest
|
|||
|
||||
interface TestClient
|
||||
{
|
||||
|
||||
/**
|
||||
* @param uri The URI to test, typically /ctx/test?mode=THE_MODE
|
||||
* @param delayMs the delay in MS to use.
|
||||
|
|
@ -160,7 +152,6 @@ public class HttpInputIntegrationTest
|
|||
public static Stream<Arguments> scenarios()
|
||||
{
|
||||
List<Scenario> tests = new ArrayList<>();
|
||||
|
||||
// TODO other client types!
|
||||
// test with the following clients/protocols:
|
||||
// + Local
|
||||
|
|
@ -169,16 +160,14 @@ public class HttpInputIntegrationTest
|
|||
// + HTTP/2
|
||||
// + SSL + HTTP/2
|
||||
// + FASTCGI
|
||||
for (Class<? extends TestClient> client : new Class[]{LocalClient.class, H1Client.class, H1SClient.class})
|
||||
for (Class<? extends TestClient> client : Arrays.asList(LocalClient.class, H1Client.class, H1SClient.class))
|
||||
{
|
||||
|
||||
// test async actions that are run:
|
||||
// + By a thread in a container callback
|
||||
// + By another thread while a container callback is active
|
||||
// + By another thread while no container callback is active
|
||||
for (Mode mode : Mode.values())
|
||||
{
|
||||
|
||||
// test servlet dispatch with:
|
||||
// + Delayed dispatch on
|
||||
// + Delayed dispatch off
|
||||
|
|
@ -213,7 +202,7 @@ public class HttpInputIntegrationTest
|
|||
return tests.stream().map(Arguments::of);
|
||||
}
|
||||
|
||||
private static void runmode(Mode mode, final Request request, final Runnable test)
|
||||
private static void runMode(Mode mode, Request request, Runnable test)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
|
|
@ -224,22 +213,18 @@ public class HttpInputIntegrationTest
|
|||
}
|
||||
case ASYNC_OTHER_DISPATCHED:
|
||||
{
|
||||
final CountDownLatch latch = new CountDownLatch(1);
|
||||
new Thread()
|
||||
CountDownLatch latch = new CountDownLatch(1);
|
||||
new Thread(() ->
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
test.run();
|
||||
}
|
||||
finally
|
||||
{
|
||||
latch.countDown();
|
||||
}
|
||||
test.run();
|
||||
}
|
||||
}.start();
|
||||
finally
|
||||
{
|
||||
latch.countDown();
|
||||
}
|
||||
}).start();
|
||||
// prevent caller returning until other thread complete
|
||||
try
|
||||
{
|
||||
|
|
@ -254,40 +239,35 @@ public class HttpInputIntegrationTest
|
|||
}
|
||||
case ASYNC_OTHER_WAIT:
|
||||
{
|
||||
final CountDownLatch latch = new CountDownLatch(1);
|
||||
final HttpChannelState.State S = request.getHttpChannelState().getState();
|
||||
new Thread()
|
||||
CountDownLatch latch = new CountDownLatch(1);
|
||||
HttpChannelState.State S = request.getHttpChannelState().getState();
|
||||
new Thread(() ->
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!latch.await(5, TimeUnit.SECONDS))
|
||||
fail("latch expired");
|
||||
if (!latch.await(5, TimeUnit.SECONDS))
|
||||
fail("latch expired");
|
||||
|
||||
// Spin until state change
|
||||
HttpChannelState.State s = request.getHttpChannelState().getState();
|
||||
while (request.getHttpChannelState().getState() == S)
|
||||
{
|
||||
Thread.yield();
|
||||
s = request.getHttpChannelState().getState();
|
||||
}
|
||||
test.run();
|
||||
}
|
||||
catch (Exception e)
|
||||
// Spin until state change
|
||||
while (request.getHttpChannelState().getState() == S)
|
||||
{
|
||||
e.printStackTrace();
|
||||
Thread.yield();
|
||||
}
|
||||
test.run();
|
||||
}
|
||||
}.start();
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}).start();
|
||||
// ensure other thread running before trying to return
|
||||
latch.countDown();
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
{
|
||||
throw new IllegalStateException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -315,8 +295,6 @@ public class HttpInputIntegrationTest
|
|||
|
||||
@ParameterizedTest(name = "[{index}] STRESS {0}")
|
||||
@MethodSource("scenarios")
|
||||
// JDK 11's SSLSocket is not reliable enough to run this test.
|
||||
@DisabledOnJre(JRE.JAVA_11)
|
||||
public void testStress(Scenario scenario) throws Exception
|
||||
{
|
||||
int sum = 0;
|
||||
|
|
@ -327,37 +305,33 @@ public class HttpInputIntegrationTest
|
|||
sum += c;
|
||||
}
|
||||
}
|
||||
final int summation = sum;
|
||||
int summation = sum;
|
||||
|
||||
final int threads = 10;
|
||||
final int loops = 10;
|
||||
int threads = 10;
|
||||
int loops = 10;
|
||||
|
||||
final AtomicInteger count = new AtomicInteger(0);
|
||||
AtomicInteger count = new AtomicInteger(0);
|
||||
Thread[] t = new Thread[threads];
|
||||
|
||||
Runnable run = new Runnable()
|
||||
Runnable run = () ->
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
try
|
||||
{
|
||||
try
|
||||
TestClient client = scenario._client.getDeclaredConstructor().newInstance();
|
||||
for (int j = 0; j < loops; j++)
|
||||
{
|
||||
TestClient client = scenario._client.getDeclaredConstructor().newInstance();
|
||||
for (int j = 0; j < loops; j++)
|
||||
{
|
||||
String response = client.send("/ctx/test?mode=" + scenario._mode, 10, scenario._delay, scenario._length, scenario._send);
|
||||
assertTrue(response.startsWith("HTTP"));
|
||||
assertTrue(response.contains(" " + scenario._status + " "));
|
||||
assertTrue(response.contains("read=" + scenario._read));
|
||||
assertTrue(response.contains("sum=" + summation));
|
||||
count.incrementAndGet();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
String response = client.send("/ctx/test?mode=" + scenario._mode, 10, scenario._delay, scenario._length, scenario._send);
|
||||
assertTrue(response.startsWith("HTTP"), response);
|
||||
assertTrue(response.contains(" " + scenario._status + " "), response);
|
||||
assertTrue(response.contains("read=" + scenario._read), response);
|
||||
assertTrue(response.contains("sum=" + summation), response);
|
||||
count.incrementAndGet();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
};
|
||||
|
||||
for (int i = 0; i < threads; i++)
|
||||
|
|
@ -370,17 +344,17 @@ public class HttpInputIntegrationTest
|
|||
t[i].join();
|
||||
}
|
||||
|
||||
assertEquals(count.get(), threads * loops);
|
||||
assertEquals(threads * loops, count.get());
|
||||
}
|
||||
|
||||
public static class TestServlet extends HttpServlet
|
||||
{
|
||||
String expected = "content0CONTENT1";
|
||||
private final String expected = "content0CONTENT1";
|
||||
|
||||
@Override
|
||||
protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException
|
||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
|
||||
{
|
||||
final Mode mode = Mode.valueOf(req.getParameter("mode"));
|
||||
Mode mode = Mode.valueOf(req.getParameter("mode"));
|
||||
resp.setContentType("text/plain");
|
||||
|
||||
if (mode == Mode.BLOCKING)
|
||||
|
|
@ -409,81 +383,70 @@ public class HttpInputIntegrationTest
|
|||
else
|
||||
{
|
||||
// we are asynchronous
|
||||
final AsyncContext context = req.startAsync();
|
||||
AsyncContext context = req.startAsync();
|
||||
context.setTimeout(10000);
|
||||
final ServletInputStream in = req.getInputStream();
|
||||
final Request request = Request.getBaseRequest(req);
|
||||
final AtomicInteger read = new AtomicInteger(0);
|
||||
final AtomicInteger sum = new AtomicInteger(0);
|
||||
ServletInputStream in = req.getInputStream();
|
||||
Request request = Request.getBaseRequest(req);
|
||||
AtomicInteger read = new AtomicInteger(0);
|
||||
AtomicInteger sum = new AtomicInteger(0);
|
||||
|
||||
runmode(mode, request, new Runnable()
|
||||
runMode(mode, request, () -> in.setReadListener(new ReadListener()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
public void onError(Throwable t)
|
||||
{
|
||||
in.setReadListener(new ReadListener()
|
||||
t.printStackTrace();
|
||||
try
|
||||
{
|
||||
@Override
|
||||
public void onError(Throwable t)
|
||||
resp.sendError(500);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
context.complete();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataAvailable()
|
||||
{
|
||||
runMode(mode, request, () ->
|
||||
{
|
||||
while (in.isReady() && !in.isFinished())
|
||||
{
|
||||
t.printStackTrace();
|
||||
try
|
||||
{
|
||||
resp.sendError(500);
|
||||
int b = in.read();
|
||||
if (b < 0)
|
||||
return;
|
||||
sum.addAndGet(b);
|
||||
int i = read.getAndIncrement();
|
||||
if (b != expected.charAt(i))
|
||||
{
|
||||
System.err.printf("XXX '%c'!='%c' at %d%n", expected.charAt(i), (char)b, i);
|
||||
System.err.println(" " + request.getHttpChannel());
|
||||
System.err.println(" " + request.getHttpChannel().getHttpTransport());
|
||||
}
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException(e);
|
||||
onError(e);
|
||||
}
|
||||
context.complete();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataAvailable() throws IOException
|
||||
{
|
||||
runmode(mode, request, new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
while (in.isReady() && !in.isFinished())
|
||||
{
|
||||
try
|
||||
{
|
||||
int b = in.read();
|
||||
if (b < 0)
|
||||
return;
|
||||
sum.addAndGet(b);
|
||||
int i = read.getAndIncrement();
|
||||
if (b != expected.charAt(i))
|
||||
{
|
||||
System.err.printf("XXX '%c'!='%c' at %d%n", expected.charAt(i), (char)b, i);
|
||||
System.err.println(" " + request.getHttpChannel());
|
||||
System.err.println(" " + request.getHttpChannel().getHttpTransport());
|
||||
}
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
onError(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAllDataRead() throws IOException
|
||||
{
|
||||
resp.setStatus(200);
|
||||
resp.setContentType("text/plain");
|
||||
resp.getWriter().println("read=" + read.get());
|
||||
resp.getWriter().println("sum=" + sum.get());
|
||||
context.complete();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@Override
|
||||
public void onAllDataRead() throws IOException
|
||||
{
|
||||
resp.setStatus(200);
|
||||
resp.setContentType("text/plain");
|
||||
resp.getWriter().println("read=" + read.get());
|
||||
resp.getWriter().println("sum=" + sum.get());
|
||||
context.complete();
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -526,7 +489,7 @@ public class HttpInputIntegrationTest
|
|||
flush(local, buffer, delayMs, delayInFrame, true);
|
||||
}
|
||||
|
||||
buffer.append(c.substring(0, 1));
|
||||
buffer.append(c.charAt(0));
|
||||
flush(local, buffer, delayMs, delayInFrame, true);
|
||||
buffer.append(c.substring(1));
|
||||
if (chunked)
|
||||
|
|
@ -556,9 +519,9 @@ public class HttpInputIntegrationTest
|
|||
}
|
||||
}
|
||||
|
||||
private void flush(final LocalEndPoint local, StringBuilder buffer) throws Exception
|
||||
private void flush(LocalEndPoint local, StringBuilder buffer)
|
||||
{
|
||||
final String flush = buffer.toString();
|
||||
String flush = buffer.toString();
|
||||
buffer.setLength(0);
|
||||
flushed.append(flush);
|
||||
local.addInputAndExecute(BufferUtil.toBuffer(flush));
|
||||
|
|
@ -619,7 +582,7 @@ public class HttpInputIntegrationTest
|
|||
flush(out, buffer, delayMs, delayInFrame, true);
|
||||
}
|
||||
|
||||
buffer.append(c.substring(0, 1));
|
||||
buffer.append(c.charAt(0));
|
||||
flush(out, buffer, delayMs, delayInFrame, true);
|
||||
buffer.append(c.substring(1));
|
||||
flush(out, buffer, delayMs, delayInFrame, false);
|
||||
|
|
@ -689,13 +652,13 @@ public class HttpInputIntegrationTest
|
|||
|
||||
public static class Scenario
|
||||
{
|
||||
final Class<? extends TestClient> _client;
|
||||
final Mode _mode;
|
||||
final Boolean _delay;
|
||||
final int _status;
|
||||
final int _read;
|
||||
final int _length;
|
||||
final List<String> _send;
|
||||
private final Class<? extends TestClient> _client;
|
||||
private final Mode _mode;
|
||||
private final Boolean _delay;
|
||||
private final int _status;
|
||||
private final int _read;
|
||||
private final int _length;
|
||||
private final List<String> _send;
|
||||
|
||||
public Scenario(Class<? extends TestClient> client, Mode mode, boolean dispatch, Boolean delay, int status, int read, int length, String... send)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue