You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/05/13 17:55:07 UTC
[sling-org-apache-sling-commons-messaging-mail] 03/04: SLING-10377
Fix nullability annotations for primitive array parameters
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git
commit 0d6a2a84ab3951dba80c982bcd65a6ae50317460
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 13 19:53:54 2021 +0200
SLING-10377 Fix nullability annotations for primitive array parameters
---
.../apache/sling/commons/messaging/mail/MessageBuilder.java | 8 ++++----
.../messaging/mail/internal/SimpleMessageBuilder.java | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java b/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java
index 13533bb..c7181d3 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java
@@ -72,13 +72,13 @@ public interface MessageBuilder {
@NotNull MessageBuilder html(@NotNull final String html);
- @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename);
+ @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename);
- @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers);
+ @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers);
- @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid);
+ @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid);
- @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers);
+ @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers);
@NotNull MimeMessage build() throws MessagingException;
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
index da4e6df..af99121 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
@@ -236,24 +236,24 @@ public class SimpleMessageBuilder implements MessageBuilder {
}
@Override
- public @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename) {
+ public @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename) {
return attachment(content, type, filename, null);
}
@Override
- public @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers) {
+ public @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers) {
final Attachment attachment = new Attachment(content, type, filename, null);
this.attachments.add(attachment);
return this;
}
@Override
- public @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid) {
+ public @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid) {
return inline(content, type, cid, null);
}
@Override
- public @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers) {
+ public @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers) {
final Inline inline = new Inline(content, type, cid, headers);
this.inlines.add(inline);
return this;
@@ -442,7 +442,7 @@ public class SimpleMessageBuilder implements MessageBuilder {
final Header[] headers;
- Attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename, @Nullable final Header[] headers) {
+ Attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename, @Nullable final Header[] headers) {
this.content = content;
this.type = type;
this.filename = filename;
@@ -461,7 +461,7 @@ public class SimpleMessageBuilder implements MessageBuilder {
final Header[] headers;
- Inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid, @Nullable final Header[] headers) {
+ Inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid, @Nullable final Header[] headers) {
this.content = content;
this.type = type;
this.cid = cid;