removed log4j dependencies, old mime type detection library, fixed typo on account header constant

Author: ibalosh

pom.xml

@@ -23,7 +23,7 @@
     </developers>
 
     <properties>
-        <postmark.version>1.7</postmark.version>
+        <postmark.version>1.7.2</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>
@@ -90,21 +90,9 @@
 
         <!-- MIME auto detect on files -->
         <dependency>
-            <groupId>eu.medsea.mimeutil</groupId>
-            <artifactId>mime-util</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-
-        <!-- Logging dependencies -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.9.1</version>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-bundle</artifactId>
+            <version>1.25</version>
         </dependency>
 
         <!-- Testing dependencies -->

src/main/java/com/wildbit/java/postmark/Postmark.java

@@ -7,9 +7,8 @@
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.InputStream;
 import java.util.Properties;
+import java.util.logging.Logger;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 /**
  * Top level class allowing simple access to API clients for doing Postmark API calls.
  */
@@ -21,7 +20,7 @@ public class Postmark {
     public enum DEFAULTS {
         API_URL("api.postmarkapp.com"),
         SERVER_AUTH_HEADER("X-Postmark-Server-Token"),
-        ACOUNT_AUTH_HEADER("X-Postmark-Account-Token");
+        ACCOUNT_AUTH_HEADER("X-Postmark-Account-Token");
 
         public final String value;
 
@@ -52,7 +51,7 @@ public static String libraryVersion()  {
         try {
             prop.load(in);
         } catch (Exception e) {
-            log.warn(e.toString());
+            LOGGER.warning(e.toString());
         }
         return prop.getProperty("Version");
     }
@@ -75,25 +74,25 @@ public static ApiClient getApiClient(String apiToken, Boolean secureConnection,
     }
 
     public static AccountApiClient getAccountApiClient(String apiToken) {
-        return new AccountApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.ACOUNT_AUTH_HEADER, apiToken));
+        return new AccountApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.ACCOUNT_AUTH_HEADER, apiToken));
     }
 
     public static AccountApiClient getAccountApiClient(String apiToken, Boolean secureConnection) {
-        return new AccountApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.ACOUNT_AUTH_HEADER, apiToken), secureConnection);
+        return new AccountApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.ACCOUNT_AUTH_HEADER, apiToken), secureConnection);
     }
 
     /**
      * In rare cases, other than default API url might need to be used, mainly for testing purposes.
      */
     public static AccountApiClient getAccountApiClient(String apiToken, Boolean secureConnection, String customApiUrl) {
-        return new AccountApiClient(customApiUrl, getHeadersWithAuth(DEFAULTS.ACOUNT_AUTH_HEADER, apiToken), secureConnection);
+        return new AccountApiClient(customApiUrl, getHeadersWithAuth(DEFAULTS.ACCOUNT_AUTH_HEADER, apiToken), secureConnection);
     }
 
     // private methods
 
     private Postmark() {}
 
-    private static Logger log = LogManager.getLogger(Postmark.class);
+    private final static Logger LOGGER = Logger.getLogger(Postmark.class.getName());
 
     private static MultivaluedMap<String,Object> getHeadersWithAuth(DEFAULTS authType, String apiToken) {
         MultivaluedMap headers = DefaultHeaders.headers();

src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java

@@ -2,11 +2,6 @@
 
 import com.wildbit.java.postmark.client.data.DataHandler;
 import com.wildbit.java.postmark.client.exception.*;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.LoggerConfig;
 
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
@@ -76,27 +71,12 @@ protected String execute(HttpClient.REQUEST_TYPES request_type, String url, Obje
 
     /**
      * Main source of issues can be the Object serialization process. To debug it, this method will set strict mapping, which
-     * will fail on any issues. Also by choosing debug mode, logging will be set to DEBUG level
+     * will fail on any issues.
      */
     public void setDebugMode() {
-        setLoggingLevel(Level.DEBUG);
         this.dataHandler.setStrictMapper();
     }
 
-    /**
-     * Custom level of logging can be set.
-     *
-     * @param level - debugging level - OFF, DEBUG, ERROR etc.
-     */
-    public void setLoggingLevel(Level level) {
-        LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        Configuration config = ctx.getConfiguration();
-
-        LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
-        loggerConfig.setLevel(level);
-        ctx.updateLoggers();
-    }
-
     public void setSecureConnection(boolean secureConnection) {
         this.secureConnection = secureConnection;
     }

src/main/java/com/wildbit/java/postmark/client/data/model/message/BaseMessage.java

@@ -5,8 +5,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
-
-import eu.medsea.mimeutil.MimeUtil;
+import org.apache.tika.Tika;
 
 /**
  * Base email message object
@@ -333,10 +332,8 @@ private byte[] readFileContent(String path) throws IOException {
         return Files.readAllBytes(Paths.get(path));
     }
 
-    private String readFileContentType(String path) {
-        File file = new File(path);
-        MimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector");
-        return MimeUtil.getMimeTypes(file).toString();
+    private String readFileContentType(String path) throws IOException {
+        return new Tika().detect(new File(path));
     }
 
     /**

src/main/java/com/wildbit/java/postmark/client/data/model/templates/BaseTemplatedMessage.java

@@ -1,7 +1,7 @@
 package com.wildbit.java.postmark.client.data.model.templates;
 
 import com.wildbit.java.postmark.client.data.model.message.Header;
-import eu.medsea.mimeutil.MimeUtil;
+import org.apache.tika.Tika;
 
 import java.io.File;
 import java.io.IOException;
@@ -316,10 +316,8 @@ private byte[] readFileContent(String path) throws IOException {
         return Files.readAllBytes(Paths.get(path));
     }
 
-    private String readFileContentType(String path) {
-        File file = new File(path);
-        MimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector");
-        return MimeUtil.getMimeTypes(file).toString();
+    private String readFileContentType(String path) throws IOException {
+        return new Tika().detect(new File(path));
     }
 
     /**