Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CXF-8629: AsyncHTTPConduit (hc5) should support chunked request / response. Add test cases with auto-redirect #2202

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+100 −6
Open

CXF-8629: AsyncHTTPConduit (hc5) should support chunked request / response. Add test cases with auto-redirect #2202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/FileStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import jakarta.activation.DataHandler;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.QueryParam;
Expand All @@ -38,8 +39,10 @@
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.ResponseBuilder;
import jakarta.ws.rs.core.Response.Status;
import jakarta.ws.rs.core.StreamingOutput;
import jakarta.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.UriInfo;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
Expand Down Expand Up @@ -136,4 +139,53 @@ public void write(OutputStream os) throws IOException, WebApplicationException {
}
}
}

@GET
@Consumes("multipart/form-data")
public void getBook(@QueryParam("chunked") boolean chunked, @QueryParam("filename") String source,
@Suspended final AsyncResponse response) {

if (StringUtils.isEmpty(source)) {
response.resume(Response.status(Status.BAD_REQUEST).build());
return;
}

try {
if (!store.containsKey(source)) {
response.resume(Response.status(Status.NOT_FOUND).build());
return;
}

final byte[] content = store.get(source);
if (response.isSuspended()) {
final StreamingOutput stream = new StreamingOutput() {
@Override
public void write(OutputStream os) throws IOException, WebApplicationException {
if (chunked) {
// Make sure we have enough data for chunking to kick in
for (int i = 0; i < 10; ++i) {
os.write(content);
}
} else {
os.write(content);
}
}
};
response.resume(Response.ok().entity(stream).build());
}

} catch (final Exception ex) {
response.resume(Response.serverError().build());
}
}

@GET
@Path("/redirect")
public Response addBook(@Context UriInfo uriInfo) {
final UriBuilder builder = uriInfo.getBaseUriBuilder().path(getClass());
uriInfo.getQueryParameters(true).forEach((p, v) -> builder.queryParam(p, v.get(0)));

final ResponseBuilder response = Response.status(303).header("Location", builder.build());
return response.build();
}
}
54 changes: 48 additions & 6 deletions ...port-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,19 @@

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

@RunWith(value = org.junit.runners.Parameterized.class)
public class JAXRSAsyncClientChunkingTest extends AbstractBusClientServerTestBase {
private static final String PORT = allocatePort(FileStoreServer.class);
private final Boolean chunked;
private final Boolean autoRedirect;

public JAXRSAsyncClientChunkingTest(Boolean chunked) {
public JAXRSAsyncClientChunkingTest(Boolean chunked, Boolean autoRedirect) {
this.chunked = chunked;
this.autoRedirect = autoRedirect;
}

@BeforeClass
Expand All @@ -69,9 +72,14 @@ public static void startServers() throws Exception {
createStaticBus();
}

@Parameters(name = "{0}")
public static Collection<Boolean> data() {
return Arrays.asList(new Boolean[] {Boolean.FALSE, Boolean.TRUE});
@Parameters(name = "chunked {0}, auto-redirect {1}")
public static Collection<Boolean[]> data() {
return Arrays.asList(new Boolean[][] {
{Boolean.FALSE /* chunked */, Boolean.FALSE /* autoredirect */},
{Boolean.FALSE /* chunked */, Boolean.TRUE /* autoredirect */},
{Boolean.TRUE /* chunked */, Boolean.FALSE /* autoredirect */},
{Boolean.TRUE /* chunked */, Boolean.TRUE /* autoredirect */},
});
}

@Test
Expand All @@ -82,14 +90,15 @@ public void testMultipartChunking() {
final ClientConfiguration config = WebClient.getConfig(webClient);
config.getBus().setProperty(AsyncHTTPConduit.USE_ASYNC, true);
config.getHttpConduit().getClient().setAllowChunking(chunked);
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);

final String filename = "keymanagers.jks";
try {
final String filename = "keymanagers.jks";
final MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Content-ID", filename);
headers.add("Content-Type", "application/binary");
headers.add("Content-Disposition", "attachment; filename=" + chunked + "_" + filename);
headers.add("Content-Disposition", "attachment; filename=" + chunked + "_" + autoRedirect + "_" + filename);
final Attachment att = new Attachment(getClass().getResourceAsStream("/" + filename), headers);
final MultipartBody entity = new MultipartBody(att);
try (Response response = webClient.header("Content-Type", "multipart/form-data").post(entity)) {
Expand All @@ -100,6 +109,8 @@ public void testMultipartChunking() {
} finally {
webClient.close();
}

assertRedirect(chunked + "_" + autoRedirect + "_" + filename);
}

@Test
Expand All @@ -110,6 +121,7 @@ public void testStreamChunking() throws IOException {
final ClientConfiguration config = WebClient.getConfig(webClient);
config.getBus().setProperty(AsyncHTTPConduit.USE_ASYNC, true);
config.getHttpConduit().getClient().setAllowChunking(chunked);
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);

final byte[] bytes = new byte [32 * 1024];
Expand All @@ -128,6 +140,36 @@ public void testStreamChunking() throws IOException {
}
}

private void assertRedirect(String filename) {
final String url = "http://localhost:" + PORT + "/file-store/redirect";

final WebClient webClient = WebClient.create(url, List.of(new MultipartProvider()))
.query("chunked", chunked)
.query("filename", filename);

final ClientConfiguration config = WebClient.getConfig(webClient);
config.getBus().setProperty(AsyncHTTPConduit.USE_ASYNC, true);
config.getHttpConduit().getClient().setAllowChunking(chunked);
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);

try {
try (Response response = webClient.get()) {
if (autoRedirect) {
assertThat(response.getStatus(), equalTo(200));
assertThat(response.getHeaderString("Transfer-Encoding"), equalTo(chunked ? "chunked" : null));
assertThat(response.getEntity(), not(equalTo(null)));
} else {
assertThat(response.getStatus(), equalTo(303));
assertThat(response.getHeaderString("Location"),
startsWith("http://localhost:" + PORT + "/file-store"));
}
}
} finally {
webClient.close();
}
}

private void configureLogging(final ClientConfiguration config) {
final LoggingOutInterceptor out = new LoggingOutInterceptor();
out.setShowMultipartContent(false);
Expand Down
Loading