Skip to content

Commit

Permalink
Allow ChunkedInput#close to close the underlying stream
Browse files Browse the repository at this point in the history
Signed-off-by: jansupol <[email protected]>
  • Loading branch information
jansupol committed Jul 24, 2024
1 parent c4adbb3 commit 36cc6b8
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -35,6 +35,7 @@
import org.glassfish.jersey.internal.PropertiesDelegate;
import org.glassfish.jersey.internal.util.ReflectionHelper;
import org.glassfish.jersey.message.MessageBodyWorkers;
import org.glassfish.jersey.message.internal.ReaderInterceptorExecutor;

/**
* {@link javax.ws.rs.ext.MessageBodyWriter} for {@link ChunkedInput}.
Expand Down Expand Up @@ -71,7 +72,7 @@ public ChunkedInput readFrom(Class<ChunkedInput> chunkedInputClass,

return new ChunkedInput(
chunkType,
inputStream,
ReaderInterceptorExecutor.closeableInputStream(inputStream),
annotations,
mediaType,
headers,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/


package org.glassfish.jersey.tests.e2e.entity;

import org.glassfish.jersey.client.ChunkedInput;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ReaderInterceptor;
import javax.ws.rs.ext.ReaderInterceptorContext;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.concurrent.atomic.AtomicBoolean;

public class ChunkedInputReaderTest extends JerseyTest {

@Path("/")
public static class ChunkedInputReaderTestResource {
@GET
public String get() {
return "To_be_replaced_by_client_reader";
}
}

@Override
protected Application configure() {
return new ResourceConfig(ChunkedInputReaderTestResource.class);
}

@Test
public void testChunkedInputStreamIsClosed() {
AtomicBoolean closed = new AtomicBoolean(false);
InputStream inputStream = new ByteArrayInputStream("TEST".getBytes()) {
@Override
public void close() throws IOException {
closed.set(true);
super.close();
}
};

final GenericType<ChunkedInput<String>> chunkedInputGenericType = new GenericType(new ParameterizedType() {
@Override
public Type[] getActualTypeArguments() {
return new Type[]{String.class};
}

@Override
public Type getRawType() {
return ChunkedInput.class;
}

@Override
public Type getOwnerType() {
return ChunkedInput.class;
}
});


ChunkedInput<String> response = target().register(new ReaderInterceptor() {
@Override
public Object aroundReadFrom(ReaderInterceptorContext context) throws IOException, WebApplicationException {
context.setInputStream(inputStream);
return context.proceed();
};
}).request().get(chunkedInputGenericType);
MatcherAssert.assertThat(response.read(), Matchers.is("TEST"));
response.close();
MatcherAssert.assertThat(closed.get(), Matchers.is(true));
}
}

0 comments on commit 36cc6b8

Please sign in to comment.