This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 284451226fab86ff1948184991e9609bfc6018b7
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Fri Jan 17 09:47:57 2020 +0700
JAMES-2997 Move james-server-utils InputStream in a dedicated io package
---
.../main/java/org/apache/james/mailbox/store/StoreMessageManager.java | 2 +-
.../java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java | 2 +-
.../src/main/java/org/apache/james/blob/mail/MimeMessageStore.java | 2 +-
.../apache/james/server/core/MimeMessageInputStreamSourceTest.java | 2 +-
.../java/org/apache/james/util/{ => io}/BodyOffsetInputStream.java | 2 +-
.../org/apache/james/util/{ => io}/CountDownConsumeInputStream.java | 2 +-
.../main/java/org/apache/james/util/{ => io}/InputStreamUtils.java | 2 +-
.../main/java/org/apache/james/util/{ => io}/ZeroedInputStream.java | 2 +-
.../test/java/org/apache/james/util/BodyOffsetInputStreamTest.java | 1 +
.../src/test/java/org/apache/james/util/InputStreamUtilsTest.java | 1 +
.../james/jmap/draft/methods/integration/SetMessagesMethodTest.java | 3 ++-
.../jmap/draft/methods/integration/cucumber/DownloadStepdefs.java | 2 +-
.../james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java | 4 ++--
13 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index bb139fc..f5e18c7 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -95,8 +95,8 @@ import org.apache.james.mime4j.stream.EntityState;
import org.apache.james.mime4j.stream.MimeConfig;
import org.apache.james.mime4j.stream.MimeTokenStream;
import org.apache.james.mime4j.stream.RecursionMode;
-import org.apache.james.util.BodyOffsetInputStream;
import org.apache.james.util.IteratorWrapper;
+import org.apache.james.util.io.BodyOffsetInputStream;
import org.apache.james.util.streams.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
index e073231..cba4df7 100644
---
a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
+++
b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
@@ -40,7 +40,7 @@ import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
import org.apache.james.blob.api.MetricableBlobStoreContract;
import org.apache.james.blob.api.ObjectStoreException;
-import org.apache.james.util.ZeroedInputStream;
+import org.apache.james.util.io.ZeroedInputStream;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git
a/server/blob/mail-store/src/main/java/org/apache/james/blob/mail/MimeMessageStore.java
b/server/blob/mail-store/src/main/java/org/apache/james/blob/mail/MimeMessageStore.java
index 47194a7..7614928 100644
---
a/server/blob/mail-store/src/main/java/org/apache/james/blob/mail/MimeMessageStore.java
+++
b/server/blob/mail-store/src/main/java/org/apache/james/blob/mail/MimeMessageStore.java
@@ -45,7 +45,7 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobType;
import org.apache.james.blob.api.Store;
-import org.apache.james.util.BodyOffsetInputStream;
+import org.apache.james.util.io.BodyOffsetInputStream;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
diff --git
a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java
b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java
index 6a005a0..e98f597 100644
---
a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java
+++
b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import javax.mail.MessagingException;
-import org.apache.james.util.ZeroedInputStream;
+import org.apache.james.util.io.ZeroedInputStream;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git
a/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
b/server/container/util/src/main/java/org/apache/james/util/io/BodyOffsetInputStream.java
similarity index 99%
rename from
server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
rename to
server/container/util/src/main/java/org/apache/james/util/io/BodyOffsetInputStream.java
index e0bb63a..0efec22 100644
---
a/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
+++
b/server/container/util/src/main/java/org/apache/james/util/io/BodyOffsetInputStream.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.util.io;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/server/container/util/src/main/java/org/apache/james/util/CountDownConsumeInputStream.java
b/server/container/util/src/main/java/org/apache/james/util/io/CountDownConsumeInputStream.java
similarity index 98%
rename from
server/container/util/src/main/java/org/apache/james/util/CountDownConsumeInputStream.java
rename to
server/container/util/src/main/java/org/apache/james/util/io/CountDownConsumeInputStream.java
index dbf952d..3d4e9f2 100644
---
a/server/container/util/src/main/java/org/apache/james/util/CountDownConsumeInputStream.java
+++
b/server/container/util/src/main/java/org/apache/james/util/io/CountDownConsumeInputStream.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.util.io;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/server/container/util/src/main/java/org/apache/james/util/InputStreamUtils.java
b/server/container/util/src/main/java/org/apache/james/util/io/InputStreamUtils.java
similarity index 97%
rename from
server/container/util/src/main/java/org/apache/james/util/InputStreamUtils.java
rename to
server/container/util/src/main/java/org/apache/james/util/io/InputStreamUtils.java
index 0d96591..b500142 100644
---
a/server/container/util/src/main/java/org/apache/james/util/InputStreamUtils.java
+++
b/server/container/util/src/main/java/org/apache/james/util/io/InputStreamUtils.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.util.io;
import java.io.InputStream;
import java.io.SequenceInputStream;
diff --git
a/server/container/util/src/main/java/org/apache/james/util/ZeroedInputStream.java
b/server/container/util/src/main/java/org/apache/james/util/io/ZeroedInputStream.java
similarity index 97%
rename from
server/container/util/src/main/java/org/apache/james/util/ZeroedInputStream.java
rename to
server/container/util/src/main/java/org/apache/james/util/io/ZeroedInputStream.java
index f1583c7..65549b3 100644
---
a/server/container/util/src/main/java/org/apache/james/util/ZeroedInputStream.java
+++
b/server/container/util/src/main/java/org/apache/james/util/io/ZeroedInputStream.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.util.io;
import java.io.InputStream;
diff --git
a/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java
b/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java
index de5ca13..a2c1c03 100644
---
a/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java
+++
b/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import org.apache.james.util.io.BodyOffsetInputStream;
import org.junit.jupiter.api.Test;
class BodyOffsetInputStreamTest {
diff --git
a/server/container/util/src/test/java/org/apache/james/util/InputStreamUtilsTest.java
b/server/container/util/src/test/java/org/apache/james/util/InputStreamUtilsTest.java
index 7ed1f97..8890feb 100644
---
a/server/container/util/src/test/java/org/apache/james/util/InputStreamUtilsTest.java
+++
b/server/container/util/src/test/java/org/apache/james/util/InputStreamUtilsTest.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
+import org.apache.james.util.io.InputStreamUtils;
import org.junit.jupiter.api.Test;
import com.google.common.primitives.Bytes;
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
index c2e8ff3..c83fdca 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
@@ -114,7 +114,7 @@ import org.apache.james.probe.DataProbe;
import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.util.MimeMessageUtil;
import org.apache.james.util.Port;
-import org.apache.james.util.ZeroedInputStream;
+import org.apache.james.util.io.ZeroedInputStream;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
@@ -132,6 +132,7 @@ import org.junit.experimental.categories.Category;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.io.ByteStreams;
+
import io.restassured.RestAssured;
import io.restassured.builder.RequestSpecBuilder;
import io.restassured.filter.log.LogDetail;
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
index 41a8fe1..b5998c5 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
@@ -51,7 +51,7 @@ import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mime4j.codec.DecoderUtil;
-import org.apache.james.util.InputStreamUtils;
+import org.apache.james.util.io.InputStreamUtils;
import com.google.common.base.CharMatcher;
import com.google.common.base.MoreObjects;
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
index 9fe7661..5266fc7 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
@@ -41,8 +41,8 @@ import org.apache.http.concurrent.FutureCallback;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.james.jmap.AccessToken;
-import org.apache.james.util.CountDownConsumeInputStream;
-import org.apache.james.util.ZeroedInputStream;
+import org.apache.james.util.io.CountDownConsumeInputStream;
+import org.apache.james.util.io.ZeroedInputStream;
import com.google.common.base.CharMatcher;
import com.jayway.jsonpath.DocumentContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
