Switch to SLF4J

apps/sparkpost-documentor-app/pom.xml

@@ -15,10 +15,9 @@
 			<groupId>com.sparkpost</groupId>
 			<artifactId>sparkpost-lib</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>

apps/sparkpost-javamail-app/pom.xml

@@ -18,6 +18,10 @@
 			<groupId>com.sparkpost</groupId>
 			<artifactId>sparkpost-lib</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>javax.mail-api</artifactId>

apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java

@@ -20,9 +20,6 @@
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostException;
 import com.sparkpost.model.AddressAttributes;
@@ -41,8 +38,6 @@
 public class App extends SparkPostBaseApp {
 
 	public static void main(String[] args) throws Exception {
-		Logger.getRootLogger().setLevel(Level.DEBUG);
-
 		App app = new App();
 		app.runApp();
 	}

apps/sparkpost-samples-app/pom.xml

@@ -16,10 +16,13 @@
 			<groupId>com.sparkpost</groupId>
 			<artifactId>sparkpost-lib</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>

apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java

@@ -3,8 +3,8 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostAccessForbiddenException;
@@ -19,13 +19,11 @@
  */
 public class BadApiKeyErrorSample extends SparkPostBaseApp {
 
-    static final Logger logger = Logger.getLogger(BadApiKeyErrorSample.class);
+    static final Logger logger = LoggerFactory.getLogger(BadApiKeyErrorSample.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         BadApiKeyErrorSample sample = new BadApiKeyErrorSample();
         sample.runApp();
     }

apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java

@@ -3,8 +3,8 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostErrorServerResponseException;
@@ -17,13 +17,11 @@
 
 public class ForceTransportError extends SparkPostBaseApp {
 
-    static final Logger logger = Logger.getLogger(ForceTransportError.class);
+    static final Logger logger = LoggerFactory.getLogger(ForceTransportError.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         ForceTransportError app = new ForceTransportError();
         app.runApp();
     }

apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java

@@ -7,8 +7,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostErrorServerResponseException;
@@ -25,13 +25,11 @@
 
 public class SendEmailErrorSample extends SparkPostBaseApp {
 
-    static final Logger logger = Logger.getLogger(SendEmailErrorSample.class);
+    static final Logger logger = LoggerFactory.getLogger(SendEmailErrorSample.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         SendEmailErrorSample sample = new SendEmailErrorSample();
         sample.runApp();
     }

apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java

@@ -7,8 +7,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostErrorServerResponseException;
@@ -25,13 +25,11 @@
 
 public class SendInvalidFromAddress extends SparkPostBaseApp {
 
-    static final Logger logger = Logger.getLogger(SendInvalidFromAddress.class);
+    static final Logger logger = LoggerFactory.getLogger(SendInvalidFromAddress.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         SendInvalidFromAddress sample = new SendInvalidFromAddress();
         sample.runApp();
     }

apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java

@@ -5,8 +5,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostException;
@@ -33,13 +33,11 @@
  */
 public class CreateRecipientListSample extends SparkPostBaseApp {
 
-    static final Logger logger = Logger.getLogger(CreateTemplateSimple.class);
+    static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         CreateRecipientListSample app = new CreateRecipientListSample();
         app.runApp();
     }

apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java

@@ -3,8 +3,8 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostException;
@@ -22,13 +22,11 @@
  */
 public class CreateTemplateFromFile extends SparkPostBaseApp {
 
-    private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class);
+    private static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         CreateTemplateFromFile sample = new CreateTemplateFromFile();
         sample.runApp();
 

apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java

@@ -3,8 +3,8 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostException;
@@ -22,13 +22,11 @@
  */
 public class CreateTemplateFromFile2 extends SparkPostBaseApp {
 
-    private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class);
+    private static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         CreateTemplateFromFile2 sample = new CreateTemplateFromFile2();
         sample.runApp();
 

apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java

@@ -1,10 +1,11 @@
+
 package com.sparkpost.samples;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostException;
@@ -19,54 +20,50 @@
 
 public class CreateTemplateSimple extends SparkPostBaseApp {
 
-	private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class);
-
-	private Client client;
-
-	public static void main(String[] args) throws SparkPostException, IOException {
-		Logger.getRootLogger().setLevel(Level.DEBUG);
-
-		CreateTemplateSimple sample = new CreateTemplateSimple();
-		sample.runApp();
-
-	}
-
-	private void runApp() throws SparkPostException, IOException {
-		client = this.newConfiguredClient();
-		createTemplate();
-	}
-
-	/**
-	 * Demonstrates how to store an email template in SparkPost
-	 * 
-	 * @throws SparkPostException
-	 */
-	public void createTemplate() throws SparkPostException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("createTemplate()");
-		}
-		TemplateAttributes tpl = new TemplateAttributes();
-
-		tpl.setName(SAMPLE_TEMPLATE_NAME);
-		tpl.setContent(new TemplateContentAttributes());
-		tpl.getContent().setFrom(new AddressAttributes(client.getFromEmail(), "me", null));
-		tpl.getContent().setHtml("Hello!");
-		tpl.getContent().setSubject("Template Test");
-		IRestConnection connection = new RestConnection(client, getEndPoint());
-		Response response = ResourceTemplates.create(connection, tpl);
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Create Template Response: " + response);
-		}
-	}
-
-	public void sendEmail(String templateName, List<String> recipients) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("sendEmail(...)");
-		}
-
-	}
-
-
-
+    private static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class);
+
+    private Client client;
+
+    public static void main(String[] args) throws SparkPostException, IOException {
+        CreateTemplateSimple sample = new CreateTemplateSimple();
+        sample.runApp();
+
+    }
+
+    private void runApp() throws SparkPostException, IOException {
+        this.client = this.newConfiguredClient();
+        createTemplate();
+    }
+
+    /**
+     * Demonstrates how to store an email template in SparkPost
+     * 
+     * @throws SparkPostException
+     */
+    public void createTemplate() throws SparkPostException {
+        if (logger.isDebugEnabled()) {
+            logger.debug("createTemplate()");
+        }
+        TemplateAttributes tpl = new TemplateAttributes();
+
+        tpl.setName(SAMPLE_TEMPLATE_NAME);
+        tpl.setContent(new TemplateContentAttributes());
+        tpl.getContent().setFrom(new AddressAttributes(this.client.getFromEmail(), "me", null));
+        tpl.getContent().setHtml("Hello!");
+        tpl.getContent().setSubject("Template Test");
+        IRestConnection connection = new RestConnection(this.client, getEndPoint());
+        Response response = ResourceTemplates.create(connection, tpl);
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Create Template Response: " + response);
+        }
+    }
+
+    public void sendEmail(String templateName, List<String> recipients) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("sendEmail(...)");
+        }
+
+    }
+
 }

apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java

@@ -4,8 +4,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.sparkpost.Client;
 import com.sparkpost.exception.SparkPostException;
@@ -22,13 +22,11 @@
  */
 public class DeleteSampleTemplates extends SparkPostBaseApp {
 
-    static final Logger logger = Logger.getLogger(DeleteSampleTemplates.class);
+    static final Logger logger = LoggerFactory.getLogger(DeleteSampleTemplates.class);
 
     private Client client;
 
     public static void main(String[] args) throws SparkPostException, IOException {
-        Logger.getRootLogger().setLevel(Level.DEBUG);
-
         DeleteSampleTemplates sample = new DeleteSampleTemplates();
         sample.runApp();
     }