From 81b8d755ecb25b166a6a7ead1eff2e379fa98b45 Mon Sep 17 00:00:00 2001 From: Marc Baumbach Date: Fri, 20 Apr 2018 12:27:01 -0400 Subject: [PATCH] Switch to SLF4J This will utilize the SLF4J API dependency everywhere. This will include the SLF4J log4j dependency for the sample applications so they continue to log using the provided log4j.properties or log4j.xml files. --- apps/sparkpost-documentor-app/pom.xml | 5 +- apps/sparkpost-javamail-app/pom.xml | 4 + .../main/java/com/sparkpost/sample/App.java | 5 - apps/sparkpost-samples-app/pom.xml | 9 +- .../error/samples/BadApiKeyErrorSample.java | 8 +- .../error/samples/ForceTransportError.java | 8 +- .../error/samples/SendEmailErrorSample.java | 8 +- .../error/samples/SendInvalidFromAddress.java | 8 +- .../samples/CreateRecipientListSample.java | 8 +- .../samples/CreateTemplateFromFile.java | 8 +- .../samples/CreateTemplateFromFile2.java | 8 +- .../samples/CreateTemplateSimple.java | 101 +++++++++--------- .../samples/DeleteSampleTemplates.java | 8 +- .../samples/DeleteWebhookSample.java | 8 +- .../samples/DeliverabilityMetricsSample.java | 8 +- .../samples/ListAllSendingDomains.java | 8 +- .../samples/ListAllTemplatesSample.java | 8 +- .../samples/ListAllTransmissionsSample.java | 7 +- .../samples/ListAllWebhooksSample.java | 8 +- .../samples/MandrillBlacklistImport.java | 8 +- .../samples/MessageEventSearchSample.java | 8 +- .../samples/PreviewTemplateSample.java | 8 +- .../samples/RetrieveAllTemplatesSample.java | 8 +- .../sparkpost/samples/SampleApplication.java | 5 - .../sparkpost/samples/SendEmailBCCSample.java | 8 +- .../sparkpost/samples/SendEmailCCSample.java | 8 +- .../samples/SendEmailRecipientListSample.java | 8 +- .../sparkpost/samples/SendEmailSample.java | 8 +- .../samples/SendEmailWithFilesSample.java | 8 +- .../SendEmailWithSubstitutionSample.java | 8 +- .../sdk/samples/helpers/SparkPostBaseApp.java | 9 +- libs/sparkpost-lib/log4j.xml | 17 +++ libs/sparkpost-lib/pom.xml | 10 +- .../sparkpost/transport/RestConnection.java | 5 +- .../test/java/com/sparkpost/EndPointTest.java | 16 +-- .../model/AddressAttributesTests.java | 8 -- .../com/sparkpost/model/DKIMResultsTest.java | 8 -- .../java/com/sparkpost/model/DKIMTest.java | 8 -- .../sparkpost/model/DNSAttributesTest.java | 8 -- .../model/MessageEventsQueryBuilderTest.java | 8 -- .../model/OptionsAttributesTest.java | 8 -- .../model/RecipientAttributesTest.java | 8 -- .../sparkpost/model/RecipientListTest.java | 8 -- .../sparkpost/model/SendingDomainTest.java | 8 -- .../sparkpost/model/StatusAttributesTest.java | 8 -- .../model/StoredRecipientListTest.java | 8 -- .../sparkpost/model/StoredTemplateTest.java | 8 -- .../model/SuppressionListEntryTest.java | 8 -- .../sparkpost/model/SuppressionListTest.java | 8 -- .../model/TemplateAttributesTest.java | 8 -- .../model/TemplateContentAttributesTest.java | 8 -- .../TransmissionWithRecipientArrayTest.java | 8 -- .../sparkpost/model/VerifyResponseTest.java | 8 -- .../model/webhook/event/BounceEventTest.java | 8 -- .../model/webhook/event/ClickEventTest.java | 8 -- .../model/webhook/event/DelayEventTest.java | 8 -- .../webhook/event/DeliveryEventTest.java | 8 -- .../event/GenerationFailureEventTest.java | 8 -- .../event/GenerationRejectionEventTest.java | 8 -- .../webhook/event/InjectionEventTest.java | 8 -- .../model/webhook/event/OpenEventTest.java | 8 -- .../resources/ResourceMetricTests.java | 8 -- .../ResourceRecipientListsTests.java | 8 -- .../ResourceSendingDomainsTests.java | 8 -- .../ResourceSuppressionListTests.java | 8 -- .../resources/ResourceTemplatesTests.java | 8 -- .../resources/ResourceTransmissionsTests.java | 8 -- pom.xml | 10 +- 68 files changed, 171 insertions(+), 472 deletions(-) create mode 100644 libs/sparkpost-lib/log4j.xml diff --git a/apps/sparkpost-documentor-app/pom.xml b/apps/sparkpost-documentor-app/pom.xml index 1e12633..0266245 100644 --- a/apps/sparkpost-documentor-app/pom.xml +++ b/apps/sparkpost-documentor-app/pom.xml @@ -15,10 +15,9 @@ com.sparkpost sparkpost-lib - - log4j - log4j + org.slf4j + slf4j-log4j12 com.google.code.gson diff --git a/apps/sparkpost-javamail-app/pom.xml b/apps/sparkpost-javamail-app/pom.xml index 17a77f4..819b2e8 100644 --- a/apps/sparkpost-javamail-app/pom.xml +++ b/apps/sparkpost-javamail-app/pom.xml @@ -18,6 +18,10 @@ com.sparkpost sparkpost-lib + + org.slf4j + slf4j-log4j12 + javax.mail javax.mail-api diff --git a/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java b/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java index ee9eb3f..bd0d963 100644 --- a/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/pom.xml b/apps/sparkpost-samples-app/pom.xml index b370b8d..c00fc9a 100644 --- a/apps/sparkpost-samples-app/pom.xml +++ b/apps/sparkpost-samples-app/pom.xml @@ -16,10 +16,13 @@ com.sparkpost sparkpost-lib - - log4j - log4j + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 com.google.code.gson diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java index 98fe9ee..86812d4 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java index 7d6a5a9..9c9eac8 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java index 7cc4e8e..6ddd31a 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java index a275331..db4b317 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java index b71823e..c221f39 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java index 479736b..4facbf8 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java +++ b/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(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java index ba691d5..4a23329 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java +++ b/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(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java index 7a7afd4..e706700 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java +++ b/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 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 recipients) { + if (logger.isDebugEnabled()) { + logger.debug("sendEmail(...)"); + } + + } + } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java index 95db205..bd153cb 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java +++ b/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(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java index 49c622d..8b6c63f 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.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; @@ -20,13 +20,11 @@ */ public class DeleteWebhookSample 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); - DeleteWebhookSample sample = new DeleteWebhookSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java index bb9a6c9..f66f653 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java @@ -5,8 +5,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.SparkPostException; @@ -33,11 +33,9 @@ public class DeliverabilityMetricsSample extends SparkPostBaseApp { private static final String FROM_DATE = "2014-07-11T08:00"; - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class); public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); - if (args.length == 0) { System.err.println("You must pass the metrics you want to querying"); System.err.println("commands\n"); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java index 6168f19..e548334 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.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; @@ -19,13 +19,11 @@ */ public class ListAllSendingDomains 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); - ListAllSendingDomains sample = new ListAllSendingDomains(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java index df7c060..cfe9e3c 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.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; @@ -21,13 +21,11 @@ */ public class ListAllTemplatesSample 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); - ListAllTemplatesSample sample = new ListAllTemplatesSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java index ee4ff51..ccc99ae 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java @@ -3,9 +3,6 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; - import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; import com.sparkpost.model.TransmissionBase; @@ -40,15 +37,13 @@ public class ListAllTransmissionsSample extends SparkPostBaseApp { private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); - ListAllTransmissionsSample sample = new ListAllTransmissionsSample(); sample.runApp(); } private void runApp() throws SparkPostException, IOException { - client = this.newConfiguredClient(); + this.client = this.newConfiguredClient(); listAllTransmissions(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java index d599bcc..b359daa 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.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; @@ -19,13 +19,11 @@ */ public class ListAllWebhooksSample 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); - ListAllWebhooksSample sample = new ListAllWebhooksSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java index b60bee7..6f88f6f 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; -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; @@ -26,7 +26,7 @@ */ public class MandrillBlacklistImport extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(MandrillBlacklistImport.class); + static final Logger logger = LoggerFactory.getLogger(MandrillBlacklistImport.class); private Client client; @@ -44,8 +44,6 @@ public static class Fields { } public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); - MandrillBlacklistImport sample = new MandrillBlacklistImport(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java index aeef5ff..8e786f1 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java @@ -5,8 +5,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; @@ -24,11 +24,9 @@ */ public class MessageEventSearchSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class); public static void main(String[] args) throws SparkPostException, IOException, InterruptedException { - Logger.getRootLogger().setLevel(Level.DEBUG); - MessageEventSearchSample app = new MessageEventSearchSample(); app.doSearch(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java index cda3111..a3f6e9e 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java @@ -8,8 +8,8 @@ import java.net.URI; import java.net.URISyntaxException; -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; @@ -29,13 +29,11 @@ */ public class PreviewTemplateSample 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); - PreviewTemplateSample sample = new PreviewTemplateSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java index 16335a7..87d3eb6 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.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 RetrieveAllTemplatesSample 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); - RetrieveAllTemplatesSample sample = new RetrieveAllTemplatesSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java index 99ebd19..1674c2f 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java @@ -5,8 +5,6 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -34,9 +32,6 @@ public class SampleApplication { private static Gson gson; public static void main(String[] args) throws SparkPostException { - // Set to DEBUG so we can see what the SparkPost SDK is doing: - Logger.getRootLogger().setLevel(Level.DEBUG); - // Initialize our JSON parser. We'll use it to parse responses from // the SparkPost server. GsonBuilder gsonBuilder = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss"); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java index 1c8a6ad..dfe8da7 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.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; @@ -22,13 +22,11 @@ public class SendEmailBCCSample 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); - SendEmailBCCSample sample = new SendEmailBCCSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java index 0d9283e..14069f3 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.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.SparkPostException; @@ -24,13 +24,11 @@ public class SendEmailCCSample 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); - SendEmailCCSample sample = new SendEmailCCSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java index 48e8c20..12be733 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java @@ -5,8 +5,8 @@ import java.util.HashMap; 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.SparkPostException; @@ -22,13 +22,11 @@ public class SendEmailRecipientListSample 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); - SendEmailRecipientListSample sample = new SendEmailRecipientListSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java index 9735954..9554785 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.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.SparkPostException; @@ -24,13 +24,11 @@ public class SendEmailSample 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); - SendEmailSample sample = new SendEmailSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java index f796e6b..4f58639 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.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; @@ -24,13 +24,11 @@ public class SendEmailWithFilesSample 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); - SendEmailWithFilesSample sample = new SendEmailWithFilesSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java index 844b761..67ee86d 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.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.SparkPostException; @@ -24,13 +24,11 @@ public class SendEmailWithSubstitutionSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(SendEmailWithSubstitutionSample.class); + static final Logger logger = LoggerFactory.getLogger(SendEmailWithSubstitutionSample.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); - SendEmailWithSubstitutionSample sample = new SendEmailWithSubstitutionSample(); sample.runApp(); } diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java index 6d6d7d3..f1aeb2d 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java @@ -11,8 +11,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -29,11 +29,10 @@ public class SparkPostBaseApp { private final Properties properties = new Properties(); - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LoggerFactory.getLogger(CreateTemplateSimple.class); public SparkPostBaseApp() { super(); - BasicConfigurator.configure(); this.loadProperties(); } @@ -49,7 +48,7 @@ protected Client newConfiguredClient() throws SparkPostException, IOException { } if (logger.isDebugEnabled()) { - logger.debug(client); + logger.debug(client.toString()); } return client; diff --git a/libs/sparkpost-lib/log4j.xml b/libs/sparkpost-lib/log4j.xml new file mode 100644 index 0000000..fef6cfb --- /dev/null +++ b/libs/sparkpost-lib/log4j.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/libs/sparkpost-lib/pom.xml b/libs/sparkpost-lib/pom.xml index 889263e..4717e3c 100644 --- a/libs/sparkpost-lib/pom.xml +++ b/libs/sparkpost-lib/pom.xml @@ -13,10 +13,14 @@ - log4j - log4j + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + test - com.google.code.gson gson diff --git a/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java b/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java index 82c7a02..924d1e4 100644 --- a/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java +++ b/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java @@ -13,7 +13,8 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.sparkpost.Build; import com.sparkpost.Client; @@ -33,7 +34,7 @@ */ public class RestConnection implements IRestConnection { - private static final Logger logger = Logger.getLogger(RestConnection.class); + private static final Logger logger = LoggerFactory.getLogger(RestConnection.class); private static final String VERSION = Build.VERSION + " (" + Build.GIT_SHORT_HASH + ")"; diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java index e1c14e5..39e4187 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java @@ -1,13 +1,10 @@ package com.sparkpost; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.resources.Endpoint; @@ -17,11 +14,6 @@ public class EndPointTest { public EndPointTest() { } - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } @@ -85,7 +77,7 @@ public void testSimpleEndPoint() { @Test public void testEndPointWithBoolean() { Endpoint endPoint = new Endpoint("transmissions"); - endPoint.addParam("myBool", new Boolean(true)); + endPoint.addParam("myBool", Boolean.TRUE); String result = endPoint.toString(); Assert.assertEquals("/transmissions?myBool=true", result); @@ -97,7 +89,7 @@ public void testEndPointWithBoolean() { @Test public void testEndPointWithInteger() { Endpoint endPoint = new Endpoint("transmissions"); - endPoint.addParam("myInteger", new Integer(100)); + endPoint.addParam("myInteger", Integer.valueOf(100)); String result = endPoint.toString(); Assert.assertEquals("/transmissions?myInteger=100", result); @@ -110,8 +102,8 @@ public void testEndPointWithInteger() { public void testEndPointWithMultipleParameters() { Endpoint endPoint = new Endpoint("transmissions"); endPoint.addParam("num_rcpt_errors", 3); - endPoint.addParam("myBool", new Boolean(false)); - endPoint.addParam("MyInteger", new Integer(0)); + endPoint.addParam("myBool", Boolean.FALSE); + endPoint.addParam("MyInteger", Integer.valueOf(0)); String result = endPoint.toString(); Assert.assertEquals("/transmissions?num_rcpt_errors=3&myBool=false&MyInteger=0", result); diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java index 2b42d44..c183de5 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -22,11 +19,6 @@ public class AddressAttributesTests { + "\"name\" : \"First Last\"" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java index 5b5f135..bc6aadf 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -31,11 +28,6 @@ public class DKIMResultsTest { + " }\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java index 5152201..541f4be 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -21,11 +18,6 @@ public class DKIMTest { + " \"selector\": \"hello_selector\"\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java index 38da994..3481e16 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -21,11 +18,6 @@ public class DNSAttributesTest { + " \"spf_error\": \"some spf error\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java index 7911e2b..f414b74 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java @@ -3,13 +3,10 @@ import java.net.URISyntaxException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.model.MessageEventsQueryBuilder.BounceClass; @@ -17,11 +14,6 @@ public class MessageEventsQueryBuilderTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java index 4ca574f..bfa52ba 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -24,11 +21,6 @@ public class OptionsAttributesTest { + " \"ip_pool\":\"sp_shared\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java index 2967d2c..b0e02c2 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java @@ -5,15 +5,12 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -43,11 +40,6 @@ public class RecipientAttributesTest { private List expected = Arrays.asList("greeting", "prehistoric", "fred", "flintstone"); - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java index 91f6586..8d7da38 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java @@ -4,13 +4,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -80,11 +77,6 @@ public class RecipientListTest { //private List expected = Arrays.asList("greeting", "prehistoric", "fred", "flintstone"); - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java index 7edfc41..f76a878 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -16,11 +13,6 @@ public class SendingDomainTest { private String SENDING_DOMAIN_JSON = "{\n" + " \"domain\": \"domain.com\",\n" + " \"status\": { },\n" + " \"dkim\": { }\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java index e9c5d8b..928102b 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -23,11 +20,6 @@ public class StatusAttributesTest { + " \"postmaster_at_status\": \"pending\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java index 648447c..4185eb2 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -16,11 +13,6 @@ public class StoredRecipientListTest { private String STORED_RECIPIENT_LIST_JSON = "{ \"list_id\":\"123412341234\" }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java index b3abc37..ed1b673 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -19,11 +16,6 @@ public class StoredTemplateTest { + " \"use_draft_template\": true\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java index 2885a0a..58a46f0 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -21,11 +18,6 @@ public class SuppressionListEntryTest { + " \"description\": \"User requested to not receive any transactional emails.\"\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java index bb2925d..0f76c6b 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java @@ -3,13 +3,10 @@ import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -30,11 +27,6 @@ public class SuppressionListTest { + " ]\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java index 08e33e2..e604892 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -43,11 +40,6 @@ public class TemplateAttributesTest { + " }\n" + " } "; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java index e98f694..2ace22c 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java @@ -3,13 +3,10 @@ import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -31,11 +28,6 @@ public class TemplateContentAttributesTest { + " }" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java index aadd79d..f1e4ae1 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java @@ -4,13 +4,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -70,11 +67,6 @@ public class TransmissionWithRecipientArrayTest { + " }\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java index 05758d1..2dfb799 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -32,11 +29,6 @@ public class VerifyResponseTest { + " }\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java index 307dacf..aad7e29 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -46,11 +43,6 @@ public class BounceEventTest { + " \"raw_rcpt_to\": \"nonExist@example.com\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java index b0739cc..f7affb7 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -35,11 +32,6 @@ public class ClickEventTest { + " \"template_version\": \"1\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java index e71a777..a96720d 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -44,11 +41,6 @@ public class DelayEventTest { + " \"raw_rcpt_to\": \"test@example.com\"\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java index e8f64cc..4aecbd3 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -37,11 +34,6 @@ public class DeliveryEventTest { + " \"raw_rcpt_to\": \"test@example.com\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java index 3636430..82a838e 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -39,11 +36,6 @@ public class GenerationFailureEventTest { + " ]\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java index 79ff80a..71f5663 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -36,11 +33,6 @@ public class GenerationRejectionEventTest { + " \"rcpt_meta\": {}\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java index 959db4a..73cad0a 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -37,11 +34,6 @@ public class InjectionEventTest { + " \"raw_rcpt_to\": \"test@example.com\"\n" + " }"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java index a94fe35..e60fb91 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java @@ -1,13 +1,10 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.google.gson.Gson; @@ -44,11 +41,6 @@ public class OpenEventTest { + " \"raw_rcpt_to\": \"test@example.com\"\n" + "}"; - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java index 823fa9c..e80b16c 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java @@ -3,13 +3,10 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.exception.SparkPostException; @@ -19,11 +16,6 @@ public class ResourceMetricTests extends BaseResourceTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java index 928fa20..49dd765 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java @@ -3,13 +3,10 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.exception.SparkPostException; @@ -21,11 +18,6 @@ public class ResourceRecipientListsTests extends BaseResourceTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java index 4893a96..12bd13b 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java @@ -3,13 +3,10 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.exception.SparkPostException; @@ -20,11 +17,6 @@ public class ResourceSendingDomainsTests extends BaseResourceTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java index e4b9738..d4710b7 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java @@ -3,13 +3,10 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.exception.SparkPostException; @@ -20,11 +17,6 @@ public class ResourceSuppressionListTests extends BaseResourceTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java index 3f21b29..3991095 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java @@ -3,13 +3,10 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.exception.SparkPostException; @@ -24,11 +21,6 @@ public class ResourceTemplatesTests extends BaseResourceTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java index a9c177b..ada8c1d 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java @@ -3,13 +3,10 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.sparkpost.exception.SparkPostException; @@ -23,11 +20,6 @@ public class ResourceTransmissionsTests extends BaseResourceTest { - @BeforeClass - public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); - } - @AfterClass public static void tearDownClass() { } diff --git a/pom.xml b/pom.xml index 16af512..a6a09a8 100644 --- a/pom.xml +++ b/pom.xml @@ -217,14 +217,14 @@ - log4j - log4j - 1.2.17 + org.slf4j + slf4j-api + 1.7.25 org.slf4j - slf4j-api - 1.7.12 + slf4j-log4j12 + 1.7.25 com.googlecode.jmockit