Skip to content

Commit

Permalink
Fixed tests.
Browse files Browse the repository at this point in the history 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
  • Loading branch information
@sbordet
sbordet committed Dec 20, 2024
1 parent 630d5c5 commit 7947030
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 19 deletions.
6 changes: 4 additions & 2 deletions ...lient/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

package org.eclipse.jetty.client.transport.internal;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.eclipse.jetty.client.Destination;
import org.eclipse.jetty.client.HttpClient;
Expand All @@ -29,6 +29,7 @@
import org.eclipse.jetty.client.transport.HttpDestination;
import org.eclipse.jetty.client.transport.HttpResponse;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.io.ClientConnectionFactory;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Promise;
Expand Down Expand Up @@ -72,7 +73,8 @@ public void upgrade(Response response, EndPoint endPoint, Callback callback)
Origin newOrigin = new Origin(origin.getScheme(), origin.getAddress(), origin.getTag(), new Origin.Protocol(List.of(protocol), false));
Destination newDestination = httpClient.resolveDestination(newOrigin);

Map<String, Object> context = new HashMap<>();
Map<String, Object> context = new ConcurrentHashMap<>();
context.put(ClientConnectionFactory.CLIENT_CONTEXT_KEY, httpClient);
context.put(HttpClientTransport.HTTP_DESTINATION_CONTEXT_KEY, newDestination);
context.put(HttpResponse.class.getName(), response);
context.put(HttpClientTransport.HTTP_CONNECTION_PROMISE_CONTEXT_KEY, Promise.from(y -> callback.succeeded(), callback::failed));
Expand Down
5 changes: 4 additions & 1 deletion ...pression-server/src/main/java/org/eclipse/jetty/compression/server/CompressionConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,10 @@ String getCompressionEncoding(Set<String> supportedEncodings, Request request, L

// The only option left is identity, if acceptable.
if (identity != null && !identity.isAcceptable())
throw new HttpException.RuntimeException(HttpStatus.UNSUPPORTED_MEDIA_TYPE_415);
{
List<String> accepted = supportedEncodings.stream().filter(compressEncodings).toList();
throw new HttpException.RuntimeException(HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, String.join(", ", accepted));
}

// Identity is acceptable.
return null;
Expand Down
28 changes: 26 additions & 2 deletions ...ression-server/src/main/java/org/eclipse/jetty/compression/server/CompressionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@
import org.eclipse.jetty.compression.server.internal.CompressionResponse;
import org.eclipse.jetty.compression.server.internal.DecompressionRequest;
import org.eclipse.jetty.http.EtagUtils;
import org.eclipse.jetty.http.HttpException;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.PreEncodedHttpField;
import org.eclipse.jetty.http.QuotedQualityCSV;
import org.eclipse.jetty.http.pathmap.MatchedResource;
Expand All @@ -34,6 +36,7 @@
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.TypeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -195,7 +198,7 @@ protected void doStart() throws Exception
}

@Override
public boolean handle(final Request request, final Response response, final Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
if (LOG.isDebugEnabled())
LOG.debug("handling {} {} {}", request, response, this);
Expand Down Expand Up @@ -262,7 +265,28 @@ public boolean handle(final Request request, final Response response, final Call
requestAcceptEncoding = qualityCSV.getQualityValues();

String decompressEncoding = config.getDecompressionEncoding(supportedEncodings.keySet(), request, requestContentEncoding, pathInContext);
String compressEncoding = config.getCompressionEncoding(supportedEncodings.keySet(), request, requestAcceptEncoding, pathInContext);

String compressEncoding;
try
{
compressEncoding = config.getCompressionEncoding(supportedEncodings.keySet(), request, requestAcceptEncoding, pathInContext);
}
catch (Throwable x)
{
if (x instanceof HttpException http)
{
int statusCode = http.getCode();
if (statusCode == HttpStatus.UNSUPPORTED_MEDIA_TYPE_415)
{
String accepted = http.getReason();
if (StringUtil.isNotBlank(accepted))
response.getHeaders().put(HttpHeader.ACCEPT_ENCODING, accepted);
Response.writeError(request, response, callback, http.getCode(), null, x);
return true;
}
}
throw x;
}

if (LOG.isDebugEnabled())
{
Expand Down
16 changes: 8 additions & 8 deletions ...rc/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpReceiverOverHTTP2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,10 @@ public Runnable onReset(ResetFrame frame, Callback callback)
return null;
}

return invoker.offer(() ->
{
int error = frame.getError();
IOException failure = new IOException(ErrorCode.toString(error, "reset_code_" + error));
callback.completeWith(exchange.getRequest().abort(failure));
});
int error = frame.getError();
IOException failure = new IOException(ErrorCode.toString(error, "reset_code_" + error));
Runnable task = () -> callback.completeWith(exchange.getRequest().abort(failure));
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), task));
}

