You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/04/24 02:59:51 UTC
[james-project] 16/17: [Refactoring] replace some calls to
IOUtils.copy by InputStream.transferTo
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 9b7104183e2a861b8fe8b1634639ea0e621f579a
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 21 22:05:11 2020 +0200
[Refactoring] replace some calls to IOUtils.copy by InputStream.transferTo
---
.../main/java/org/apache/james/server/core/MimeMessageUtil.java | 6 ++----
.../main/java/org/apache/james/server/core/MimeMessageWrapper.java | 7 +++----
.../test/java/org/apache/james/mailets/TemporaryJamesServer.java | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
index a30cf93..e68f00f 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
@@ -29,8 +29,6 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;
-import org.apache.commons.io.IOUtils;
-
/**
* Utility class to provide optimized write methods for the various MimeMessage
* implementations.
@@ -162,7 +160,7 @@ public class MimeMessageUtil {
}
try (InputStream input = bis) {
- IOUtils.copy(input, bos);
+ input.transferTo(bos);
}
}
@@ -194,7 +192,7 @@ public class MimeMessageUtil {
*/
public static void writeHeadersTo(Enumeration<String> headers, OutputStream headerOs) throws MessagingException {
try {
- IOUtils.copy(new InternetHeadersInputStream(headers), headerOs);
+ new InternetHeadersInputStream(headers).transferTo(headerOs);
} catch (IOException e) {
throw new MessagingException("Unable to write headers to stream", e);
}
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
index 2d1597c..8af2b86 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
@@ -39,7 +39,6 @@ import javax.mail.internet.InternetHeaders;
import javax.mail.internet.MimeMessage;
import javax.mail.util.SharedByteArrayInputStream;
-import org.apache.commons.io.IOUtils;
import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.lifecycle.api.LifecycleUtil;
@@ -314,8 +313,8 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
myHeaders = headers;
}
Enumeration<String> filteredHeaders = myHeaders.getNonMatchingHeaderLines(ignoreList);
- IOUtils.copy(new InternetHeadersInputStream(filteredHeaders), headerOs);
- IOUtils.copy(in, bodyOs);
+ new InternetHeadersInputStream(filteredHeaders).transferTo(headerOs);
+ in.transferTo(bodyOs);
}
} else {
// save the changes as the message was modified
@@ -330,7 +329,7 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
loadHeaders();
}
Enumeration<String> filteredHeaders = headers.getNonMatchingHeaderLines(ignoreList);
- IOUtils.copy(new InternetHeadersInputStream(filteredHeaders), headerOs);
+ new InternetHeadersInputStream(filteredHeaders).transferTo(headerOs);
if (preLoad && !messageParsed) {
loadMessage();
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index 323d166..524adb7 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -162,7 +162,7 @@ public class TemporaryJamesServer {
private void copyResource(Path resourcesFolder, String resourceName) {
try (OutputStream outputStream = new FileOutputStream(resourcesFolder.resolve(resourceName).toFile())) {
- IOUtils.copy(ClassLoader.getSystemClassLoader().getResource(resourceName).openStream(), outputStream);
+ ClassLoader.getSystemClassLoader().getResource(resourceName).openStream().transferTo(outputStream);
} catch (IOException e) {
throw new RuntimeException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org