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 8b821dd731c779f8ef97dd4824833e385ba03d3c Author: Benoit TELLIER <btell...@linagora.com> AuthorDate: Wed Oct 9 09:22:05 2024 +0200 JAMES-2182 NamespaceResponse: rely on collection rather than list --- .../james/imap/encode/NamespaceResponseEncoder.java | 14 ++++++-------- .../james/imap/message/response/NamespaceResponse.java | 15 ++++++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java index 0d045837f3..6a65c45e6f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java @@ -19,6 +19,7 @@ package org.apache.james.imap.encode; import java.io.IOException; +import java.util.Collection; import java.util.List; import org.apache.james.imap.api.ImapConstants; @@ -39,17 +40,14 @@ public class NamespaceResponseEncoder implements ImapResponseEncoder<NamespaceRe composer.untagged(); composer.commandName(ImapConstants.NAMESPACE_COMMAND); - final List<NamespaceResponse.Namespace> personal = response.getPersonal(); - encode(personal, composer); - final List<NamespaceResponse.Namespace> users = response.getUsers(); - encode(users, composer); - final List<NamespaceResponse.Namespace> shared = response.getShared(); - encode(shared, composer); + encode(response.getPersonal(), composer); + encode(response.getUsers(), composer); + encode(response.getShared(), composer); composer.end(); } - private void encode(List<Namespace> namespaces, ImapResponseComposer composer) throws IOException { + private void encode(Collection<Namespace> namespaces, ImapResponseComposer composer) throws IOException { if (namespaces == null || namespaces.isEmpty()) { composer.nil(); } else { @@ -66,7 +64,7 @@ public class NamespaceResponseEncoder implements ImapResponseEncoder<NamespaceRe String prefix = namespace.getPrefix(); String delimiter = Character.toString(namespace.getDelimiter()); - if (prefix.length() > 0) { + if (!prefix.isEmpty()) { prefix = prefix + delimiter; } composer.quote(prefix); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java index 6c20bd019a..837afecdc7 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.james.imap.message.response; +import java.util.Collection; import java.util.List; import java.util.Objects; @@ -27,11 +28,11 @@ import org.apache.james.imap.api.message.response.ImapResponseMessage; * Describes a NAMESPACE response. */ public class NamespaceResponse implements ImapResponseMessage { - private final List<Namespace> personal; - private final List<Namespace> users; - private final List<Namespace> shared; + private final Collection<Namespace> personal; + private final Collection<Namespace> users; + private final Collection<Namespace> shared; - public NamespaceResponse(List<Namespace> personal, List<Namespace> users, List<Namespace> shared) { + public NamespaceResponse(Collection<Namespace> personal, Collection<Namespace> users, Collection<Namespace> shared) { this.personal = personal; this.users = users; this.shared = shared; @@ -42,7 +43,7 @@ public class NamespaceResponse implements ImapResponseMessage { * * @return possibly null */ - public List<Namespace> getPersonal() { + public Collection<Namespace> getPersonal() { return personal; } @@ -51,7 +52,7 @@ public class NamespaceResponse implements ImapResponseMessage { * * @return possibly null */ - public List<Namespace> getShared() { + public Collection<Namespace> getShared() { return shared; } @@ -60,7 +61,7 @@ public class NamespaceResponse implements ImapResponseMessage { * * @return possibly null */ - public List<Namespace> getUsers() { + public Collection<Namespace> getUsers() { return users; } --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org