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 0be6921d5ca8e565c2c7cc81a1ebc4391d1bf663 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jan 12 10:38:43 2023 +0700 [UPGRADE] Mime4J 0.8.9: use TextBody::getCharset --- .../org/apache/james/util/mime/MessageContentExtractor.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/server/container/util/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java b/server/container/util/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java index 7685f548d1..4be95b89a2 100644 --- a/server/container/util/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java +++ b/server/container/util/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java @@ -20,7 +20,6 @@ package org.apache.james.util.mime; import java.io.IOException; -import java.nio.charset.Charset; import java.util.Objects; import java.util.Optional; import java.util.function.Function; @@ -94,13 +93,9 @@ public class MessageContentExtractor { } private Optional<String> asString(TextBody textBody) throws IOException { - return Optional.ofNullable(IOUtils.toString(textBody.getInputStream(), charset(Optional.ofNullable(textBody.getMimeCharset())))); - } - - private Charset charset(Optional<String> charset) { - return charset - .map(Charset::forName) - .orElse(org.apache.james.mime4j.Charsets.DEFAULT_CHARSET); + return Optional.ofNullable(IOUtils.toString(textBody.getInputStream(), + Optional.ofNullable(textBody.getCharset()) + .orElse(org.apache.james.mime4j.Charsets.DEFAULT_CHARSET))); } private MessageContent retrieveHtmlAndPlainTextContent(Multipart multipart) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
