JAMES-2267 Introduce an helper to limit system resources type conversions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d6fade96 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d6fade96 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d6fade96 Branch: refs/heads/improve-mailet-testing-experience-v1 Commit: d6fade96b449b149d448daa4a299317158c194b6 Parents: c20d434 Author: benwa <[email protected]> Authored: Thu Dec 21 10:09:13 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 5 09:33:52 2018 +0700 ---------------------------------------------------------------------- mailbox/api/pom.xml | 4 +++ .../james/mailbox/model/AttachmentIdTest.java | 6 ++-- .../james/mailbox/cassandra/ids/BlobIdTest.java | 6 ++-- .../json/IndexableMessageTest.java | 21 ++++++------ .../json/MessageToElasticSearchJsonTest.java | 23 +++++++------ .../search/AbstractMessageSearchIndexTest.java | 4 +-- .../mailets/ICALToJsonAttributeTest.java | 28 ++++++++-------- .../transport/mailets/ICalendarParserTest.java | 4 +-- .../james/transport/mailets/model/ICALTest.java | 17 +++++----- .../org/apache/james/util/ClassLoaderUtils.java | 35 ++++++++++++++++++++ .../crypto/SMIMEDecryptIntegrationTest.java | 9 +++-- .../integration/GetMessageListMethodTest.java | 6 ++-- .../integration/SetMessagesMethodTest.java | 7 ++-- .../james/jmap/model/MessageFactoryTest.java | 5 ++- .../integration/JwtFilterIntegrationTest.java | 5 ++- 15 files changed, 108 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/api/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml index 364d019..f2572a6 100644 --- a/mailbox/api/pom.xml +++ b/mailbox/api/pom.xml @@ -34,6 +34,10 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-util-java8</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>apache-mime4j-dom</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java index 29bd55d..092d739 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.UUID; -import org.apache.commons.io.IOUtils; +import org.apache.james.util.ClassLoaderUtils; import org.junit.Test; public class AttachmentIdTest { @@ -127,8 +127,8 @@ public class AttachmentIdTest { @Test public void forPayloadAndTypeShouldCalculateDifferentHashesWhenCraftedSha1Collision() throws Exception { - byte[] payload1 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-1.pdf")); - byte[] payload2 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-2.pdf")); + byte[] payload1 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-1.pdf"); + byte[] payload2 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-2.pdf"); AttachmentId attachmentId1 = AttachmentId.forPayloadAndType(payload1, "application/pdf"); AttachmentId attachmentId2 = AttachmentId.forPayloadAndType(payload2, "application/pdf"); assertThat(attachmentId1).isNotEqualTo(attachmentId2); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java index 808871b..e8e3f13 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; -import org.apache.commons.io.IOUtils; +import org.apache.james.util.ClassLoaderUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -84,8 +84,8 @@ public class BlobIdTest { @Test public void forPayloadShouldCalculateDifferentHashesWhenCraftedSha1Collision() throws Exception { - byte[] payload1 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-1.pdf")); - byte[] payload2 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-2.pdf")); + byte[] payload1 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-1.pdf"); + byte[] payload2 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-2.pdf"); BlobId blobId1 = BlobId.forPayload(payload1); BlobId blobId2 = BlobId.forPayload(payload2); assertThat(blobId1).isNotEqualTo(blobId2); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java index 5fbb373..052d0a2 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java @@ -30,7 +30,6 @@ import java.time.ZoneId; import javax.mail.Flags; -import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.elasticsearch.IndexAttachments; import org.apache.james.mailbox.extractor.ParsedContent; @@ -263,7 +262,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -298,7 +297,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -328,7 +327,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -359,7 +358,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -390,7 +389,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -419,7 +418,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -448,7 +447,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -484,7 +483,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(InMemoryMessageId.of(42)); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -517,7 +516,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(invalidMessageIdThatReturnNull); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) @@ -546,7 +545,7 @@ public class IndexableMessageTest { when(mailboxMessage.getMessageId()) .thenReturn(null); when(mailboxMessage.getFullContent()) - .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml")))); + .thenReturn(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml")); when(mailboxMessage.createFlags()) .thenReturn(new Flags()); when(mailboxMessage.getUid()) http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java index 3193211..6e8e979 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java @@ -51,6 +51,7 @@ import org.apache.james.mailbox.tika.TikaConfiguration; import org.apache.james.mailbox.tika.TikaContainer; import org.apache.james.mailbox.tika.TikaHttpClientImpl; import org.apache.james.mailbox.tika.TikaTextExtractor; +import org.apache.james.util.ClassLoaderUtils; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -120,7 +121,7 @@ public class MessageToElasticSearchJsonTest { date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/spamMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/spamMail.eml")), new Flags(), propertyBuilder, MAILBOX_ID); @@ -140,7 +141,7 @@ public class MessageToElasticSearchJsonTest { date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/htmlMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/htmlMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("social", "pocket-money").build(), propertyBuilder, MAILBOX_ID); @@ -160,7 +161,7 @@ public class MessageToElasticSearchJsonTest { date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/pgpSignedMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/pgpSignedMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); @@ -180,7 +181,7 @@ public class MessageToElasticSearchJsonTest { date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/mail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); @@ -201,7 +202,7 @@ public class MessageToElasticSearchJsonTest { date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); @@ -221,7 +222,7 @@ public class MessageToElasticSearchJsonTest { null, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); @@ -240,7 +241,7 @@ public class MessageToElasticSearchJsonTest { null, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); @@ -268,7 +269,7 @@ public class MessageToElasticSearchJsonTest { null, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); @@ -299,7 +300,7 @@ public class MessageToElasticSearchJsonTest { mailWithNoMailboxId = new SimpleMailboxMessage(MESSAGE_ID, date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, null); @@ -349,7 +350,7 @@ public class MessageToElasticSearchJsonTest { MailboxMessage spamMail = new SimpleMailboxMessage(MESSAGE_ID, date, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/nonTextual.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/nonTextual.eml")), new Flags(), propertyBuilder, MAILBOX_ID); @@ -367,7 +368,7 @@ public class MessageToElasticSearchJsonTest { null, SIZE, BODY_START_OCTET, - new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/emailWithNonIndexableAttachment.eml"))), + new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/emailWithNonIndexableAttachment.eml")), new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(), propertyBuilder, MAILBOX_ID); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java index e6e8790..2bbecde 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java @@ -31,7 +31,6 @@ import java.util.List; import javax.mail.Flags; -import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; @@ -56,6 +55,7 @@ import org.apache.james.mime4j.message.BodyPart; import org.apache.james.mime4j.message.BodyPartBuilder; import org.apache.james.mime4j.message.DefaultMessageWriter; import org.apache.james.mime4j.message.MultipartBuilder; +import org.apache.james.util.ClassLoaderUtils; import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -1180,7 +1180,7 @@ public abstract class AbstractMessageSearchIndexTest { @Test public void searchWithPDFAttachmentShouldReturnMailsWhenAttachmentContentMatches() throws Exception { Assume.assumeTrue(storeMailboxManager.getSupportedSearchCapabilities().contains(MailboxManager.SearchCapabilities.Attachment)); - byte[] attachmentContent = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/attachment.pdf")); + byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf"); BodyPart attachment = BodyPartBuilder.create() .setBody(attachmentContent, "application/pdf") .setContentDisposition("attachment") http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java index 4397c68..d4c8b0e 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import javax.mail.MessagingException; import org.apache.james.core.MailAddress; +import org.apache.james.util.ClassLoaderUtils; import org.apache.mailet.Mail; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; @@ -44,7 +45,6 @@ import org.junit.rules.ExpectedException; import com.fasterxml.jackson.core.io.JsonStringEncoder; import com.google.common.collect.ImmutableMap; -import com.google.common.io.ByteStreams; import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.model.Calendar; @@ -198,7 +198,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldFilterMailsWithoutSender() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); Mail mail = FakeMail.builder() @@ -216,7 +216,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldAttachEmptyListWhenNoRecipient() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics); @@ -236,7 +236,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldAttachJson() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics); @@ -273,7 +273,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldAttachJsonForSeveralRecipient() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics); @@ -316,8 +316,8 @@ public class ICALToJsonAttributeTest { public void serviceShouldAttachJsonForSeveralICALs() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); - byte[] ics2 = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_2.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); + byte[] ics2 = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_2.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); Calendar calendar2 = new CalendarBuilder().build(new ByteArrayInputStream(ics2)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar, "key2", calendar2); @@ -362,8 +362,8 @@ public class ICALToJsonAttributeTest { public void serviceShouldFilterInvalidICS() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); - byte[] ics2 = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_uid.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); + byte[] ics2 = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_uid.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); Calendar calendar2 = new CalendarBuilder().build(new ByteArrayInputStream(ics2)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar, "key2", calendar2); @@ -398,8 +398,8 @@ public class ICALToJsonAttributeTest { public void serviceShouldFilterNonExistingKeys() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); - byte[] ics2 = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_2.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); + byte[] ics2 = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_2.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); Calendar calendar2 = new CalendarBuilder().build(new ByteArrayInputStream(ics2)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar, "key2", calendar2); @@ -434,7 +434,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldUseFromWhenSpecified() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics); @@ -470,7 +470,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldSupportMimeMessagesWithoutFromFields() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics); @@ -504,7 +504,7 @@ public class ICALToJsonAttributeTest { public void serviceShouldUseFromWhenSpecifiedAndNoSender() throws Exception { testee.init(FakeMailetConfig.builder().build()); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar); ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java index 1d4dffe..a61fba9 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java @@ -25,7 +25,7 @@ import java.util.Map; import javax.mail.MessagingException; -import org.apache.commons.io.IOUtils; +import org.apache.james.util.ClassLoaderUtils; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailetConfig; @@ -235,7 +235,7 @@ public class ICalendarParserTest { mailet.init(mailetConfiguration); Map<String, byte[]> attachments = ImmutableMap.<String, byte[]>builder() - .put("key", IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("ics/ics_with_error.ics"))) + .put("key", ClassLoaderUtils.getSystemResourceAsByteArray("ics/ics_with_error.ics")) .build(); Mail mail = FakeMail.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java index 4699ae3..878aa72 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java @@ -24,13 +24,12 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; import org.apache.james.core.MailAddress; +import org.apache.james.util.ClassLoaderUtils; import org.apache.mailet.base.MailAddressFixture; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.google.common.io.ByteStreams; - import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.model.Calendar; import nl.jqno.equalsverifier.EqualsVerifier; @@ -54,7 +53,7 @@ public class ICALTest { public void buildShouldFailWhenNoSender() throws Exception { expectedException.expect(NullPointerException.class); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ICAL.builder() @@ -67,7 +66,7 @@ public class ICALTest { public void buildShouldFailWhenNoRecipient() throws Exception { expectedException.expect(NullPointerException.class); - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); ICAL.builder() @@ -79,7 +78,7 @@ public class ICALTest { @Test public void buildShouldWork() throws Exception { - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); MailAddress recipient = MailAddressFixture.ANY_AT_JAMES; @@ -109,7 +108,7 @@ public class ICALTest { @Test public void buildShouldThrowOnCalendarWithoutDtstamp() throws Exception { - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_dtstamp.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_dtstamp.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); expectedException.expect(IllegalStateException.class); @@ -125,7 +124,7 @@ public class ICALTest { @Test public void buildShouldThrowOnCalendarWithoutUid() throws Exception { - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_uid.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_uid.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); expectedException.expect(IllegalStateException.class); @@ -141,7 +140,7 @@ public class ICALTest { @Test public void buildShouldThrowOnCalendarWithoutMethod() throws Exception { - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_method.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_method.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); expectedException.expect(IllegalStateException.class); @@ -157,7 +156,7 @@ public class ICALTest { @Test public void buildShouldSetDefaultValueWhenCalendarWithoutSequence() throws Exception { - byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_sequence.ics")); + byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_sequence.ics"); Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics)); MailAddress recipient = MailAddressFixture.ANY_AT_JAMES; http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java b/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java new file mode 100644 index 0000000..d7df10a --- /dev/null +++ b/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java @@ -0,0 +1,35 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.util; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +import org.apache.commons.io.IOUtils; + +public class ClassLoaderUtils { + public static String getSystemResourceAsString(String filename) throws IOException { + return IOUtils.toString(ClassLoader.getSystemResourceAsStream(filename), StandardCharsets.US_ASCII); + } + + public static byte[] getSystemResourceAsByteArray(String filename) throws IOException { + return IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream(filename)); + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java index 9e2bb06..148ba17 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java @@ -25,10 +25,8 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; -import java.nio.charset.StandardCharsets; import java.time.ZonedDateTime; -import org.apache.commons.io.IOUtils; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; @@ -39,6 +37,7 @@ import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.SMIMEDecrypt; import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.RecipientIsLocal; +import org.apache.james.util.ClassLoaderUtils; import org.apache.james.util.date.ZonedDateTimeProvider; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; @@ -104,7 +103,7 @@ public class SMIMEDecryptIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, - IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII)) + ClassLoaderUtils.getSystemResourceAsString("eml/crypted.eml")) .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) @@ -119,7 +118,7 @@ public class SMIMEDecryptIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, - IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII)) + ClassLoaderUtils.getSystemResourceAsString("eml/crypted_with_attachment.eml")) .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) @@ -135,7 +134,7 @@ public class SMIMEDecryptIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, - IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII)) + ClassLoaderUtils.getSystemResourceAsString("eml/bad_crypted.eml")) .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index 7b8a0e7..52b33de 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -39,7 +39,6 @@ import java.util.Date; import javax.mail.Flags; -import org.apache.commons.io.IOUtils; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.HttpJmapAuthentication; @@ -62,6 +61,7 @@ import org.apache.james.mime4j.message.MultipartBuilder; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; +import org.apache.james.util.ClassLoaderUtils; import org.apache.james.util.date.ImapDateTimeFormatter; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.JmapGuiceProbe; @@ -1007,7 +1007,7 @@ public abstract class GetMessageListMethodTest { @Test public void getMessageListShouldFilterMessagesWhenAttachmentFilterDoesntMatches() throws Exception { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox"); - byte[] attachmentContent = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/attachment.pdf")); + byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf"); BodyPart attachment = BodyPartBuilder.create() .setBody(attachmentContent, "application/pdf") .setContentDisposition("attachment") @@ -1040,7 +1040,7 @@ public abstract class GetMessageListMethodTest { @Test public void getMessageListShouldNotFilterMessagesWhenAttachmentFilterMatches() throws Exception { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox"); - byte[] attachmentContent = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/attachment.pdf")); + byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf"); BodyPart attachment = BodyPartBuilder.create() .setBody(attachmentContent, "application/pdf") .setContentDisposition("attachment") http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index b2e3bfd..adc161f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -77,6 +77,7 @@ import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; +import org.apache.james.util.ClassLoaderUtils; import org.apache.james.util.ZeroedInputStream; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; @@ -4589,7 +4590,7 @@ public abstract class SetMessagesMethodTest { @Test public void setMessagesShouldCreateMessageWhenSendingMessageWithNonIndexableAttachment() throws Exception { Attachment nonIndexableAttachment = Attachment.builder() - .bytes(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("attachment/nonIndexableAttachment.html"))) + .bytes(ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html")) .type("text/html") .build(); uploadTextAttachment(nonIndexableAttachment); @@ -4641,7 +4642,7 @@ public abstract class SetMessagesMethodTest { @Test public void messageWithNonIndexableAttachmentShouldBeRetrievedWhenChainingSetMessagesAndGetMessages() throws Exception { Attachment nonIndexableAttachment = Attachment.builder() - .bytes(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("attachment/nonIndexableAttachment.html"))) + .bytes(ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html")) .type("text/html") .build(); uploadTextAttachment(nonIndexableAttachment); @@ -4701,7 +4702,7 @@ public abstract class SetMessagesMethodTest { @Test public void messageWithNonIndexableAttachmentShouldHaveItsEmailBodyIndexed() throws Exception { Attachment nonIndexableAttachment = Attachment.builder() - .bytes(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("attachment/nonIndexableAttachment.html"))) + .bytes(ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html")) .type("text/html") .build(); uploadTextAttachment(nonIndexableAttachment); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java index 66d02e1..2ae24b8 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java @@ -28,7 +28,6 @@ import java.nio.charset.StandardCharsets; import java.time.Instant; import java.util.Optional; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.james.jmap.model.MessageFactory.MetaDataWithContent; import org.apache.james.jmap.utils.HtmlTextExtractor; @@ -360,7 +359,7 @@ public class MessageFactoryTest { .keywords(Keywords.factory().from(Keyword.SEEN)) .size(0) .internalDate(INTERNAL_DATE) - .content(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("spamMail.eml")))) + .content(ClassLoader.getSystemResourceAsStream("spamMail.eml")) .attachments(ImmutableList.of()) .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) @@ -386,7 +385,7 @@ public class MessageFactoryTest { .keywords(Keywords.factory().from(Keyword.SEEN)) .size(0) .internalDate(INTERNAL_DATE) - .content(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("spamMail.eml")))) + .content(ClassLoader.getSystemResourceAsStream("spamMail.eml")) .attachments(ImmutableList.of(MessageAttachment.builder() .attachment(org.apache.james.mailbox.model.Attachment.builder() .attachmentId(AttachmentId.from(blodId.getRawValue())) http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java index c8dca1c..4ba097c 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java @@ -28,11 +28,11 @@ import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; import java.util.Optional; -import org.apache.commons.io.IOUtils; import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; import org.apache.james.jwt.JwtConfiguration; +import org.apache.james.util.ClassLoaderUtils; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.authentication.AuthenticationFilter; @@ -78,8 +78,7 @@ public class JwtFilterIntegrationTest { @Before public void setUp() throws Exception { JwtConfiguration jwtConfiguration = new JwtConfiguration( - Optional.of( - IOUtils.toString(ClassLoader.getSystemResourceAsStream("jwt_publickey"), StandardCharsets.UTF_8))); + Optional.of(ClassLoaderUtils.getSystemResourceAsString("jwt_publickey"))); guiceJamesServer = cassandraJmapTestRule.jmapServer(cassandra.getModule()) .overrideWith(new WebAdminConfigurationModule(), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
