Removed jackson as a global dependency so that we can have different versions in each implementation

sapessi · sapessi · commit 0ea244445faf · 2018-01-12T10:52:51.000-08:00
diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml
@@ -14,6 +14,12 @@
         <version>0.9-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <jackson.version>2.9.3</jackson.version>
+        <jaxrs.version>2.0.1</jaxrs.version>
+        <servlet.version>3.1.0</servlet.version>
+    </properties>
+
     <dependencies>
         <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-lambda-java-core -->
         <dependency>
@@ -26,14 +32,14 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>${servlet.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0.1</version>
+            <version>${jaxrs.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
diff --git a/aws-serverless-java-container-jersey/pom.xml b/aws-serverless-java-container-jersey/pom.xml
@@ -24,6 +24,12 @@
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-core</artifactId>
             <version>0.9-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-server -->
@@ -41,13 +47,19 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.8.4</version>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-json-jackson -->
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey.version}</version>
             <scope>test</scope>
-            <!-- excluding to resolve a dependency convergence with jackson-annotations -->
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/EchoJerseyResource.java b/aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/EchoJerseyResource.java
@@ -56,7 +56,6 @@ public MapResponseModel echoServletHeaders(@Context HttpServletRequest context)
             String headerName = headerNames.nextElement();
             headers.addValue(headerName, context.getHeader(headerName));
         }
-
         return headers;
     }
 
diff --git a/aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyAwsProxyTest.java b/aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyAwsProxyTest.java
@@ -13,11 +13,11 @@
 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.model.AwsProxyRequest;
 import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext;
-import com.amazonaws.serverless.proxy.jersey.factory.AwsProxyServletContextFactory;
-import com.amazonaws.serverless.proxy.jersey.factory.AwsProxyServletRequestFactory;
 import com.amazonaws.serverless.proxy.jersey.model.MapResponseModel;
 import com.amazonaws.serverless.proxy.jersey.model.SingleValueModel;
 import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
@@ -28,6 +28,7 @@
 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;
@@ -55,17 +56,19 @@ 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")
-                                                            .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);
-                                                                }
-                                                            });
+            .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);
+                }
+            })
+            .property(LoggingFeature.LOGGING_FEATURE_VERBOSITY_SERVER, LoggingFeature.Verbosity.PAYLOAD_ANY);
     private static JerseyLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler = JerseyLambdaContainerHandler.getAwsProxyHandler(app);
 
     private static Context lambdaContext = new MockLambdaContext();
diff --git a/aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/providers/CustomExceptionMapper.java b/aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/providers/CustomExceptionMapper.java
@@ -3,6 +3,7 @@
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -11,6 +12,10 @@
 @Provider
 public class CustomExceptionMapper implements ExceptionMapper<UnsupportedOperationException> {
 
+    public CustomExceptionMapper() {
+        System.out.println("Starting custom exception mapper");
+    }
+
     @Inject
     public javax.inject.Provider<HttpServletRequest> request;
 
diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml
@@ -15,7 +15,8 @@
     </parent>
 
     <properties>
-        <spring.version>4.3.4.RELEASE</spring.version>
+        <spring.version>4.3.13.RELEASE</spring.version>
+        <jackson.version>2.9.3</jackson.version>
     </properties>
 
     <dependencies>
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java
@@ -193,6 +193,7 @@ public void base64_binaryResponse_base64Encoding() {
     @Test
     public void injectBody_populatedResponse_noException() {
         AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/request-body", "POST")
+                                          .header(HttpHeaders.CONTENT_TYPE, "text/plain")
                                           .body("This is a populated body")
                                           .build();
 
diff --git a/pom.xml b/pom.xml
@@ -35,10 +35,6 @@
         </license>
     </licenses>
 
-    <properties>
-        <jackson.version>2.8.4</jackson.version>
-    </properties>
-
     <dependencies>
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
diff --git a/samples/spring/pet-store/pom.xml b/samples/spring/pet-store/pom.xml
@@ -26,7 +26,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring.version>4.3.4.RELEASE</spring.version>
+        <spring.version>5.0.2.RELEASE</spring.version>
         <jackson.version>2.8.4</jackson.version>
     </properties>
 
@@ -50,6 +50,12 @@
             <version>${spring.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
diff --git a/samples/spring/pet-store/sam.yaml b/samples/spring/pet-store/sam.yaml
@@ -10,7 +10,7 @@ Resources:
       CodeUri: target/serverless-spring-example-1.0-SNAPSHOT.jar
       MemorySize: 512
       Policies: AWSLambdaBasicExecutionRole
-      Timeout: 20
+      Timeout: 30
       Events:
         GetResource:
           Type: Api
diff --git a/samples/spring/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/PetStoreSpringAppConfig.java b/samples/spring/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/PetStoreSpringAppConfig.java
@@ -12,10 +12,54 @@
  */
 package com.amazonaws.serverless.sample.spring;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.HandlerAdapter;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 
 @Configuration
 @ComponentScan("com.amazonaws.serverless.sample.spring")
 public class PetStoreSpringAppConfig {
+    /*
+     * Create required HandlerMapping, to avoid several default HandlerMapping instances being created
+     */
+    @Bean
+    public HandlerMapping handlerMapping() {
+        return new RequestMappingHandlerMapping();
+    }
+
+    /*
+     * Create required HandlerAdapter, to avoid several default HandlerAdapter instances being created
+     */
+    @Bean
+    public HandlerAdapter handlerAdapter() {
+        return new RequestMappingHandlerAdapter();
+    }
+
+    /*
+     * optimization - avoids creating default exception resolvers; not required as the serverless container handles
+     * all exceptions
+     *
+     * By default, an ExceptionHandlerExceptionResolver is created which creates many dependent object, including
+     * an expensive ObjectMapper instance.
+     */
+    @Bean
+    public HandlerExceptionResolver handlerExceptionResolver() {
+        return new HandlerExceptionResolver() {
+
+            @Override
+            public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+                return null;
+            }
+        };
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public MapResponseModel echoServletHeaders(@Context HttpServletRequest context)`
`56`	`56`	`String headerName = headerNames.nextElement();`
`57`	`57`	`headers.addValue(headerName, context.getHeader(headerName));`
`58`	`58`	`}`
`59`		`-`
`60`	`59`	`return headers;`
`61`	`60`	`}`
`62`	`61`