This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 23c4ef489c058caa7599b4f33f189725d8590358 Author: Benoit TELLIER <[email protected]> AuthorDate: Tue Mar 5 07:40:16 2024 +0100 [ENHANCEMENT] Fix warning in AvoidBinaryBodyBufferingBodyFactory --- .../AvoidBinaryBodyBufferingBodyFactory.java | 95 +--------------------- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/mime4j/AvoidBinaryBodyBufferingBodyFactory.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/mime4j/AvoidBinaryBodyBufferingBodyFactory.java index 42abd42f2d..497b0b8d23 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/mime4j/AvoidBinaryBodyBufferingBodyFactory.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/mime4j/AvoidBinaryBodyBufferingBodyFactory.java @@ -63,13 +63,6 @@ public class AvoidBinaryBodyBufferingBodyFactory implements BodyFactory { this(lenient ? Charset.defaultCharset() : null); } - /** - * @return the defaultCharset - */ - public Charset getDefaultCharset() { - return defaultCharset; - } - /** * <p> * Select the Charset for the given <code>mimeCharset</code> string. @@ -91,11 +84,7 @@ public class AvoidBinaryBodyBufferingBodyFactory implements BodyFactory { if (mimeCharset != null) { try { return Charset.forName(mimeCharset); - } catch (UnsupportedCharsetException ex) { - if (defaultCharset == null) { - throw new UnsupportedEncodingException(mimeCharset); - } - } catch (IllegalCharsetNameException ex) { + } catch (UnsupportedCharsetException | IllegalCharsetNameException ex) { if (defaultCharset == null) { throw new UnsupportedEncodingException(mimeCharset); } @@ -136,23 +125,12 @@ public class AvoidBinaryBodyBufferingBodyFactory implements BodyFactory { return textBody(text, Charsets.DEFAULT_CHARSET); } - public BinaryBody binaryBody(final String content, final Charset charset) { - if (content == null) { - throw new IllegalArgumentException("Content may not be null"); - } - return new BinaryBody2(content, charset); - } - public BinaryBody binaryBody(final InputStream is) throws IOException { CountingOutputStream out = new CountingOutputStream(OutputStream.nullOutputStream()); is.transferTo(out); return new FakeBinaryBody(out.getCount()); } - public BinaryBody binaryBody(final byte[] buf) { - return new BinaryBody1(buf); - } - static class StringBody1 extends TextBody { private final String content; @@ -185,10 +163,6 @@ public class AvoidBinaryBodyBufferingBodyFactory implements BodyFactory { this.charset != null ? this.charset : Charsets.DEFAULT_CHARSET); } - @Override - public void dispose() { - } - @Override public SingleBody copy() { return new StringBody1(this.content, this.charset); @@ -237,10 +211,6 @@ public class AvoidBinaryBodyBufferingBodyFactory implements BodyFactory { return content.length; } - @Override - public void dispose() { - } - @Override public SingleBody copy() { return new StringBody2(this.content, this.charset); @@ -300,67 +270,4 @@ public class AvoidBinaryBodyBufferingBodyFactory implements BodyFactory { } } - - static class BinaryBody2 extends BinaryBody { - - private final String content; - private final Charset charset; - - BinaryBody2(final String content, final Charset charset) { - super(); - this.content = content; - this.charset = charset; - } - - @Override - public InputStream getInputStream() throws IOException { - return InputStreams.create(this.content, - this.charset != null ? this.charset : Charsets.DEFAULT_CHARSET); - } - - @Override - public void dispose() { - } - - @Override - public SingleBody copy() { - return new BinaryBody2(this.content, this.charset); - } - - } - - static class BinaryBody1 extends BinaryBody { - - private final byte[] content; - - BinaryBody1(final byte[] content) { - super(); - this.content = content; - } - - @Override - public InputStream getInputStream() throws IOException { - return InputStreams.create(this.content); - } - - @Override - public void writeTo(OutputStream out) throws IOException { - out.write(content); - } - - @Override - public long size() { - return content.length; - } - - @Override - public void dispose() { - } - - @Override - public SingleBody copy() { - return new BinaryBody1(this.content); - } - - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
