DEFECT-34640 fix tests and other defects (#77)

* fix tests and other defects

* fix version

* add retry to test

* change and version

* fix another test

* add snyk

* fixing permission

* move snyk scan

* temp remove snyk

* add snyk back

* update image

* some versions were not migrated

* add more versions and parallelize it

* modify test to allow parellel execution

* fix webhook test for parallel

Author: ac-bgelfius

.circleci/config.yml

@@ -5,76 +5,100 @@ workflows:
     jobs:
       - unit-tests:
           name: java8
-          image: "circleci/openjdk"
-          version: "8"
+          image: "cimg/openjdk"
+          version: "8.0"
       - unit-tests:
           name: java9
           image: "circleci/openjdk"
           version: "9"
-          requires:
-            - java8
       - unit-tests:
           name: java10
           image: "circleci/openjdk"
           version: "10"
-          requires:
-            - java9
       - unit-tests:
           name: java11
-          image: "circleci/openjdk"
-          version: "11"
-          requires:
-            - java10
+          image: "cimg/openjdk"
+          version: "11.0"
       - unit-tests:
           name: java12
           image: "cimg/openjdk"
           version: "12.0.2"
-          requires:
-            - java11
       - unit-tests:
           name: java13
           image: "cimg/openjdk"
           version: "13.0.0"
-          requires:
-            - java12
       - unit-tests:
           name: java14
           image: "cimg/openjdk"
           version: "14.0.0"
-          requires:
-            - java13
       - unit-tests:
           name: java15
           image: "cimg/openjdk"
           version: "15.0.0"
-          requires:
-            - java14
       - unit-tests:
           name: java16
           image: "cimg/openjdk"
           version: "16.0.0"
-          requires:
-            - java15
       - unit-tests:
           name: java17
           image: "cimg/openjdk"
-          version: "17.0.0"
-          requires:
-            - java16
+          version: "17.0"
       - unit-tests:
           name: java18
           image: "cimg/openjdk"
           version: "18.0.1"
-          requires:
-            - java17
       - unit-tests:
           name: java19
           image: "cimg/openjdk"
           version: "19.0.0"
-          requires:
-            - java18
+      - unit-tests:
+          name: java21
+          image: "cimg/openjdk"
+          version: "21.0"
+      - unit-tests:
+          name: java22
+          image: "cimg/openjdk"
+          version: "22.0"
+      - unit-tests:
+          name: java23
+          image: "cimg/openjdk"
+          version: "23.0"
+      - unit-tests:
+          name: java24
+          image: "cimg/openjdk"
+          version: "24.0"
+      - unit-tests:
+          name: java25
+          image: "cimg/openjdk"
+          version: "25.0"
+      - security-scan:
+          context:
+            - snyk
 
 jobs:
+  security-scan:
+    docker:
+      - image: cimg/openjdk:11.0
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V
+      - run:
+          name: Install Snyk CLI
+          command: |
+            curl -Lo ./snyk "https://static.snyk.io/cli/latest/snyk-linux"
+            chmod +x ./snyk
+            sudo mv ./snyk /usr/local/bin/
+      - run:
+          name: Run Snyk Scan
+          command: |
+            snyk auth $SNYK_TOKEN
+            snyk monitor \
+              --all-projects \
+              --exclude=test \
+              --org=$SNYK_ORG_ID
+
   unit-tests:
     parameters:
       version:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.13.0
+
+* A new feature (metadata on InboundMessage)
+* Compatibility improvements
+* Security updates
+
 ## 1.12.2
 * small change to fix removed code
 

pom.xml

@@ -23,11 +23,11 @@
     </developers>
 
     <properties>
-        <postmark.version>1.12.2</postmark.version>
+        <postmark.version>1.13.0</postmark.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <jackson.minimum.version>2.9.7</jackson.minimum.version>
-        <jackson.version>2.14.1</jackson.version>
+        <jackson.version>2.15.0</jackson.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit.platform.version>1.3.2</junit.platform.version>
     </properties>
@@ -51,26 +51,26 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.3</version>
+            <version>5.5</version>
         </dependency>
 
         <!-- Serialization to JSON -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.15.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.15.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.15.0</version>
         </dependency>
 
         <!-- MIME auto detect on files -->
@@ -85,21 +85,21 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.jupiter.version}</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>1.8.0</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/com/postmarkapp/postmark/client/data/model/messages/InboundMessage.java

