Upgrade to Jersey 2.26 and Jax RS 2.1. This addresses #108 and partly #95. Also switched from HK2's Factory objects to generic Suppliers for servlet injection.

Author: sapessi

aws-serverless-java-container-core/pom.xml

@@ -16,7 +16,7 @@
 
     <properties>
         <jackson.version>2.9.3</jackson.version>
-        <jaxrs.version>2.0.1</jaxrs.version>
+        <jaxrs.version>2.1</jaxrs.version>
         <servlet.version>3.1.0</servlet.version>
     </properties>
 

aws-serverless-java-container-jersey/pom.xml

@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <jersey.version>2.25.1</jersey.version>
+        <jersey.version>2.26</jersey.version>
     </properties>
 
     <dependencies>
@@ -39,6 +39,14 @@
             <version>${jersey.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
+            <optional>true</optional>
+            <scope>test</scope>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
         <dependency>
             <groupId>commons-codec</groupId>

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/JerseyHandlerFilter.java

@@ -3,6 +3,7 @@
 
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequest;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
+import com.amazonaws.serverless.proxy.jersey.suppliers.AwsProxyServletRequestSupplier;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.glassfish.jersey.internal.MapPropertiesDelegate;
@@ -110,7 +111,7 @@ public void destroy() {
      * built from the request's <code>getPathInfo()</code> method. The container request also contains the
      * API Gateway context, stage variables, and Lambda context properties. The original servlet request is
      * also embedded in a property of the container request to allow injection by the
-     * {@link com.amazonaws.serverless.proxy.jersey.factory.AwsProxyServletRequestFactory}.
+     * {@link AwsProxyServletRequestSupplier}.
      * @param request The incoming servlet request
      * @return A populated ContainerRequest object.
      * @throws RuntimeException if we could not read the servlet request input stream.

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/JerseyLambdaContainerHandler.java

@@ -25,13 +25,23 @@
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequestReader;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletResponseWriter;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
+import com.amazonaws.serverless.proxy.jersey.suppliers.AwsProxyServletContextSupplier;
+import com.amazonaws.serverless.proxy.jersey.suppliers.AwsProxyServletRequestSupplier;
+import com.amazonaws.serverless.proxy.jersey.suppliers.AwsProxyServletResponseSupplier;
 import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
 import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 
 import com.amazonaws.services.lambda.runtime.Context;
 
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.process.internal.RequestScoped;
+import org.glassfish.jersey.server.ResourceConfig;
+
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterRegistration;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.Application;
 
 import java.util.EnumSet;
@@ -124,6 +134,18 @@ public JerseyLambdaContainerHandler(Class<RequestType> requestTypeClass,
         super(requestTypeClass, responseTypeClass, requestReader, responseWriter, securityContextWriter, exceptionHandler);
         Timer.start("JERSEY_CONTAINER_CONSTRUCTOR");
         this.initialized = false;
+
+        if (jaxRsApplication instanceof ResourceConfig) {
+            ((ResourceConfig)jaxRsApplication).register(new AbstractBinder() {
+                @Override
+                protected void configure() {
+                    bindFactory(AwsProxyServletContextSupplier.class).to(ServletContext.class).in(RequestScoped.class);
+                    bindFactory(AwsProxyServletRequestSupplier.class).to(HttpServletRequest.class).in(RequestScoped.class);
+                    bindFactory(AwsProxyServletResponseSupplier.class).to(HttpServletResponse.class).in(RequestScoped.class);
+                }
+            });
+        }
+
         this.jerseyFilter = new JerseyHandlerFilter(jaxRsApplication);
         Timer.stop("JERSEY_CONTAINER_CONSTRUCTOR");
     }

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/factory/AwsProxyServletContextFactory.java renamed to aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/suppliers/AwsProxyServletContextSupplier.java

@@ -10,17 +10,18 @@
  * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package com.amazonaws.serverless.proxy.jersey.factory;
+package com.amazonaws.serverless.proxy.jersey.suppliers;
 
 
-import org.glassfish.hk2.api.Factory;
 import org.glassfish.jersey.server.ContainerRequest;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.core.Context;
 
+import java.util.function.Supplier;
+
 import static com.amazonaws.serverless.proxy.jersey.JerseyHandlerFilter.JERSEY_SERVLET_REQUEST_PROPERTY;
 
 
@@ -34,19 +35,23 @@
  *         .register(new AbstractBinder() {
  *             {@literal @}Override
  *             protected void configure() {
- *                 bindFactory(AwsProxyServletContextFactory.class)
+ *                 bindFactory(AwsProxyServletContextSupplier.class)
  *                     .to(ServletContext.class)
  *                     .in(RequestScoped.class);
  *            }
  *       });
  * </code>
  * </pre>
  */
-public class AwsProxyServletContextFactory implements Factory<ServletContext> {
+public class AwsProxyServletContextSupplier implements Supplier<ServletContext> {
     @Context ContainerRequest currentRequest;
 
     @Override
-    public ServletContext provide() {
+    public ServletContext get() {
+        return getServletContext();
+    }
+
+    private ServletContext getServletContext() {
         HttpServletRequest req = (HttpServletRequest)currentRequest.getProperty(JERSEY_SERVLET_REQUEST_PROPERTY);
 
         if (req == null) {
@@ -56,10 +61,4 @@ public ServletContext provide() {
         ServletContext ctx = req.getServletContext();
         return ctx;
     }
-
-
-    @Override
-    public void dispose(ServletContext servletContext) {
-
-    }
 }

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/factory/AwsProxyServletRequestFactory.java renamed to aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/suppliers/AwsProxyServletRequestSupplier.java

@@ -10,17 +10,16 @@
  * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package com.amazonaws.serverless.proxy.jersey.factory;
+package com.amazonaws.serverless.proxy.jersey.suppliers;
 
 
-import org.glassfish.hk2.api.Factory;
 import org.glassfish.jersey.server.ContainerRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Context;
 
+import java.util.function.Supplier;
+
 import static com.amazonaws.serverless.proxy.jersey.JerseyHandlerFilter.JERSEY_SERVLET_REQUEST_PROPERTY;
 
 
@@ -34,31 +33,28 @@
  *         .register(new AbstractBinder() {
  *             {@literal @}Override
  *             protected void configure() {
- *                 bindFactory(AwsProxyServletRequestFactory.class)
+ *                 bindFactory(AwsProxyServletRequestSupplier.class)
  *                     .to(HttpServletRequest.class)
  *                     .in(RequestScoped.class);
  *            }
  *       });
  * </code>
  * </pre>
  */
-public class AwsProxyServletRequestFactory
-        implements Factory<HttpServletRequest> {
+public class AwsProxyServletRequestSupplier implements Supplier<HttpServletRequest> {
 
     @Context ContainerRequest currentRequest;
-    private static Logger log = LoggerFactory.getLogger(AwsProxyServletRequestFactory.class);
 
     //-------------------------------------------------------------
     // Implementation - Factory
     //-------------------------------------------------------------
 
     @Override
-    public HttpServletRequest provide() {
-        return (HttpServletRequest)currentRequest.getProperty(JERSEY_SERVLET_REQUEST_PROPERTY);
+    public HttpServletRequest get() {
+        return getServletRequest();
     }
 
-
-    @Override
-    public void dispose(HttpServletRequest httpServletRequest) {
+    private HttpServletRequest getServletRequest() {
+        return (HttpServletRequest)currentRequest.getProperty(JERSEY_SERVLET_REQUEST_PROPERTY);
     }
 }

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/factory/AwsProxyServletResponseFactory.java renamed to aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/suppliers/AwsProxyServletResponseSupplier.java

@@ -10,19 +10,16 @@
  * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package com.amazonaws.serverless.proxy.jersey.factory;
+package com.amazonaws.serverless.proxy.jersey.suppliers;
 
 
-import org.glassfish.hk2.api.Factory;
 import org.glassfish.jersey.server.ContainerRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.Context;
 
-import static com.amazonaws.serverless.proxy.jersey.JerseyHandlerFilter.JERSEY_SERVLET_REQUEST_PROPERTY;
+import java.util.function.Supplier;
+
 import static com.amazonaws.serverless.proxy.jersey.JerseyHandlerFilter.JERSEY_SERVLET_RESPONSE_PROPERTY;
 
 
@@ -36,31 +33,28 @@
  *         .register(new AbstractBinder() {
  *             {@literal @}Override
  *             protected void configure() {
- *                 bindFactory(AwsProxyServletResponseFactory.class)
+ *                 bindFactory(AwsProxyServletResponseSupplier.class)
  *                     .to(HttpServletResponse.class)
  *                     .in(RequestScoped.class);
  *            }
  *       });
  * </code>
  * </pre>
  */
-public class AwsProxyServletResponseFactory
-        implements Factory<HttpServletResponse> {
+public class AwsProxyServletResponseSupplier implements Supplier<HttpServletResponse> {
 
     @Context ContainerRequest currentRequest;
-    private static Logger log = LoggerFactory.getLogger(AwsProxyServletResponseFactory.class);
 
     //-------------------------------------------------------------
     // Implementation - Factory
     //-------------------------------------------------------------
 
     @Override
-    public HttpServletResponse provide() {
-        return (HttpServletResponse)currentRequest.getProperty(JERSEY_SERVLET_RESPONSE_PROPERTY);
+    public HttpServletResponse get() {
+        return getServletResponse();
     }
 
-
-    @Override
-    public void dispose(HttpServletResponse httpServletRequest) {
+    private HttpServletResponse getServletResponse() {
+        return (HttpServletResponse)currentRequest.getProperty(JERSEY_SERVLET_RESPONSE_PROPERTY);
     }
 }

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/EchoJerseyResource.java

@@ -27,6 +27,9 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Providers;
+
 import java.util.Enumeration;
 import java.util.Random;
 

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyAwsProxyTest.java

@@ -13,9 +13,6 @@
 package com.amazonaws.serverless.proxy.jersey;
 
 
-import com.amazonaws.serverless.proxy.jersey.factory.AwsProxyServletContextFactory;
-import com.amazonaws.serverless.proxy.jersey.factory.AwsProxyServletRequestFactory;
-import com.amazonaws.serverless.proxy.jersey.factory.AwsProxyServletResponseFactory;
 import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
 import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext;
@@ -28,15 +25,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.codec.binary.Base64;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.jersey.logging.LoggingFeature;
-import org.glassfish.jersey.process.internal.RequestScoped;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Test;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.Response;
 
 import java.io.IOException;
@@ -58,22 +50,8 @@ public class JerseyAwsProxyTest {
 
 
     private static ObjectMapper objectMapper = new ObjectMapper();
-    private static ResourceConfig app = new ResourceConfig().packages("com.amazonaws.serverless.proxy.jersey", "com.amazonaws.serverless.proxy.jersey.providers")
+    private static ResourceConfig app = new ResourceConfig().packages("com.amazonaws.serverless.proxy.jersey")
             .register(LoggingFeature.class)
-            .register(new AbstractBinder() {
-                @Override
-                protected void configure() {
-                    bindFactory(AwsProxyServletRequestFactory.class)
-                            .to(HttpServletRequest.class)
-                            .in(RequestScoped.class);
-                    bindFactory(AwsProxyServletContextFactory.class)
-                            .to(ServletContext.class)
-                            .in(RequestScoped.class);
-                    bindFactory(AwsProxyServletResponseFactory.class)
-                            .to(HttpServletResponse.class)
-                            .in(RequestScoped.class);
-                }
-            })
             .property(LoggingFeature.LOGGING_FEATURE_VERBOSITY_SERVER, LoggingFeature.Verbosity.PAYLOAD_ANY);
     private static JerseyLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler = JerseyLambdaContainerHandler.getAwsProxyHandler(app);