Skip to content

Commit

Permalink
Update Jersey 2.32 -> 2.34 (#1619)
Browse files Browse the repository at this point in the history
Motivation:
Some users reported that ServiceTalk was incompatible with Jersey 2.34
release. Updating revealed that an API change in Jersey is responsible;
the `Configuration` object may no longer be null for
`InboundMessageContext`.
Modifications:
Dependency is updated. Providing a default `ResourceConfig` appears
to be sufficient for `InboundMessageContext`.
Result:
Jersey updated.
  • Loading branch information
bondolo authored Jun 15, 2021
1 parent 6384f04 commit 6201cb5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ javaxJaxbCoreVersion=2.3.0.1
javaxJaxbImplVersion=2.3.3

jaxRsVersion=2.1.6
jerseyVersion=2.32
jerseyVersion=2.34

reactiveStreamsVersion=1.0.3
jcToolsVersion=3.3.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.glassfish.jersey.internal.util.collection.Ref;
import org.glassfish.jersey.server.ApplicationHandler;
import org.glassfish.jersey.server.ContainerRequest;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.server.spi.Container;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -234,7 +235,8 @@ private void handle0(final HttpServiceContext serviceCtx, final StreamingHttpReq
requestURI,
req.method().name(),
UNAUTHENTICATED_SECURITY_CONTEXT,
new MapPropertiesDelegate(), null);
new MapPropertiesDelegate(),
new ResourceConfig());

req.headers().forEach(h ->
containerRequest.getHeaders().add(h.getKey().toString(), h.getValue().toString()));
Expand Down Expand Up @@ -283,7 +285,7 @@ private enum State {
private CloseSignalHandoffAbleContainerRequest(final URI baseUri, final URI requestUri, final String httpMethod,
final SecurityContext securityContext,
final PropertiesDelegate propertiesDelegate,
@Nullable final Configuration configuration) {
final Configuration configuration) {
super(baseUri, requestUri, httpMethod, securityContext, propertiesDelegate, configuration);
}

Expand Down

0 comments on commit 6201cb5

Please sign in to comment.