@@ -3,6 +3,7 @@
 import com.postmarkapp.postmark.client.data.parser.jackson.CustomDateDeserializer;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Date;
 
 /**
@@ -31,6 +32,7 @@ public class InboundMessage {
     private String status;
     private List<Attachment> attachments;
     private String messageStream;
+    private Map<String, String> metadata;
 
     // GETTERS AND SETTERS
 
@@ -185,4 +187,12 @@ public List<Attachment> getAttachments() {
     public void setAttachments(List<Attachment> attachments) {
         this.attachments = attachments;
     }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
+    }
 }

src/main/java/com/postmarkapp/postmark/client/data/parser/DataHandler.java

@@ -17,7 +17,8 @@ public class DataHandler {
     public DataHandler() {
         this.mapper = new ObjectMapper();
         this.mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        this.mapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
+        // Use PropertyNamingStrategies for Jackson 2.12+ compatibility (replaces deprecated PropertyNamingStrategy)
+        this.mapper.setPropertyNamingStrategy(PropertyNamingStrategies.UpperCamelCaseStrategy.INSTANCE);
         setLiberalMapper();
     }
 

src/test/java/base/BaseTest.java

@@ -3,6 +3,7 @@
 import com.postmarkapp.postmark.Postmark;
 import com.postmarkapp.postmark.client.AccountApiClient;
 import com.postmarkapp.postmark.client.ApiClient;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,6 +15,7 @@
 /**
  * Created by bash on 11/14/17.
  */
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class BaseTest {
 
     // Constants names for API tokens
@@ -75,9 +77,19 @@ private void initConfingFromFile() {
         properties = new Properties();
 
         try {
-            properties.load(in);
+            if (in != null) {
+                properties.load(in);
+            }
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // Ignore close errors
+                }
+            }
         }
     }
 }

src/test/java/integration/BounceTest.java

@@ -21,7 +21,12 @@
  */
 public class BounceTest extends BaseTest {
 
-    ApiClient client = getDefaultApiClientCustomUrl();
+    ApiClient client;
+
+    @org.junit.jupiter.api.BeforeEach
+    void setUp() {
+        client = getDefaultApiClientCustomUrl();
+    }
 
     @Test
     void deliveryStats() throws PostmarkException, IOException {

src/test/java/integration/DataRemovalTest.java

@@ -16,7 +16,13 @@
  * Created by bash on 11/09/22.
  */
 public class DataRemovalTest extends BaseTest {
-    AccountApiClient client = getDefaultAccountApiClient();
+    AccountApiClient client;
+
+    @org.junit.jupiter.api.BeforeEach
+    void setUp() {
+        client = getDefaultAccountApiClient();
+    }
+
     @Test
     void requestDataRemoval() throws PostmarkException, IOException {
         DataRemoval dataRemoval = new DataRemoval("[email protected]",

src/test/java/integration/DomainTest.java

@@ -18,7 +18,12 @@
  */
 public class DomainTest extends BaseTest {
 
-    AccountApiClient client = getDefaultAccountApiClient();
+    AccountApiClient client;
+
+    @org.junit.jupiter.api.BeforeEach
+    void setUp() {
+        client = getDefaultAccountApiClient();
+    }
 
     @Test
     void list() throws PostmarkException, IOException {

src/test/java/integration/MessageStreamsTest.java

@@ -15,7 +15,12 @@
 
 public class MessageStreamsTest extends BaseTest {
 
-    ApiClient client = getDefaultApiClient();
+    ApiClient client;
+
+    @org.junit.jupiter.api.BeforeEach
+    void setUp() {
+        client = getDefaultApiClient();
+    }
 
     private MessageStream findMessageStream(String streamId) throws PostmarkException, IOException {
         MessageStream foundStream = null;