@Override
Expand All @@ -276,12 +274,14 @@ public Runnable onTimeout(TimeoutException failure, Promise<Boolean> promise)
promise.succeeded(false);
return null;
}
return invoker.offer(() -> promise.completeWith(exchange.getRequest().abort(failure)));
Runnable task = () -> promise.completeWith(exchange.getRequest().abort(failure));
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), task));
}

@Override
public Runnable onFailure(Throwable failure, Callback callback)
{
return invoker.offer(() -> responseFailure(failure, Promise.from(failed -> callback.succeeded(), callback::failed)));
Runnable task = () -> responseFailure(failure, Promise.from(failed -> callback.succeeded(), callback::failed));
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), task));
}
}
20 changes: 14 additions & 6 deletions ...rc/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.io.EOFException;
import java.nio.ByteBuffer;
import java.util.concurrent.Executor;

import org.eclipse.jetty.client.transport.HttpExchange;
import org.eclipse.jetty.client.transport.HttpReceiver;
Expand All @@ -28,16 +29,21 @@
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.util.Promise;
import org.eclipse.jetty.util.thread.Invocable;
import org.eclipse.jetty.util.thread.SerializedInvoker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class HttpReceiverOverHTTP3 extends HttpReceiver
{
private static final Logger LOG = LoggerFactory.getLogger(HttpReceiverOverHTTP3.class);

private final SerializedInvoker invoker;

protected HttpReceiverOverHTTP3(HttpChannelOverHTTP3 channel)
{
super(channel);
Executor executor = channel.getHttpDestination().getHttpClient().getExecutor();
invoker = new SerializedInvoker(getClass().getSimpleName(), executor);
}

@Override
Expand Down Expand Up @@ -99,7 +105,7 @@ Runnable onResponse(Stream.Client stream, HeadersFrame frame)
if (exchange == null)
return null;

return new Invocable.ReadyTask(getHttpConnection().getInvocationType(), () ->
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), () ->
{
HttpResponse httpResponse = exchange.getResponse();
MetaData.Response response = (MetaData.Response)frame.getMetaData();
Expand All @@ -116,7 +122,7 @@ Runnable onResponse(Stream.Client stream, HeadersFrame frame)
// TODO: add support for HttpMethod.CONNECT.

responseHeaders(exchange);
});
}));
}

Runnable onDataAvailable()
Expand All @@ -128,7 +134,7 @@ Runnable onDataAvailable()
if (exchange == null)
return null;

return new Invocable.ReadyTask(getInvocationType(), () -> responseContentAvailable(exchange));
return invoker.offer(new Invocable.ReadyTask(getInvocationType(), () -> responseContentAvailable(exchange)));
}

Runnable onTrailer(HeadersFrame frame)
Expand All @@ -140,7 +146,7 @@ Runnable onTrailer(HeadersFrame frame)
HttpFields trailers = frame.getMetaData().getHttpFields();
trailers.forEach(exchange.getResponse()::trailer);

return new Invocable.ReadyTask(getInvocationType(), () -> responseSuccess(exchange, null));
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), () -> responseSuccess(exchange, null)));
}

Runnable onIdleTimeout(Throwable failure, Promise<Boolean> promise)
Expand All @@ -151,11 +157,13 @@ Runnable onIdleTimeout(Throwable failure, Promise<Boolean> promise)
promise.succeeded(false);
return null;
}
return () -> exchange.abort(failure, Promise.from(aborted -> promise.succeeded(!aborted), promise::failed));
Runnable task = () -> promise.completeWith(exchange.getRequest().abort(failure));
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), task));
}

Runnable onFailure(Throwable failure)
{
return () -> responseFailure(failure, Promise.noop());
Runnable task = () -> responseFailure(failure, Promise.noop());
return invoker.offer(new Invocable.ReadyTask(getHttpConnection().getInvocationType(), task));
}
}
3 changes: 3 additions & 0 deletions ...ports/src/test/java/org/eclipse/jetty/test/client/transport/HTTPDynamicTransportTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeFalse;

public class HTTPDynamicTransportTest extends AbstractTransportTest
{
Expand Down Expand Up @@ -151,6 +152,8 @@ public void testExplicitHTTPVersionWithSameHttpClientForAllHTTPVersions() throws
@Test
public void testNonExplicitHTTPVersionH3H2H1() throws Exception
{
assumeFalse("ci".equals(System.getProperty("env")));

int port = freePort();
ConnectionFactory h1 = new HttpConnectionFactory();
ConnectionFactory h2c = new HTTP2CServerConnectionFactory();
Expand Down

0 comments on commit 7947030

Please sign in to comment.