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 0aa76bb21c5a168411f7eb91d67ef9bd4f83c05a Author: Matthieu Baechler <[email protected]> AuthorDate: Wed Mar 25 12:04:02 2020 +0100 [Refactoring] instanceof is always false for null, remove duplicate checks --- mailbox/api/src/main/java/org/apache/james/mailbox/model/Quota.java | 2 +- .../main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java | 2 +- .../java/org/apache/james/imap/decode/parser/UidCommandParser.java | 2 +- .../main/java/org/apache/james/util/mime/MessageContentExtractor.java | 2 +- .../src/main/java/org/apache/james/jmap/api/access/AccessToken.java | 3 +-- .../james/dnsservice/library/inetnetwork/model/Inet4Network.java | 2 +- .../james/dnsservice/library/inetnetwork/model/Inet6Network.java | 2 +- .../org/apache/james/queue/activemq/ActiveMQCacheableMailQueue.java | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Quota.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Quota.java index 0a2c75c..5d1ed44 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Quota.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Quota.java @@ -137,7 +137,7 @@ public class Quota<T extends QuotaLimitValue<T>, U extends QuotaUsageValue<U, T> @Override public boolean equals(Object o) { - if (o == null || ! (o instanceof Quota)) { + if (!(o instanceof Quota)) { return false; } Quota<?, ?> other = (Quota<?, ?>) o; diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java index 1601631..777edf3 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java @@ -78,7 +78,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM } if (e instanceof RollbackException) { Throwable t = e.getCause(); - if (t != null && t instanceof EntityExistsException) { + if (t instanceof EntityExistsException) { throw new MailboxExistsException(lastMailboxName); } } diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java index abfb501..fda9287 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java @@ -55,7 +55,7 @@ public class UidCommandParser extends AbstractImapCommandParser { String commandName = request.atom(); ImapCommandParser helperCommand = parserFactory.getParser(commandName); // TODO: replace abstract class with interface - if (helperCommand == null || !(helperCommand instanceof AbstractUidCommandParser)) { + if (!(helperCommand instanceof AbstractUidCommandParser)) { throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Invalid UID command: '" + commandName + "'"); } LOGGER.debug("Got <command>: UID {}", commandName); 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 32b436a..454d3d0 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 @@ -231,7 +231,7 @@ public class MessageContentExtractor { @Override public boolean equals(Object other) { - if (other == null || !(other instanceof MessageContent)) { + if (!(other instanceof MessageContent)) { return false; } MessageContent otherMessageContent = (MessageContent)other; diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java index 6021bc1..aeb699b 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java @@ -54,8 +54,7 @@ public class AccessToken { @Override public boolean equals(Object o) { - return o != null - && o instanceof AccessToken + return o instanceof AccessToken && Objects.equals(this.token, ((AccessToken)o).token); } diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java index 857aa37..72a0f35 100644 --- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java +++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java @@ -75,7 +75,7 @@ public class Inet4Network implements InetNetwork { @Override public boolean equals(Object obj) { - return (obj != null) && (obj instanceof InetNetwork) && ((((Inet4Network) obj).network.equals(network)) && (((Inet4Network) obj).netmask.equals(netmask))); + return (obj instanceof InetNetwork) && ((((Inet4Network) obj).network.equals(network)) && (((Inet4Network) obj).netmask.equals(netmask))); } private static InetAddress maskIP(InetAddress ip, InetAddress mask) { diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java index c046a67..addc3db 100644 --- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java +++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java @@ -73,7 +73,7 @@ public class Inet6Network implements InetNetwork { @Override public boolean equals(Object obj) { - return (obj != null) && (obj instanceof InetNetwork) && ((((Inet6Network) obj).network.equals(network)) && (((Inet6Network) obj).netmask.equals(netmask))); + return (obj instanceof InetNetwork) && ((((Inet6Network) obj).network.equals(network)) && (((Inet6Network) obj).netmask.equals(netmask))); } private static InetAddress maskIP(InetAddress ip, Integer mask) { diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQCacheableMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQCacheableMailQueue.java index 5d7bf03..2a5e58a 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQCacheableMailQueue.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQCacheableMailQueue.java @@ -207,7 +207,7 @@ public class ActiveMQCacheableMailQueue extends JMSCacheableMailQueue implements super.produceMail(props, msgPrio, mail); } } catch (JMSException e) { - if (!reuse && blobMessage != null && blobMessage instanceof ActiveMQBlobMessage) { + if (!reuse && blobMessage instanceof ActiveMQBlobMessage) { ((ActiveMQBlobMessage) blobMessage).deleteFile(); } throw e; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
