Author: matthieu Date: Tue Jan 26 10:24:54 2016 New Revision: 1726760 URL: http://svn.apache.org/viewvc?rev=1726760&view=rev Log: JAMES-1669 remove useless qualifiers in interface declarations
Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/RequestAware.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxByPathCache.java james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNames.java james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRImapConstants.java james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapperFactory.java james/project/trunk/mailet/ai/src/main/java/org/apache/james/ai/classic/SystemContext.java james/project/trunk/mailet/api/src/main/java/org/apache/mailet/MailetContext.java james/project/trunk/mailet/base/src/main/java/org/apache/mailet/base/SimplifiedDateFormat.java james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/KeyHolder.java james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEAttributeNames.java james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Continuation.java james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Session.java james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConstants.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/display/Localizer.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/ImapRequest.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponseFactory.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapLineHandler.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapProcessor.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/DelegatingImapCommandParser.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapCommandParserFactory.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoder.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoderFactory.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapEncoderFactory.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/message/response/FetchResponse.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/message/response/Literal.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityImplementingProcessor.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/processor/PermitEnableCapabilityProcessor.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java james/project/trunk/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/hook/DeliverToRecipientHook.java james/project/trunk/protocols/netty/src/main/java/org/apache/james/protocols/netty/HandlerConstants.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java james/project/trunk/server/container/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java james/project/trunk/server/container/util/src/main/java/org/apache/james/util/retry/api/ExceptionRetryingProxy.java james/project/trunk/server/container/util/src/main/java/org/apache/james/util/retry/api/RetryHandler.java james/project/trunk/server/container/util/src/main/java/org/apache/james/util/retry/api/RetrySchedule.java james/project/trunk/server/data/data-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/def/HDomainList.java james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/def/HRecipientRewriteTable.java james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/def/HUsersRepository.java james/project/trunk/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/api/LdapConstants.java james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/api/ContinuationTokenManager.java james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Method.java james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/handler/ProtocolHandlerLoader.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SMTPConstants.java james/project/trunk/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQSupport.java james/project/trunk/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailPrioritySupport.java james/project/trunk/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java james/project/trunk/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java james/project/trunk/server/queue/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSSupport.java Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java Tue Jan 26 10:24:54 2016 @@ -61,7 +61,7 @@ public interface MailboxListener { * A mailbox event. */ @SuppressWarnings("serial") - public abstract class Event implements Serializable { + abstract class Event implements Serializable { private final MailboxSession session; private final MailboxPath path; @@ -93,7 +93,7 @@ public interface MailboxListener { /** * Indicates that mailbox has been deleted. */ - public class MailboxDeletion extends Event { + class MailboxDeletion extends Event { /** * @@ -108,7 +108,7 @@ public interface MailboxListener { /** * Indicates that a mailbox has been Added. */ - public class MailboxAdded extends Event { + class MailboxAdded extends Event { /** * */ @@ -122,7 +122,7 @@ public interface MailboxListener { /** * Indicates that a mailbox has been renamed. */ - public abstract class MailboxRenamed extends Event { + abstract class MailboxRenamed extends Event { /** * */ @@ -144,7 +144,7 @@ public interface MailboxListener { /** * A mailbox event related to updated ACL */ - public abstract class MailboxACLUpdated extends MessageEvent { + abstract class MailboxACLUpdated extends MessageEvent { /** * @@ -161,7 +161,7 @@ public interface MailboxListener { /** * A mailbox event related to a message. */ - public abstract class MessageEvent extends Event { + abstract class MessageEvent extends Event { /** * @@ -180,7 +180,7 @@ public interface MailboxListener { public abstract List<Long> getUids(); } - public abstract class MetaDataHoldingEvent extends MessageEvent { + abstract class MetaDataHoldingEvent extends MessageEvent { public MetaDataHoldingEvent(MailboxSession session, MailboxPath path) { super(session, path); @@ -195,7 +195,7 @@ public interface MailboxListener { } - public abstract class Expunged extends MetaDataHoldingEvent { + abstract class Expunged extends MetaDataHoldingEvent { /** * @@ -217,7 +217,7 @@ public interface MailboxListener { /** * A mailbox event related to updated flags */ - public abstract class FlagsUpdated extends MessageEvent { + abstract class FlagsUpdated extends MessageEvent { /** * @@ -234,7 +234,7 @@ public interface MailboxListener { /** * A mailbox event related to added message */ - public abstract class Added extends MetaDataHoldingEvent { + abstract class Added extends MetaDataHoldingEvent { /** * Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java Tue Jan 26 10:24:54 2016 @@ -263,7 +263,7 @@ public interface MailboxManager extends * mailbox; false otherwise. * @throws MailboxException */ - public boolean hasRight(MailboxPath mailboxPath, MailboxACL.MailboxACLRight right, MailboxSession session) throws MailboxException; + boolean hasRight(MailboxPath mailboxPath, MailboxACL.MailboxACLRight right, MailboxSession session) throws MailboxException; /** * Returns the rights applicable to the user who has sent the current @@ -276,7 +276,7 @@ public interface MailboxManager extends * {@code session.getUser()} is null. * @throws UnsupportedRightException */ - public abstract MailboxACL.MailboxACLRights myRights(MailboxPath mailboxPath, MailboxSession session) throws MailboxException; + MailboxACL.MailboxACLRights myRights(MailboxPath mailboxPath, MailboxSession session) throws MailboxException; /** * Computes a result suitable for the LISTRIGHTS IMAP command. The result is @@ -300,7 +300,7 @@ public interface MailboxManager extends * @return result suitable for the LISTRIGHTS IMAP command * @throws UnsupportedRightException */ - public MailboxACL.MailboxACLRights[] listRigths(MailboxPath mailboxPath, MailboxACL.MailboxACLEntryKey identifier, MailboxSession session) throws MailboxException; + MailboxACL.MailboxACLRights[] listRigths(MailboxPath mailboxPath, MailboxACL.MailboxACLEntryKey identifier, MailboxSession session) throws MailboxException; /** * Update the Mailbox ACL of the designated mailbox. We can either ADD REPLACE or REMOVE entries. Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java Tue Jan 26 10:24:54 2016 @@ -36,7 +36,7 @@ public interface MailboxPathLocker { * @deprecated use {@link #executeWithLock(MailboxSession, MailboxPath, LockAwareExecution, boolean)} with argument <code>true</code> */ @Deprecated - public <T> T executeWithLock(MailboxSession session, MailboxPath path, LockAwareExecution<T> execution) throws MailboxException; + <T> T executeWithLock(MailboxSession session, MailboxPath path, LockAwareExecution<T> execution) throws MailboxException; /** @@ -51,19 +51,19 @@ public interface MailboxPathLocker { * * @throws MailboxException */ - public <T> T executeWithLock(MailboxSession session, MailboxPath path, LockAwareExecution<T> execution, boolean writeLock) throws MailboxException; + <T> T executeWithLock(MailboxSession session, MailboxPath path, LockAwareExecution<T> execution, boolean writeLock) throws MailboxException; /** * Execute code while holding a lock */ - public interface LockAwareExecution<T> { + interface LockAwareExecution<T> { /** * Execute code block * * @throws MailboxException */ - public T execute() throws MailboxException; + T execute() throws MailboxException; } } Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java Tue Jan 26 10:24:54 2016 @@ -35,9 +35,9 @@ public interface MailboxSession { /** * Id which will be used for a System session */ - public final static long SYSTEM_SESSION_ID = 0L; + long SYSTEM_SESSION_ID = 0L; - public static enum SessionType { + enum SessionType { /** * Session was created via the System */ @@ -92,7 +92,7 @@ public interface MailboxSession { /** * A mailbox user. Useful for specialist mailbox implementation. */ - public interface User { + interface User { /** * Gets the name of the user. * Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java Tue Jan 26 10:24:54 2016 @@ -184,7 +184,7 @@ public interface MessageManager { /** * Meta data about the current state of the mailbox. */ - public interface MetaData { + interface MetaData { /** * Describes the optional data types which will get set in the @@ -193,7 +193,7 @@ public interface MessageManager { * These are always set: - HIGHESTMODSEQ - PERMANENTFLAGS - UIDNEXT - * UIDVALIDITY - MODSEQPERMANET - WRITABLE */ - public enum FetchGroup { + enum FetchGroup { /** * Only include the message and recent count Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/RequestAware.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/RequestAware.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/RequestAware.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/RequestAware.java Tue Jan 26 10:24:54 2016 @@ -29,7 +29,7 @@ public interface RequestAware { * * @param session */ - public void startProcessingRequest(MailboxSession session); + void startProcessingRequest(MailboxSession session); /** * End the processing of a request for the given MailboxSession. If the user @@ -37,5 +37,5 @@ public interface RequestAware { * * @param session */ - public void endProcessingRequest(MailboxSession session); + void endProcessingRequest(MailboxSession session); } Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java Tue Jan 26 10:24:54 2016 @@ -40,7 +40,7 @@ public interface SubscriptionManager ext * @throws SubscriptionException * when subscription fails */ - public void subscribe(MailboxSession session, String mailbox) throws SubscriptionException; + void subscribe(MailboxSession session, String mailbox) throws SubscriptionException; /** * Finds all subscriptions for the user in the session. @@ -51,7 +51,7 @@ public interface SubscriptionManager ext * @throws SubscriptionException * when subscriptions cannot be read */ - public Collection<String> subscriptions(MailboxSession session) throws SubscriptionException; + Collection<String> subscriptions(MailboxSession session) throws SubscriptionException; /** * Unsubscribes the user in the session from the given mailbox. @@ -63,6 +63,6 @@ public interface SubscriptionManager ext * @throws SubscriptionException * when subscriptions cannot be read */ - public void unsubscribe(MailboxSession session, String mailbox) throws SubscriptionException; + void unsubscribe(MailboxSession session, String mailbox) throws SubscriptionException; } Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java Tue Jan 26 10:24:54 2016 @@ -56,7 +56,7 @@ public interface MailboxACLResolver { * @return * @throws UnsupportedRightException */ - public MailboxACL applyGlobalACL(MailboxACL resourceACL, boolean resourceOwnerIsGroup) throws UnsupportedRightException; + MailboxACL applyGlobalACL(MailboxACL resourceACL, boolean resourceOwnerIsGroup) throws UnsupportedRightException; /** * Tells whether the given user has the given right granted on the basis of @@ -125,7 +125,7 @@ public interface MailboxACLResolver { * @return * @throws UnsupportedRightException */ - public abstract boolean isReadWrite(MailboxACLRights mailboxACLRights, Flags sharedFlags) throws UnsupportedRightException; + boolean isReadWrite(MailboxACLRights mailboxACLRights, Flags sharedFlags) throws UnsupportedRightException; /** * Computes a result suitable for the LISTRIGHTS IMAP command. The result is @@ -148,7 +148,7 @@ public interface MailboxACLResolver { * of rights which can be set for the given identifier and resource. * @throws UnsupportedRightException */ - public MailboxACLRights[] listRights(final MailboxACLEntryKey key, final GroupMembershipResolver groupMembershipResolver, final String resourceOwner, final boolean resourceOwnerIsGroup) throws UnsupportedRightException; + MailboxACLRights[] listRights(final MailboxACLEntryKey key, final GroupMembershipResolver groupMembershipResolver, final String resourceOwner, final boolean resourceOwnerIsGroup) throws UnsupportedRightException; /** * Computes the rights which apply to the given user and resource. Global @@ -173,6 +173,6 @@ public interface MailboxACLResolver { * @return the rights applicable for the given user and resource. * @throws UnsupportedRightException */ - public abstract MailboxACLRights resolveRights(String requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException; + MailboxACLRights resolveRights(String requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException; } Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java Tue Jan 26 10:24:54 2016 @@ -47,7 +47,7 @@ public interface MailboxACL { * {@link #isNegative()} are significant. * */ - public interface MailboxACLEntryKey { + interface MailboxACLEntryKey { /** * Returns the name of a user or of a group to which this * {@link MailboxACLEntryKey} applies. @@ -111,7 +111,7 @@ public interface MailboxACL { /** * Single right applicable to a mailbox. */ - public interface MailboxACLRight { + interface MailboxACLRight { /** * Returns the char representation of this right. * @@ -129,7 +129,7 @@ public interface MailboxACL { * Implementations must not allow adding or removing of elements once this * MailboxACLRights are initialized. */ - public interface MailboxACLRights extends Iterable<MailboxACLRight> { + interface MailboxACLRights extends Iterable<MailboxACLRight> { /** * Tells whether this contains the given right. @@ -156,14 +156,14 @@ public interface MailboxACL { * @return * @throws UnsupportedRightException */ - public MailboxACLRights except(MailboxACLRights toRemove) throws UnsupportedRightException; + MailboxACLRights except(MailboxACLRights toRemove) throws UnsupportedRightException; /** * Tells if this set of rights is empty. * * @return true if there are no rights in this set; false otherwise. */ - public boolean isEmpty(); + boolean isEmpty(); /** * Tells whether the implementation supports the given right. @@ -197,7 +197,7 @@ public interface MailboxACL { * @throws UnsupportedRightException * */ - public abstract MailboxACLRights union(MailboxACLRights toAdd) throws UnsupportedRightException; + MailboxACLRights union(MailboxACLRights toAdd) throws UnsupportedRightException; }; @@ -206,7 +206,7 @@ public interface MailboxACL { * {@link SpecialName}). */ - public interface MailboxACLCommand { + interface MailboxACLCommand { MailboxACLEntryKey getEntryKey(); EditMode getEditMode(); @@ -228,26 +228,26 @@ public interface MailboxACL { /** * SETACL third argument prefix */ - public static final char ADD_RIGHTS_MARKER = '+'; + char ADD_RIGHTS_MARKER = '+'; /** * Marks groups when (de)serializing {@link MailboxACLEntryKey}s. * * @see MailboxACLEntryKey#serialize() */ - public static final char DEFAULT_GROUP_MARKER = '$'; + char DEFAULT_GROUP_MARKER = '$'; /** * Marks negative when (de)serializing {@link MailboxACLEntryKey}s. * * @see MailboxACLEntryKey#serialize() */ - public static final char DEFAULT_NEGATIVE_MARKER = '-'; + char DEFAULT_NEGATIVE_MARKER = '-'; /** * SETACL third argument prefix */ - public static final char REMOVE_RIGHTS_MARKER = '-'; + char REMOVE_RIGHTS_MARKER = '-'; /** * Apply the given ACL update on current ACL and return the result as a new ACL. Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java Tue Jan 26 10:24:54 2016 @@ -29,15 +29,15 @@ public interface MailboxConstants { /** * The char which is used to prefix a namespace */ - public static final char NAMESPACE_PREFIX_CHAR = '#'; + char NAMESPACE_PREFIX_CHAR = '#'; /** The namespace used for store user inboxes */ - public static final String USER_NAMESPACE = NAMESPACE_PREFIX_CHAR + "private"; + String USER_NAMESPACE = NAMESPACE_PREFIX_CHAR + "private"; /** The default delimiter used to seperated parent/child folders */ - public static final char DEFAULT_DELIMITER = '.'; + char DEFAULT_DELIMITER = '.'; /** The name of the INBOX */ - public static final String INBOX = "INBOX"; + String INBOX = "INBOX"; } Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java Tue Jan 26 10:24:54 2016 @@ -25,7 +25,7 @@ package org.apache.james.mailbox.model; public interface MailboxMetaData { /** RFC3501 Selectability flag */ - public enum Selectability { + enum Selectability { NONE, MARKED, UNMARKED, NOSELECT } @@ -33,7 +33,7 @@ public interface MailboxMetaData { * Indicates whether this mailbox allows children and - if so - whether it * has any. */ - public enum Children { + enum Children { /** * No children allowed. */ Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java Tue Jan 26 10:24:54 2016 @@ -59,28 +59,28 @@ public interface MessageResult extends C /** * Indicates the results fetched. */ - public interface FetchGroup { + interface FetchGroup { /** * For example: could have best performance when doing store and then * forget. UIDs are always returned */ - public static final int MINIMAL = 0x00; + int MINIMAL = 0x00; /** * */ - public static final int MIME_DESCRIPTOR = 0x01; + int MIME_DESCRIPTOR = 0x01; - public static final int HEADERS = 0x100; + int HEADERS = 0x100; - public static final int FULL_CONTENT = 0x200; + int FULL_CONTENT = 0x200; - public static final int BODY_CONTENT = 0x400; + int BODY_CONTENT = 0x400; - public static final int MIME_HEADERS = 0x800; + int MIME_HEADERS = 0x800; - public static final int MIME_CONTENT = 0x1000; + int MIME_CONTENT = 0x1000; /** * Contents to be fetched. Composed bitwise. @@ -110,7 +110,7 @@ public interface MessageResult extends C * implementations MUST implement equals. Two implementations are equal * if and only if their paths are equal. */ - public interface PartContentDescriptor { + interface PartContentDescriptor { /** * Contents to be fetched. Composed bitwise. * @@ -163,7 +163,7 @@ public interface MessageResult extends C /** * A header. */ - public interface Header extends Content { + interface Header extends Content { /** * Gets the name of this header. @@ -248,7 +248,7 @@ public interface MessageResult extends C * must implement equals. Two paths are equal if and only if each position * is identical. */ - public interface MimePath { + interface MimePath { /** * Gets the positions of each part in the path. Modified: james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java (original) +++ james/project/trunk/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java Tue Jan 26 10:24:54 2016 @@ -39,6 +39,6 @@ public interface MessageResultIterator e * * @return exception */ - public MailboxException getException(); + MailboxException getException(); } Modified: james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxByPathCache.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxByPathCache.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxByPathCache.java (original) +++ james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxByPathCache.java Tue Jan 26 10:24:54 2016 @@ -14,13 +14,13 @@ import org.apache.james.mailbox.store.ma */ public interface MailboxByPathCache<Id extends MailboxId> { - public abstract Mailbox<Id> findMailboxByPath(MailboxPath mailboxName, - MailboxMapper<Id> underlying) throws MailboxNotFoundException, + Mailbox<Id> findMailboxByPath(MailboxPath mailboxName, + MailboxMapper<Id> underlying) throws MailboxNotFoundException, MailboxException; - public abstract void invalidate(Mailbox<Id> mailbox); + void invalidate(Mailbox<Id> mailbox); - public abstract void invalidate(MailboxPath mailboxPath); + void invalidate(MailboxPath mailboxPath); // for the purpose of cascading the invalidations; does it make sense? //public void connectTo(MailboxMetadataCache<Id> mailboxMetadataCache); Modified: james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java (original) +++ james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java Tue Jan 26 10:24:54 2016 @@ -13,22 +13,22 @@ import org.apache.james.mailbox.store.ma */ public interface MailboxMetadataCache<Id extends MailboxId> { - public abstract long countMessagesInMailbox(Mailbox<Id> mailbox, - MessageMapper<Id> underlying) throws MailboxException; + long countMessagesInMailbox(Mailbox<Id> mailbox, + MessageMapper<Id> underlying) throws MailboxException; - public abstract long countUnseenMessagesInMailbox(Mailbox<Id> mailbox, - MessageMapper<Id> underlying) throws MailboxException; + long countUnseenMessagesInMailbox(Mailbox<Id> mailbox, + MessageMapper<Id> underlying) throws MailboxException; - public abstract Long findFirstUnseenMessageUid(Mailbox<Id> mailbox, - MessageMapper<Id> underlying) throws MailboxException; + Long findFirstUnseenMessageUid(Mailbox<Id> mailbox, + MessageMapper<Id> underlying) throws MailboxException; - public abstract long getLastUid(Mailbox<Id> mailbox, - MessageMapper<Id> underlying) throws MailboxException; + long getLastUid(Mailbox<Id> mailbox, + MessageMapper<Id> underlying) throws MailboxException; - public abstract long getHighestModSeq(Mailbox<Id> mailbox, - MessageMapper<Id> underlying) throws MailboxException; + long getHighestModSeq(Mailbox<Id> mailbox, + MessageMapper<Id> underlying) throws MailboxException; - public abstract void invalidate(Mailbox<Id> mailbox); + void invalidate(Mailbox<Id> mailbox); // public abstract void invalidate(MailboxPath mailboxPath); Modified: james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNames.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNames.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNames.java (original) +++ james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNames.java Tue Jan 26 10:24:54 2016 @@ -39,46 +39,46 @@ public interface HBaseNames { /** * The HBase table name for storing mailbox names */ - public static final String MAILBOXES = "JAMES_MAILBOXES"; - public static final byte[] MAILBOXES_TABLE = Bytes.toBytes(MAILBOXES); + String MAILBOXES = "JAMES_MAILBOXES"; + byte[] MAILBOXES_TABLE = Bytes.toBytes(MAILBOXES); /** Default mailbox column family */ - public static final byte[] MAILBOX_CF = Bytes.toBytes("D"); + byte[] MAILBOX_CF = Bytes.toBytes("D"); /** HBase column qualifiers: field names stored as byte arrays*/ - public static final byte[] MAILBOX_NAME = Bytes.toBytes("name"); - public static final byte[] MAILBOX_USER = Bytes.toBytes("user"); - public static final byte[] MAILBOX_NAMESPACE = Bytes.toBytes("namespace"); - public static final byte[] MAILBOX_LASTUID = Bytes.toBytes("lastUID"); - public static final byte[] MAILBOX_UIDVALIDITY = Bytes.toBytes("uidValidity"); - public static final byte[] MAILBOX_HIGHEST_MODSEQ = Bytes.toBytes("hModSeq"); - public static final byte[] MAILBOX_MESSAGE_COUNT = Bytes.toBytes("count"); + byte[] MAILBOX_NAME = Bytes.toBytes("name"); + byte[] MAILBOX_USER = Bytes.toBytes("user"); + byte[] MAILBOX_NAMESPACE = Bytes.toBytes("namespace"); + byte[] MAILBOX_LASTUID = Bytes.toBytes("lastUID"); + byte[] MAILBOX_UIDVALIDITY = Bytes.toBytes("uidValidity"); + byte[] MAILBOX_HIGHEST_MODSEQ = Bytes.toBytes("hModSeq"); + byte[] MAILBOX_MESSAGE_COUNT = Bytes.toBytes("count"); /** The HBase table name for storing subscriptions */ - public static final String SUBSCRIPTIONS = "JAMES_SUBSCRIPTIONS"; + String SUBSCRIPTIONS = "JAMES_SUBSCRIPTIONS"; /** The HBase table name for storing subscriptions */ - public static final byte[] SUBSCRIPTIONS_TABLE = Bytes.toBytes(SUBSCRIPTIONS); + byte[] SUBSCRIPTIONS_TABLE = Bytes.toBytes(SUBSCRIPTIONS); /** Default subscription column family */ - public static final byte[] SUBSCRIPTION_CF = Bytes.toBytes("D"); + byte[] SUBSCRIPTION_CF = Bytes.toBytes("D"); /** The HBase table name for storing messages */ - public static final String MESSAGES = "JAMES_MESSAGES"; + String MESSAGES = "JAMES_MESSAGES"; /** The HBase table name for storing messages */ - public static final byte[] MESSAGES_TABLE = Bytes.toBytes(MESSAGES); + byte[] MESSAGES_TABLE = Bytes.toBytes(MESSAGES); /** Column family for storing message meta information*/ - public static final byte[] MESSAGES_META_CF = Bytes.toBytes("M"); + byte[] MESSAGES_META_CF = Bytes.toBytes("M"); /** Column family for storing message headers*/ - public static final byte[] MESSAGE_DATA_HEADERS_CF = Bytes.toBytes("H"); + byte[] MESSAGE_DATA_HEADERS_CF = Bytes.toBytes("H"); /** Column family for storing message body*/ - public static final byte[] MESSAGE_DATA_BODY_CF = Bytes.toBytes("B"); - public static final String PREFIX_META = "m:"; - public static final byte[] PREFIX_META_B = Bytes.toBytes(PREFIX_META); + byte[] MESSAGE_DATA_BODY_CF = Bytes.toBytes("B"); + String PREFIX_META = "m:"; + byte[] PREFIX_META_B = Bytes.toBytes(PREFIX_META); /** kept sorted */ - public static final byte[] MESSAGE_BODY_OCTETS = Bytes.toBytes(PREFIX_META + "body"); - public static final byte[] MESSAGE_CONTENT_OCTETS = Bytes.toBytes(PREFIX_META + "content"); - public static final byte[] MESSAGE_INTERNALDATE = Bytes.toBytes(PREFIX_META + "date"); - public static final byte[] MESSAGE_TEXT_LINE_COUNT = Bytes.toBytes(PREFIX_META + "lcount"); - public static final byte[] MESSAGE_MODSEQ = Bytes.toBytes(PREFIX_META + "mseq"); - public static final byte[] MESSAGE_MEDIA_TYPE = Bytes.toBytes(PREFIX_META + "mtype"); - public static final byte[] MESSAGE_SUB_TYPE = Bytes.toBytes(PREFIX_META + "stype"); - public static final byte[] MARKER_PRESENT = Bytes.toBytes("X"); - public static final byte[] MARKER_MISSING = Bytes.toBytes(" "); + byte[] MESSAGE_BODY_OCTETS = Bytes.toBytes(PREFIX_META + "body"); + byte[] MESSAGE_CONTENT_OCTETS = Bytes.toBytes(PREFIX_META + "content"); + byte[] MESSAGE_INTERNALDATE = Bytes.toBytes(PREFIX_META + "date"); + byte[] MESSAGE_TEXT_LINE_COUNT = Bytes.toBytes(PREFIX_META + "lcount"); + byte[] MESSAGE_MODSEQ = Bytes.toBytes(PREFIX_META + "mseq"); + byte[] MESSAGE_MEDIA_TYPE = Bytes.toBytes(PREFIX_META + "mtype"); + byte[] MESSAGE_SUB_TYPE = Bytes.toBytes(PREFIX_META + "stype"); + byte[] MARKER_PRESENT = Bytes.toBytes("X"); + byte[] MARKER_MISSING = Bytes.toBytes(" "); // the maximum recomended HBase column size is 10 MB - public static final int MAX_COLUMN_SIZE = 1024; //2 * 1024 * 1024; + int MAX_COLUMN_SIZE = 1024; //2 * 1024 * 1024; } Modified: james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRImapConstants.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRImapConstants.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRImapConstants.java (original) +++ james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRImapConstants.java Tue Jan 26 10:24:54 2016 @@ -28,6 +28,6 @@ public interface JCRImapConstants { /** * Delimiter for Nodes */ - public static final String NODE_DELIMITER = "/"; + String NODE_DELIMITER = "/"; } Modified: james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java (original) +++ james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java Tue Jan 26 10:24:54 2016 @@ -31,20 +31,20 @@ public interface Persistent { * * @param node */ - public void merge(Node node) throws RepositoryException, IOException; + void merge(Node node) throws RepositoryException, IOException; /** * Return underlying Node * * @return node */ - public Node getNode(); + Node getNode(); /** * Return if the object is persistent * * @return <code>true</code> if object is persistent else <code>false</code> */ - public boolean isPersistent(); + boolean isPersistent(); } Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java Tue Jan 26 10:24:54 2016 @@ -185,7 +185,7 @@ public interface MessageMapper<Id extend * * */ - public static enum FetchType { + enum FetchType { /** * Fetch only the meta data of the {@link MailboxMessage} which includes: Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java Tue Jan 26 10:24:54 2016 @@ -44,7 +44,7 @@ public interface ModSeqProvider<Id exten * @return modSeq * @throws MailboxException */ - public long nextModSeq(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; + long nextModSeq(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; /** * Return the highest mod-sequence which were used for the {@link Mailbox} @@ -54,5 +54,5 @@ public interface ModSeqProvider<Id exten * @return highest * @throws MailboxException */ - public long highestModSeq(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; + long highestModSeq(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; } Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java Tue Jan 26 10:24:54 2016 @@ -42,7 +42,7 @@ public interface UidProvider<Id extends * @return nextUid * @throws MailboxException */ - public long nextUid(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; + long nextUid(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; /** * Return the last uid which were used for storing a MailboxMessage in the {@link Mailbox} @@ -52,5 +52,5 @@ public interface UidProvider<Id extends * @return lastUid * @throws MailboxException */ - public long lastUid(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; + long lastUid(MailboxSession session, Mailbox<Id> mailbox) throws MailboxException; } Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java Tue Jan 26 10:24:54 2016 @@ -30,7 +30,7 @@ public interface Mapper { /** * IMAP Request was complete. Cleanup all Request scoped stuff */ - public void endRequest(); + void endRequest(); /** * Execute the given Transaction @@ -38,24 +38,24 @@ public interface Mapper { * @param transaction * @throws MailboxException */ - public <T> T execute(Transaction<T> transaction) throws MailboxException; + <T> T execute(Transaction<T> transaction) throws MailboxException; /** * Unit of work executed in a Transaction * */ - public interface Transaction<T> { + interface Transaction<T> { /** * Run unit of work in a Transaction and return a value * * @throws MailboxException */ - public T run() throws MailboxException; + T run() throws MailboxException; } - public abstract class VoidTransaction implements Transaction<Void> { + abstract class VoidTransaction implements Transaction<Void> { public final Void run() throws MailboxException { runVoid(); Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java Tue Jan 26 10:24:54 2016 @@ -38,25 +38,25 @@ public interface SubscriptionMapper exte * @return <code>Subscription</code>, * or null when the user is not subscribed to the given mailbox */ - public abstract Subscription findMailboxSubscriptionForUser( - final String user, final String mailbox) throws SubscriptionException; + Subscription findMailboxSubscriptionForUser( + final String user, final String mailbox) throws SubscriptionException; /** * Saves the given subscription. * @param subscription not null */ - public abstract void save(Subscription subscription) throws SubscriptionException; + void save(Subscription subscription) throws SubscriptionException; /** * Finds subscriptions for the given user. * @param user not null * @return not null */ - public abstract List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException; + List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException; /** * Deletes the given subscription. * @param subscription not null */ - public abstract void delete(Subscription subscription) throws SubscriptionException; + void delete(Subscription subscription) throws SubscriptionException; } \ No newline at end of file Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapperFactory.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapperFactory.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapperFactory.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapperFactory.java Tue Jan 26 10:24:54 2016 @@ -29,5 +29,5 @@ public interface SubscriptionMapperFacto * @param session * @return mapper */ - public SubscriptionMapper getSubscriptionMapper(MailboxSession session) throws SubscriptionException; + SubscriptionMapper getSubscriptionMapper(MailboxSession session) throws SubscriptionException; } Modified: james/project/trunk/mailet/ai/src/main/java/org/apache/james/ai/classic/SystemContext.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/ai/src/main/java/org/apache/james/ai/classic/SystemContext.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailet/ai/src/main/java/org/apache/james/ai/classic/SystemContext.java (original) +++ james/project/trunk/mailet/ai/src/main/java/org/apache/james/ai/classic/SystemContext.java Tue Jan 26 10:24:54 2016 @@ -28,5 +28,5 @@ import org.w3c.dom.Document; */ public interface SystemContext { - public Document readXml(final String name) throws IOException; + Document readXml(final String name) throws IOException; } Modified: james/project/trunk/mailet/api/src/main/java/org/apache/mailet/MailetContext.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/api/src/main/java/org/apache/mailet/MailetContext.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailet/api/src/main/java/org/apache/mailet/MailetContext.java (original) +++ james/project/trunk/mailet/api/src/main/java/org/apache/mailet/MailetContext.java Tue Jan 26 10:24:54 2016 @@ -60,7 +60,7 @@ public interface MailetContext { * * @since Mailet API v2.5 */ - public static enum LogLevel { + enum LogLevel { DEBUG, INFO, WARN, @@ -72,7 +72,7 @@ public interface MailetContext { * * @since Mailet API v2.5 */ - public enum RecordType { + enum RecordType { A, AAAA, PTR, MX, TXT, SPF } Modified: james/project/trunk/mailet/base/src/main/java/org/apache/mailet/base/SimplifiedDateFormat.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/base/src/main/java/org/apache/mailet/base/SimplifiedDateFormat.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailet/base/src/main/java/org/apache/mailet/base/SimplifiedDateFormat.java (original) +++ james/project/trunk/mailet/base/src/main/java/org/apache/mailet/base/SimplifiedDateFormat.java Tue Jan 26 10:24:54 2016 @@ -42,7 +42,7 @@ public interface SimplifiedDateFormat { * @param d the time value to be formatted into a time string. * @return the formatted time string. */ - public String format(Date d); + String format(Date d); /** * Parses text from the beginning of the given string to produce a date. @@ -53,19 +53,19 @@ public interface SimplifiedDateFormat { * @throws ParseException if the beginning of the specified string * cannot be parsed. */ - public Date parse(String source) throws ParseException; + Date parse(String source) throws ParseException; /** * Sets the time zone of this SimplifiedDateFormat object. * @param zone the given new time zone. */ - public void setTimeZone(TimeZone zone); + void setTimeZone(TimeZone zone); /** * Gets the time zone. * @return the time zone associated with this SimplifiedDateFormat. */ - public TimeZone getTimeZone(); + TimeZone getTimeZone(); /** * Specify whether or not date/time parsing is to be lenient. With @@ -75,12 +75,12 @@ public interface SimplifiedDateFormat { * @param lenient when true, parsing is lenient * @see java.util.Calendar#setLenient */ - public void setLenient(boolean lenient); + void setLenient(boolean lenient); /** * Tell whether date/time parsing is to be lenient. * @return whether this SimplifiedDateFormat is lenient. */ - public boolean isLenient(); + boolean isLenient(); } Modified: james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/KeyHolder.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/KeyHolder.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/KeyHolder.java (original) +++ james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/KeyHolder.java Tue Jan 26 10:24:54 2016 @@ -37,32 +37,32 @@ public interface KeyHolder { * Generates a signed MimeMultipart from a MimeMessage. * @param message The message to sign. * @return The signed <CODE>MimeMultipart</CODE>. - */ - public MimeMultipart generate(MimeMessage message) throws Exception; + */ + MimeMultipart generate(MimeMessage message) throws Exception; /** * Generates a signed MimeMultipart from a MimeBodyPart. * @param content The content to sign. * @return The signed <CODE>MimeMultipart</CODE>. - */ - public MimeMultipart generate(MimeBodyPart content) throws Exception; + */ + MimeMultipart generate(MimeBodyPart content) throws Exception; /** * Getter for property signerDistinguishedName. * @return Value of property signerDistinguishedName. */ - public String getSignerDistinguishedName(); + String getSignerDistinguishedName(); /** * Getter for property signerCN. * @return Value of property signerCN. */ - public String getSignerCN(); + String getSignerCN(); /** * Getter for property signerAddress. * @return Value of property signerMailAddress. */ - public String getSignerAddress(); + String getSignerAddress(); } Modified: james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEAttributeNames.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEAttributeNames.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEAttributeNames.java (original) +++ james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEAttributeNames.java Tue Jan 26 10:24:54 2016 @@ -32,23 +32,23 @@ public interface SMIMEAttributeNames { /** * The attribute contains the server-side signing mailet name as a String. */ - public static final String SMIME_SIGNING_MAILET = "org.apache.james.smime.signing.mailetname"; + String SMIME_SIGNING_MAILET = "org.apache.james.smime.signing.mailetname"; /** * The attribute contains the string "valid" or the reason of non-validity of the signature. * The status could be non valid either because the signature does not verify * or because the certificate could be not valid when the signature was done. - */ - public static final String SMIME_SIGNATURE_VALIDITY = "org.apache.james.smime.signature.validity"; + */ + String SMIME_SIGNATURE_VALIDITY = "org.apache.james.smime.signature.validity"; /** * The attribute contains the signer's mail address as a String. */ - public static final String SMIME_SIGNER_ADDRESS = "org.apache.james.smime.signer.address"; + String SMIME_SIGNER_ADDRESS = "org.apache.james.smime.signer.address"; /** * The attribute contains the signature timestamp as a Date object. */ - public static final String SMIME_SIGNING_TIME = "org.apache.james.smime.signing.time"; + String SMIME_SIGNING_TIME = "org.apache.james.smime.signing.time"; } Modified: james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Continuation.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Continuation.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Continuation.java (original) +++ james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Continuation.java Tue Jan 26 10:24:54 2016 @@ -2,6 +2,6 @@ package org.apache.james.mpt.api; public interface Continuation { - public void doContinue(); + void doContinue(); } Modified: james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java (original) +++ james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java Tue Jan 26 10:24:54 2016 @@ -44,7 +44,7 @@ public interface HostSystem extends Sess * user password * @throws Exception */ - public boolean addUser(String user, String password) throws Exception; + boolean addUser(String user, String password) throws Exception; /** * Creates a new session for functional testing. @@ -52,14 +52,14 @@ public interface HostSystem extends Sess * @return <code>Session</code>, not null * @throws Exception */ - public Session newSession(Continuation continuation) throws Exception; + Session newSession(Continuation continuation) throws Exception; - public void beforeTests() throws Exception; + void beforeTests() throws Exception; - public void afterTests() throws Exception; + void afterTests() throws Exception; - public void beforeTest() throws Exception; + void beforeTest() throws Exception; - public void afterTest() throws Exception; + void afterTest() throws Exception; } Modified: james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java (original) +++ james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java Tue Jan 26 10:24:54 2016 @@ -29,40 +29,40 @@ public interface ProtocolInteractor { /** * adds a new Client request line to the test elements */ - public abstract void CL(String clientLine); + void CL(String clientLine); /** * adds a new Server Response line to the test elements, with the specified * location. */ - public abstract void SL(String serverLine, String location); + void SL(String serverLine, String location); /** * adds a new Server Unordered Block to the test elements. */ - public abstract void SUB(List<String> serverLines, String location); + void SUB(List<String> serverLines, String location); /** * adds a new Client request line to the test elements */ - public abstract void CL(int sessionNumber, String clientLine); + void CL(int sessionNumber, String clientLine); /** * Adds a continuation. To allow one thread to be used for testing. */ - public abstract void CONT(int sessionNumber) throws Exception; + void CONT(int sessionNumber) throws Exception; /** * adds a new Server Response line to the test elements, with the specified * location. */ - public abstract void SL(int sessionNumber, String serverLine, + void SL(int sessionNumber, String serverLine, String location, String lastClientMessage); /** * adds a new Server Unordered Block to the test elements. */ - public abstract void SUB(int sessionNumber, List<String> serverLines, - String location, String lastClientMessage); + void SUB(int sessionNumber, List<String> serverLines, + String location, String lastClientMessage); } \ No newline at end of file Modified: james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Session.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Session.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Session.java (original) +++ james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/Session.java Tue Jan 26 10:24:54 2016 @@ -30,26 +30,26 @@ public interface Session { * @return not null * @throws Exception */ - public String readLine() throws Exception; + String readLine() throws Exception; /** * Writes a line to the session output. * @param line not null * @throws Exception */ - public void writeLine(String line) throws Exception; + void writeLine(String line) throws Exception; /** * Opens the session. * * @throws Exception */ - public void start() throws Exception; + void start() throws Exception; /** * Closes the session. * * @throws Exception */ - public void stop() throws Exception; + void stop() throws Exception; } \ No newline at end of file Modified: james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java (original) +++ james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java Tue Jan 26 10:24:54 2016 @@ -31,7 +31,7 @@ public interface SessionFactory { * @return <code>Session</code>, not null * @throws Exception */ - public abstract Session newSession(Continuation continuation) + Session newSession(Continuation continuation) throws Exception; } \ No newline at end of file Modified: james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java (original) +++ james/project/trunk/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java Tue Jan 26 10:24:54 2016 @@ -30,5 +30,5 @@ public interface UserAdder { * @param password not null * @throws Exception when user cannot be added */ - public void addUser(String user, String password) throws Exception; + void addUser(String user, String password) throws Exception; } Modified: james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java (original) +++ james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java Tue Jan 26 10:24:54 2016 @@ -174,7 +174,7 @@ public class DiscardProtocol { public interface Record { /** Blocks until completion of conversation */ - public String complete() throws Exception; + String complete() throws Exception; } /** Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java Tue Jan 26 10:24:54 2016 @@ -33,7 +33,7 @@ import org.apache.james.protocols.api.lo */ public interface ProtocolSession { - public static enum State { + enum State { Connection, Transaction } Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java Tue Jan 26 10:24:54 2016 @@ -32,7 +32,7 @@ public interface Response { /** * Special {@link Response} implementation which will just disconnect the client */ - public static final Response DISCONNECT = new Response() { + Response DISCONNECT = new Response() { public String getRetCode() { return ""; Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java Tue Jan 26 10:24:54 2016 @@ -34,6 +34,6 @@ public interface StreamResponse extends * * @return stream */ - public InputStream getStream(); + InputStream getStream(); } Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java Tue Jan 26 10:24:54 2016 @@ -34,21 +34,21 @@ public interface FutureResponse extends * * @param listener */ - public void addListener(ResponseListener listener); + void addListener(ResponseListener listener); /** * Remote a {@link ResponseListener} * * @param listener */ - public void removeListener(ResponseListener listener); + void removeListener(ResponseListener listener); /** * Return <code>true</code> once the {@link FutureResponse} is ready and calling any of the get methods will not block any more. * * @return ready */ - public boolean isReady(); + boolean isReady(); /** @@ -56,13 +56,13 @@ public interface FutureResponse extends * * */ - public interface ResponseListener { + interface ResponseListener { /** * The {@link FutureResponse} is ready for processing * * @param response */ - public void onResponse(FutureResponse response); + void onResponse(FutureResponse response); } } Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java?rev=1726760&r1=1726759&r2=1726760&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java Tue Jan 26 10:24:54 2016 @@ -137,7 +137,7 @@ public interface Logger { * * @param message log this message */ - public void warn(String message); + void warn(String message); /** --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org