Added unit tests and updated existing

Author: mdmytrash

lombok.config

@@ -0,0 +1,15 @@
+# this is root dir and don't search for parent
+config.stopBubbling = true
+# add @Generated and Jacoco will detect Lombok generated code and ignore them in reports
+lombok.addLombokGeneratedAnnotation = true
+
+# Copy the Qualifier annotation from the instance variables to the constructor
+# see https://github.com/rzwitserloot/lombok/issues/745
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Value
+
+lombok.equalsAndHashCode.callSuper=call
+lombok.toString.callSuper=call
+
+# Use JDK's NonNull annotation instead of Lombok's
+lombok.nonNull.exceptionType = JDK

pom.xml

@@ -83,8 +83,8 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver -->
@@ -201,6 +201,68 @@
                     <target>11</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.13</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.yml</exclude>
+                        <exclude>**/*.tf</exclude>
+                        <exclude>**/*.sh</exclude>
+                        <exclude>**/*.yaml</exclude>
+                        <exclude>**/*.xml</exclude>
+                        <exclude>**/*.properties</exclude>
+                        <exclude>**/*.avsc</exclude>
+                        <exclude>**/com/mailjet/client/errors/**</exclude>
+                        <exclude>**/com/mailjet/client/enums/**</exclude>
+                        <exclude>**/com/mailjet/client/resource/**</exclude>
+                        <exclude>**/com/mailjet/client/transactional/response/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-prepare</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/jacoco-ut.exec</destFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-prepare</id>
+                        <goals>
+                            <goal>prepare-agent-integration</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/jacoco-it.exec</destFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>report-unit</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/jacoco-ut</outputDirectory>
+                            <dataFile>${project.build.directory}/jacoco-ut.exec</dataFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>report-integration</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/jacoco-it</outputDirectory>
+                            <dataFile>${project.build.directory}/jacoco-it.exec</dataFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>

src/main/java/com/mailjet/client/MailjetRequest.java

@@ -16,7 +16,10 @@
 
 package com.mailjet.client;
 
-import static com.mailjet.client.MailjetRequestUtil.decodeDecimals;
+import com.mailjet.client.enums.ApiAuthenticationType;
+import com.mailjet.client.enums.ApiVersion;
+
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,11 +30,10 @@
 import java.nio.file.Paths;
 import java.util.HashMap;
 
-import com.mailjet.client.enums.ApiAuthenticationType;
-import com.mailjet.client.enums.ApiVersion;
 import lombok.Getter;
 import okhttp3.HttpUrl;
-import org.json.JSONObject;
+
+import static com.mailjet.client.MailjetRequestUtil.decodeDecimals;
 
 /**
  *

src/main/java/com/mailjet/client/MailjetResponse.java

@@ -9,6 +9,8 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import lombok.Getter;
+
 /**
  *
  * @author Guillaume Badi
@@ -17,19 +19,19 @@ public class MailjetResponse {
 
     private final JSONObject responseObject;
     private final String rawResponse;
+    /**
+     * -- GETTER --
+     *
+     * @return HTTP status code returned by Mailjet server
+     */
+    @Getter
     private final int status;
 
     public MailjetResponse(int status, String rawResponse) {
         responseObject = new JSONObject(rawResponse);
         this.rawResponse = rawResponse;
         this.status = status;
     }
-    /**
-     * @return HTTP status code returned by Mailjet server
-     */
-    public int getStatus() {
-        return status;
-    }
 
     /**
      * @return Raw response string sent by Mailjet server

src/main/java/com/mailjet/client/Main.java

@@ -6,10 +6,19 @@
 import com.mailjet.client.resource.Email;
 import com.mailjet.client.resource.sms.SmsSend;
 
+import lombok.Getter;
+
 /**
  * Mailjet easy client
  */
+@Getter
 public class MJEasyClient {
+    /**
+     * -- GETTER --
+     *  Get the internal Mailjet client
+     *
+     * @return MailjetClient instance
+     */
     private final MailjetClient client;
 
     /**
@@ -54,11 +63,11 @@ public MJEasyClient() {
     }
 
     /**
-     * Get the internal Mailjet client
-     * @return MailjetClient instance
+     * Constructor using a pre-configured MailjetClient instance.
+     * @param client Pre-configured MailjetClient instance
      */
-    public MailjetClient getClient() {
-        return client;
+    protected MJEasyClient(MailjetClient client) {
+        this.client = client;
     }
 
     /**

src/main/java/com/mailjet/client/easy/MJEasyClient.java

@@ -3,6 +3,8 @@
 import junit.framework.TestCase;
 import org.junit.Assert;
 
+import java.nio.charset.StandardCharsets;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class Base64Test extends TestCase {
@@ -14,7 +16,7 @@ public void test_should_base64_decode_provided_string() {
         byte[] result = Base64.decode(mock);
 
         // THEN
-        Assert.assertEquals("test:testéa$$à)=/*", new String(result));
+        Assert.assertEquals("test:testéa$$à)=/*", new String(result, StandardCharsets.UTF_8));
     }
 
     public void test_should_base64_encode_provided_bytes_array() {