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 ec3cb6ea43e62b5f9957ac4bb56b4c76710adbfb
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Dec 10 10:01:08 2019 +0700
[Refactoring] Run IntelliJ 'inner class may be static' inspection
---
.../main/java/org/apache/james/mailbox/model/MessageRange.java | 2 +-
.../apache/james/mailbox/cassandra/mail/CassandraACLMapper.java | 4 ++--
.../james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java | 2 +-
.../tools/jpa/migrator/command/IMAP168JpaMigrateCommand.java | 2 +-
.../main/java/org/apache/james/mpt/protocol/ProtocolSession.java | 8 ++++----
.../org/apache/james/imap/decode/parser/ListCommandParser.java | 2 +-
.../org/apache/james/imap/message/request/SetQuotaRequest.java | 2 +-
.../james/imap/processor/fetch/PartialFetchBodyElement.java | 2 +-
.../java/org/apache/james/protocols/pop3/core/TopCmdHandler.java | 2 +-
.../apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java | 2 +-
.../java/org/apache/james/util/bayesian/BayesianAnalyzer.java | 2 +-
.../src/main/java/org/apache/james/transport/mailets/SPF.java | 2 +-
.../org/apache/james/jmap/draft/BypassAuthOnRequestMethod.java | 2 +-
.../apache/james/imapserver/netty/NettyImapRequestLineReader.java | 2 +-
.../java/org/apache/james/lmtpserver/DataLineLMTPHandler.java | 2 +-
.../apache/james/smtpserver/DataLineJamesMessageHookHandler.java | 2 +-
.../src/main/java/org/apache/james/queue/file/FileMailQueue.java | 4 ++--
17 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java
index 533070f..18b0eb3 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java
@@ -205,7 +205,7 @@ public class MessageRange implements Iterable<MessageUid> {
return new RangeIterator(getUidFrom(), getUidTo());
}
- private final class RangeIterator implements Iterator<MessageUid> {
+ private static final class RangeIterator implements Iterator<MessageUid> {
private final long to;
private long current;
diff --git
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
index a81d3d2..c877d9a 100644
---
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
+++
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
@@ -189,7 +189,7 @@ public class CassandraACLMapper {
private Mono<ACLWithVersion> getAclWithVersion(CassandraId cassandraId) {
return getStoredACLRow(cassandraId)
.map(acl -> new
ACLWithVersion(acl.getLong(CassandraACLTable.VERSION),
- deserializeACL(cassandraId,
acl.getString(CassandraACLTable.ACL))));
+ deserializeACL(cassandraId,
acl.getString(CassandraACLTable.ACL))));
}
private MailboxACL deserializeACL(CassandraId cassandraId, String
serializedACL) {
@@ -204,7 +204,7 @@ public class CassandraACLMapper {
}
}
- private class ACLWithVersion {
+ private static class ACLWithVersion {
private final long version;
private final MailboxACL mailboxACL;
diff --git
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
index eeed222..89ae43e 100644
---
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
+++
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
@@ -98,7 +98,7 @@ public class InMemoryCurrentQuotaManager implements
StoreCurrentQuotaManager {
Preconditions.checkArgument(size > 0, "Size should be positive");
}
- class Entry {
+ static class Entry {
private final AtomicLong count;
private final AtomicLong size;
diff --git
a/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/command/IMAP168JpaMigrateCommand.java
b/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/command/IMAP168JpaMigrateCommand.java
index 8f67357..68ea248 100644
---
a/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/command/IMAP168JpaMigrateCommand.java
+++
b/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/command/IMAP168JpaMigrateCommand.java
@@ -75,7 +75,7 @@ public class IMAP168JpaMigrateCommand implements
JpaMigrateCommand {
/**
*
*/
- private class MailboxPath {
+ private static class MailboxPath {
protected String namespace;
protected String userName;
diff --git
a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index e0aad67..fba0684 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -508,7 +508,7 @@ public class ProtocolSession implements ProtocolInteractor {
}
}
- private class ReinitElement implements ProtocolElement {
+ private static class ReinitElement implements ProtocolElement {
private final int sessionNumber;
@@ -602,7 +602,7 @@ public class ProtocolSession implements ProtocolInteractor {
/**
* Allow you to wait a given time at a given point of the test script
*/
- private class WaitElement implements ProtocolElement {
+ private static class WaitElement implements ProtocolElement {
private final long timeToWaitInMs;
@@ -621,7 +621,7 @@ public class ProtocolSession implements ProtocolInteractor {
}
}
- private class AwaitElement implements ProtocolElement {
+ private static class AwaitElement implements ProtocolElement {
private final int sessionNumber;
private AwaitElement(int sessionNumber) {
@@ -642,7 +642,7 @@ public class ProtocolSession implements ProtocolInteractor {
/**
* Allow you to wait a given time at a given point of the test script
*/
- private class LogElement implements ProtocolElement {
+ private static class LogElement implements ProtocolElement {
private final LolLevel level;
private final String message;
diff --git
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
index 93025c6..e97eb96 100644
---
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
+++
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
@@ -60,7 +60,7 @@ public class ListCommandParser extends
AbstractUidCommandParser {
}
}
- private class ListCharValidator extends AtomCharValidator {
+ private static class ListCharValidator extends AtomCharValidator {
@Override
public boolean isValid(char chr) {
if (ImapRequestLineReader.isListWildcard(chr)) {
diff --git
a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
index 32ba642..e353548 100644
---
a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
+++
b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
@@ -33,7 +33,7 @@ import com.google.common.collect.ImmutableList;
*/
public class SetQuotaRequest extends AbstractImapRequest {
- public class ResourceLimit {
+ public static class ResourceLimit {
private final String resource;
private final Long limit;
diff --git
a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
index 29905c0..0915a8d 100644
---
a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
+++
b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
@@ -71,7 +71,7 @@ final class PartialFetchBodyElement implements BodyElement {
return new LimitingInputStream(delegate.getInputStream(), firstOctet,
size());
}
- private final class LimitingInputStream extends FilterInputStream {
+ private static final class LimitingInputStream extends FilterInputStream {
private long pos = 0;
private final long length;
private long offset;
diff --git
a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
index d6c295a..b77f3ff 100644
---
a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
+++
b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
@@ -130,7 +130,7 @@ public class TopCmdHandler extends RetrCmdHandler
implements CapaCapability {
* This {@link InputStream} implementation can be used to return all
message headers
* and limit the body lines which will be read from the wrapped {@link
InputStream}.
*/
- private final class CountingBodyInputStream extends InputStream {
+ private static final class CountingBodyInputStream extends InputStream {
private int count = 0;
private int limit = -1;
diff --git
a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index 622eea9..1c01160 100644
---
a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++
b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -82,7 +82,7 @@ public class AuthCmdHandler
private static final Response AUTH_FAILED = new
SMTPResponse(SMTPRetCode.AUTH_FAILED, "Authentication Failed").immutable();
private static final Response UNKNOWN_AUTH_TYPE = new
SMTPResponse(SMTPRetCode.PARAMETER_NOT_IMPLEMENTED, "Unrecognized
Authentication Type").immutable();
- private abstract class AbstractSMTPLineHandler implements
LineHandler<SMTPSession> {
+ private abstract static class AbstractSMTPLineHandler implements
LineHandler<SMTPSession> {
@Override
public Response onLine(SMTPSession session, ByteBuffer line) {
diff --git
a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
index 3f5df93..bf6391d 100644
---
a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
+++
b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
@@ -142,7 +142,7 @@ public class BayesianAnalyzer {
* <p/>
* It implements Comparable so that it's sorting is automatic.
*/
- private class TokenProbabilityStrength implements
Comparable<TokenProbabilityStrength> {
+ private static class TokenProbabilityStrength implements
Comparable<TokenProbabilityStrength> {
/**
* Message token.
*/
diff --git
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
index 2974067..aa5d922 100644
---
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
+++
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
@@ -94,7 +94,7 @@ public class SPF extends GenericMailet {
}
}
- private class SPFLoggerAdapter implements Logger {
+ private static class SPFLoggerAdapter implements Logger {
private boolean debug = false;
private String name = "SPFLogger";
diff --git
a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/BypassAuthOnRequestMethod.java
b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/BypassAuthOnRequestMethod.java
index da59696..7e48efa 100644
---
a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/BypassAuthOnRequestMethod.java
+++
b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/BypassAuthOnRequestMethod.java
@@ -57,7 +57,7 @@ public class BypassAuthOnRequestMethod implements Filter {
return new InitializedBuilder(this);
}
- public class InitializedBuilder {
+ public static class InitializedBuilder {
private final Builder builder;
private InitializedBuilder(Builder builder) {
diff --git
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
index 2513d6a..759a85f 100644
---
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
+++
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
@@ -115,7 +115,7 @@ public class NettyImapRequestLineReader extends
AbstractNettyImapRequestLineRead
* {@link NettyImapRequestLineReader#read(int, boolean)} if not enough
data is
* readable in the underlying {@link ChannelBuffer}
*/
- public final class NotEnoughDataException extends RuntimeException {
+ public static final class NotEnoughDataException extends RuntimeException {
public static final int UNKNOWN_SIZE = -1;
private final int size;
diff --git
a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
index 6081d33..44fb4dc 100644
---
a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
+++
b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
@@ -88,7 +88,7 @@ public class DataLineLMTPHandler extends
DataLineJamesMessageHookHandler {
}
}
- private final class ReadOnlyMailEnvelope extends MailToMailEnvelopeWrapper
{
+ private static final class ReadOnlyMailEnvelope extends
MailToMailEnvelopeWrapper {
public ReadOnlyMailEnvelope(Mail mail) {
super(mail, null);
diff --git
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
index 8c692e7..67c1125 100644
---
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
+++
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
@@ -224,7 +224,7 @@ public class DataLineJamesMessageHookHandler implements
DataLineFilter, Extensib
return classes;
}
- protected class MailToMailEnvelopeWrapper implements MailEnvelope {
+ protected static class MailToMailEnvelopeWrapper implements MailEnvelope {
private final Mail mail;
private final OutputStream out;
diff --git
a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
index 0bcb954..4f288b3 100644
---
a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
+++
b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
@@ -310,7 +310,7 @@ public class FileMailQueue implements ManageableMailQueue {
}
}
- private final class FileMimeMessageSource extends MimeMessageSource
implements Disposable {
+ private static final class FileMimeMessageSource extends MimeMessageSource
implements Disposable {
private File file;
private final SharedFileInputStream in;
@@ -355,7 +355,7 @@ public class FileMailQueue implements ManageableMailQueue {
/**
* Helper class which is used to reference the path to the object and msg
file
*/
- private final class FileItem {
+ private static final class FileItem {
private final String objectfile;
private final String messagefile;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
