Bump to Java 21

docwho2 · Jul 29, 2024 · d4349f8 · d4349f8
1 parent ad8f9e8
commit d4349f8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 28 deletions.
diff --git a/ChimeSMAFlow/pom.xml b/ChimeSMAFlow/pom.xml
@@ -23,19 +23,6 @@
             <version>1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
         <!-- FLow Library needs logging and Lambda Definition -->
         <dependency>
             <groupId>com.amazonaws</groupId>

diff --git a/ChimeSMAFlow/src/main/java/cloud/cleo/chimesma/actions/AbstractFlow.java b/ChimeSMAFlow/src/main/java/cloud/cleo/chimesma/actions/AbstractFlow.java
@@ -219,11 +219,25 @@ private Action getCurrentAction(SMARequest event) throws CloneNotSupportedExcept
         return action;
     }
 
+    /**
+     * Java 21 doesn't want to deserialize like 17 did, so we use our own mapper to handle things.
+     * 
+     * @param in
+     * @param out
+     * @param cntxt
+     * @throws IOException 
+     */
     @Override
     public void handleRequest(InputStream in, OutputStream out, Context cntxt) throws IOException {
         mapper.writeValue(out, handleRequest(mapper.readValue(in, SMARequest.class), cntxt));
     }
 
+    /**
+     * Worked direct in Java 17, but need above for 21.
+     * @param event
+     * @param cntxt
+     * @return 
+     */
     public final SMAResponse handleRequest(SMARequest event, Context cntxt) {
         try {
             log.debug(event);

diff --git a/pom.xml b/pom.xml
@@ -48,22 +48,27 @@
                 <type>pom</type>
                 <scope>import</scope>
                 <exclusions>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>netty-nio-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
+                    <exclusion>
+                        <groupId>software.amazon.awssdk</groupId>
+                        <artifactId>netty-nio-client</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-annotations</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
+
 
-
+            <!-- Pin our versions of Jackson -->
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-lambda-java-core</artifactId>
@@ -80,7 +85,7 @@
                 <artifactId>jackson-annotations</artifactId>
                 <version>2.15.2</version>
             </dependency>
-             <dependency>
+            <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
                 <version>2.15.2</version>