http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java index 6f642e6..b1dd3b5 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java @@ -62,6 +62,7 @@ public class ValidSenderDomainHandlerTest { return new BaseFakeSMTPSession() { HashMap<String,Object> map = new HashMap<>(); + @Override public Map<String,Object> getState() { map.put(SMTPSession.SENDER, sender); @@ -69,10 +70,12 @@ public class ValidSenderDomainHandlerTest { return map; } + @Override public boolean isRelayingAllowed() { return false; } + @Override public Object setAttachment(String key, Object value, State state) { if (state == State.Connection) { throw new UnsupportedOperationException(); @@ -90,6 +93,7 @@ public class ValidSenderDomainHandlerTest { * (non-Javadoc) * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State) */ + @Override public Object getAttachment(String key, State state) { if (state == State.Connection) { throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java index 456c93e..e16b4bc 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java @@ -50,144 +50,123 @@ public class BaseFakeSMTPSession implements SMTPSession { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#getConnectionState() - */ + @Override public Map<String, Object> getConnectionState() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#getRcptCount() - */ + @Override public int getRcptCount() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#getSessionID() - */ + @Override public String getSessionID() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#getState() - */ + @Override public Map<String, Object> getState() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#getUser() - */ + @Override public String getUser() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported() - */ + @Override public boolean isAuthSupported() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed() - */ + @Override public boolean isRelayingAllowed() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#resetState() - */ + @Override public void resetState() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#setRelayingAllowed(boolean) - */ + @Override public void setRelayingAllowed(boolean relayingAllowed) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#setUser(java.lang.String) - */ + @Override public void setUser(String user) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler() - */ + @Override public void popLineHandler() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public boolean isStartTLSSupported() { return false; } + @Override public boolean isTLSStarted() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public int getPushedLineHandlerCount() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public Response newLineTooLongResponse() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public Response newFatalErrorResponse() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolSession#getRemoteAddress() - */ + @Override public InetSocketAddress getRemoteAddress() { return new InetSocketAddress("localhost", 22); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolSession#getLocalAddress() - */ + @Override public InetSocketAddress getLocalAddress() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.SMTPSession#getConfiguration() - */ + @Override public SMTPConfiguration getConfiguration() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public Object setAttachment(String key, Object value, State state) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public Object getAttachment(String key, State state) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public Charset getCharset() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public String getLineDelimiter() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } + @Override public <T extends ProtocolSession> void pushLineHandler(LineHandler<T> overrideCommandHandler) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java index f8ba661..5f7c60f 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java @@ -33,6 +33,7 @@ public class TestMessageHook implements MessageHook { private final CopyOnWriteArrayList<MailEnvelope> queued = new CopyOnWriteArrayList<>(); + @Override public HookResult onMessage(SMTPSession session, MailEnvelope mail) { queued.add(mail); return new HookResult(HookReturnCode.OK); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java ---------------------------------------------------------------------- diff --git a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java b/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java index 33fb831..9c0d236 100644 --- a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java +++ b/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java @@ -47,32 +47,23 @@ public class JamesAppSpringMain implements Daemon { } - /** - * @see org.apache.commons.daemon.Daemon#destroy() - */ + @Override public void destroy() { } - /** - * @see - * org.apache.commons.daemon.Daemon#init(org.apache.commons.daemon.DaemonContext) - */ + @Override public void init(DaemonContext arg0) throws Exception { context = new JamesServerApplicationContext(new String[] { "META-INF/org/apache/james/spring-server.xml" }); context.registerShutdownHook(); context.start(); } - /** - * @see org.apache.commons.daemon.Daemon#start() - */ + @Override public void start() throws Exception { context.start(); } - /** - * @see org.apache.commons.daemon.Daemon#stop() - */ + @Override public void stop() throws Exception { if (context != null) { context.stop(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java index debcef9..631e11b 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java @@ -44,6 +44,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { private RecipientRewriteTableManagementMBean virtualUserTableProxy; private UsersRepositoryManagementMBean usersRepositoryProxy; + @Override public JmxDataProbe connect(JmxConnection jmxc) throws IOException { try { domainListProxy = jmxc.retrieveBean(DomainListManagementMBean.class, DOMAINLIST_OBJECT_NAME); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java index 70cd71b..5003645 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java @@ -48,6 +48,7 @@ public class JmxMailboxProbe implements MailboxProbe, JmxProbe { private MailboxManagerManagementMBean mailboxManagerManagement; private ReIndexerManagementMBean reIndexerManagement; + @Override public JmxMailboxProbe connect(JmxConnection jmxc) throws IOException { try { mailboxCopierManagement = jmxc.retrieveBean(MailboxCopierManagementMBean.class, MAILBOXCOPIER_OBJECT_NAME); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java index 227bf1f..545d180 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java @@ -36,6 +36,7 @@ public class JmxQuotaProbe implements QuotaProbe, JmxProbe { private QuotaManagementMBean quotaManagement; + @Override public JmxQuotaProbe connect(JmxConnection jmxc) throws IOException { try { quotaManagement = jmxc.retrieveBean(QuotaManagementMBean.class, QUOTAMANAGER_OBJECT_NAME); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java index 3aea481..07a98c3 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java @@ -32,6 +32,7 @@ public class JmxSieveProbe implements SieveProbe, JmxProbe { private SieveRepositoryManagementMBean sieveRepositoryManagement; + @Override public JmxSieveProbe connect(JmxConnection jmxc) throws IOException { try { sieveRepositoryManagement = jmxc.retrieveBean(SieveRepositoryManagementMBean.class, SIEVEMANAGER_OBJECT_NAME); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java b/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java index d64dc62..2a4c66f 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java @@ -28,25 +28,17 @@ public class JamesServerResourceLoader implements JamesDirectoriesProvider { this.rootDirectory = rootDirectory; } - /** - * @see org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory() - */ + @Override public String getAbsoluteDirectory() { return "/"; } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory() - */ + @Override public String getConfDirectory() { return getRootDirectory() + "/conf/"; } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory() - */ + @Override public String getVarDirectory() { return getRootDirectory() + "/var/"; } @@ -61,10 +53,7 @@ public class JamesServerResourceLoader implements JamesDirectoriesProvider { return getRootDirectory() + "/conf/lib/"; } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory() - */ + @Override public String getRootDirectory() { return rootDirectory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java b/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java index a2d6b52..296042c 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java @@ -109,6 +109,7 @@ public class MailHeaders extends InternetHeaders implements Serializable, Clonea * @see javax.mail.internet.InternetHeaders#addHeader(java.lang.String, * java.lang.String) */ + @Override public synchronized void addHeader(String arg0, String arg1) { if (RFC2822Headers.RETURN_PATH.equalsIgnoreCase(arg0)) { headers.add(0, new InternetHeader(arg0, arg1)); @@ -126,6 +127,7 @@ public class MailHeaders extends InternetHeaders implements Serializable, Clonea * @see javax.mail.internet.InternetHeaders#setHeader(java.lang.String, * java.lang.String) */ + @Override public synchronized void setHeader(String arg0, String arg1) { if (RFC2822Headers.RETURN_PATH.equalsIgnoreCase(arg0)) { super.removeHeader(arg0); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java index 00cc4c2..9521784 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java @@ -564,6 +564,7 @@ public class MailImpl implements Disposable, Mail { this.sender = sender; } + @Override public void setState(String state) { this.state = state; } @@ -576,6 +577,7 @@ public class MailImpl implements Disposable, Mail { this.remoteAddr = remoteAddr; } + @Override public void setLastUpdated(Date lastUpdated) { // Make a defensive copy to ensure that the date // doesn't get changed external to the class http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java index e6617e6..38036a7 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java @@ -117,6 +117,7 @@ public class MimeMessageInputStreamSource extends MimeMessageSource implements D * * @return the unique identifier for this MimeMessageInputStreamSource */ + @Override public String getSourceId() { return sourceId; } @@ -126,6 +127,7 @@ public class MimeMessageInputStreamSource extends MimeMessageSource implements D * * @return a <code>BufferedInputStream</code> containing the data */ + @Override public synchronized InputStream getInputStream() throws IOException { InputStream in; if (out.isInMemory()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java index b3b344f..c017c63 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java @@ -222,6 +222,7 @@ public class MimeMessageUtil { private static final class SizeCalculatorOutputStream extends OutputStream { long size = 0; + @Override public void write(int arg0) throws IOException { size++; } @@ -230,10 +231,12 @@ public class MimeMessageUtil { return size; } + @Override public void write(byte[] arg0, int arg1, int arg2) throws IOException { size += arg2; } + @Override public void write(byte[] arg0) throws IOException { size += arg0.length; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java index 103717b..1c13aea 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java @@ -164,8 +164,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { * Overrides default javamail behaviour by not altering the Message-ID by * default, see <a href="https://issues.apache.org/jira/browse/JAMES-875";>JAMES-875</a> and * <a href="https://issues.apache.org/jira/browse/JAMES-1010";>JAMES-1010</a> - * - * @see javax.mail.internet.MimeMessage#updateMessageID() */ @Override protected void updateMessageID() throws MessagingException { @@ -542,8 +540,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { /** * The message is changed when working with headers and when altering the * content. Every method that alter the content will fallback to this one. - * - * @see javax.mail.Part#setDataHandler(javax.activation.DataHandler) */ @Override public synchronized void setDataHandler(DataHandler arg0) throws MessagingException { @@ -563,9 +559,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { } } - /** - * @see javax.mail.internet.MimeMessage#parse(java.io.InputStream) - */ @Override protected synchronized void parse(InputStream is) throws MessagingException { // the super implementation calls @@ -577,8 +570,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { /** * If we already parsed the headers then we simply return the updated ones. * Otherwise we parse - * - * @see javax.mail.internet.MimeMessage#createInternetHeaders(java.io.InputStream) */ @Override protected synchronized InternetHeaders createInternetHeaders(InputStream is) throws MessagingException { @@ -620,9 +611,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { } } - /** - * @see javax.mail.internet.MimeMessage#getContentStream() - */ @Override protected InputStream getContentStream() throws MessagingException { if (!messageParsed) { @@ -631,9 +619,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { return super.getContentStream(); } - /** - * @see javax.mail.internet.MimeMessage#getRawInputStream() - */ @Override public synchronized InputStream getRawInputStream() throws MessagingException { if (!messageParsed && !isModified() && source != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java index 56820ec..67fda54 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java @@ -186,6 +186,7 @@ public class ResilientClusterProvider implements Provider<Cluster> { return builder.build(); } + @Override public Cluster get() { return cluster; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java index 449a10b..0f36425 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java @@ -56,6 +56,7 @@ public class DNSServiceModule extends AbstractModule { this.dnsService = dnsService; } + @Override public void initModule() { try { dnsService.configure(configurationProvider.getConfiguration("dnsservice")); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java index 0d13a2f..a29aa48 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java @@ -35,9 +35,6 @@ public abstract class AbstractBasicStageable<S> implements Stageable { this.object = object; } - /** - * {@inheritDoc} - */ @Override public final String toString() { return object.toString(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java index ddde9e4..aae0bbb 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java @@ -51,9 +51,6 @@ abstract class AbstractMethodTypeListener implements TypeListener { this.annotationTypes = annotationTypes; } - /** - * {@inheritDoc} - */ @Override public final <I> void hear(TypeLiteral<I> type, TypeEncounter<I> encounter) { hear(type, type.getRawType(), encounter); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java index 6725f5d..ed80fd8 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java @@ -30,9 +30,6 @@ public abstract class AbstractStageable<S> extends AbstractBasicStageable<S> { super(object); } - /** - * {@inheritDoc} - */ @Override public final void stage(StageHandler stageHandler) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java index b0b204a..a68e124 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java @@ -71,9 +71,6 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> { stageables = localStageables; } - /** - * {@inheritDoc} - */ @Override public void register(Stageable stageable) { synchronized (stageables) { @@ -81,35 +78,23 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> { } } - /** - * {@inheritDoc} - */ @Override public <T extends ExecutorService> T register(T executorService) { register(new ExecutorServiceStageable(executorService)); return executorService; } - /** - * {@inheritDoc} - */ @Override public <T extends Closeable> T register(T closeable) { register(new CloseableStageable(closeable)); return closeable; } - /** - * {@inheritDoc} - */ @Override public void stage() { stage(null); } - /** - * {@inheritDoc} - */ @Override public void stage(StageHandler stageHandler) { if (stageHandler == null) { @@ -128,9 +113,6 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> { } } - /** - * {@inheritDoc} - */ @Override public Class<A> getStage() { return stage; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java index 380c9da..a5b3d5f 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java @@ -68,9 +68,6 @@ public abstract class LifeCycleStageModule extends LifeCycleModule { return stagerType; } - /** - * {@inheritDoc} - */ @Override protected final void configure() { if (bindings != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java index d643918..7c4f574 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java @@ -24,17 +24,11 @@ package org.apache.james.onami.lifecycle; */ public final class NoOpStageHandler implements StageHandler { - /** - * {@inheritDoc} - */ @Override public <I, E extends Throwable> void onError(I injectee, E error) { // do nothing } - /** - * {@inheritDoc} - */ @Override public <I> void onSuccess(I injectee) { // do nothing http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java ---------------------------------------------------------------------- diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java index cafadfe..89b5651 100644 --- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java +++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java @@ -46,9 +46,6 @@ final class StageableMethod extends AbstractBasicStageable<Object> { this.stageMethod = stageMethod; } - /** - * {@inheritDoc} - */ @Override public final void stage(StageHandler stageHandler) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java index d58f342..7769bc3 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java @@ -54,11 +54,7 @@ public class MailboxCopierManagement implements MailboxCopierManagementMBean { this.resolver = resolver; } - /** - * @see - * org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean - * #getMailboxManagerBeans() - */ + @Override public Map<String, String> getMailboxManagerBeans() { Map<String, String> bMap = new HashMap<>(); Map<String, MailboxManager> beans = resolver.getMailboxManagerBeans(); @@ -71,11 +67,7 @@ public class MailboxCopierManagement implements MailboxCopierManagementMBean { return bMap; } - /** - * @see - * org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean - * #copy(java.lang.String, java.lang.String) - */ + @Override public void copy(String srcBean, String dstBean) throws Exception { if (srcBean.equals(dstBean)) { throw new IllegalArgumentException("srcBean and dstBean can not have the same name!"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java index 792b9fc..29c1dfb 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java @@ -66,9 +66,6 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa super(MailboxManagerManagementMBean.class); } - /** - * @see org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#deleteMailboxes(java.lang.String) - */ @Override public boolean deleteMailboxes(String username) { checkString(username, "Username"); @@ -96,11 +93,6 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa return false; } - /** - * @see - * org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#listMailboxes - * (java.lang.String) - */ @Override public List<String> listMailboxes(String username) { checkString(username, "Username"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java index 31de75c..64d975a 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java @@ -39,6 +39,7 @@ public class UserRepositoryAuthenticator implements Authenticator { this.repos = repos; } + @Override public boolean isAuthentic(String userid, CharSequence passwd) throws MailboxException { try { return repos.test(userid, passwd.toString()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java index bed2a3e..546bcf3 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java @@ -32,6 +32,7 @@ public abstract class AbstractBeanFactory implements BeanFactoryAware { private ConfigurableListableBeanFactory beanFactory; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ConfigurableListableBeanFactory) beanFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java index 6f260c9..ad0b2d1 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java @@ -32,6 +32,7 @@ public abstract class AbstractBeanFactory implements BeanFactoryAware { private ConfigurableListableBeanFactory beanFactory; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ConfigurableListableBeanFactory) beanFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java index 6090872..d759884 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java @@ -33,9 +33,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; */ public class MailetLoaderBeanFactory extends AbstractLoaderBeanFactory<Mailet> implements MailetLoader { - /** - * @see org.apache.james.mailetcontainer.api.MailetLoader#getMailet(org.apache.mailet.MailetConfig) - */ + @Override public Mailet getMailet(MailetConfig config) throws MessagingException { String mailetName = config.getMailetName(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java index 19cd9a9..1559535 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java @@ -33,9 +33,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; */ public class MatcherLoaderBeanFactory extends AbstractLoaderBeanFactory<Matcher> implements MatcherLoader { - /** - * @see org.apache.james.mailetcontainer.api.MatcherLoader#getMatcher(org.apache.mailet.MatcherConfig) - */ + @Override public Matcher getMatcher(MatcherConfig config) throws MessagingException { String matchName = config.getMatcherName(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java index 404ac21..2004442 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java @@ -66,9 +66,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen */ private HierarchicalConfiguration configuration; - /** - * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration) - */ + @Override public void configure(HierarchicalConfiguration configuration) throws ConfigurationException { this.configuration = configuration; } @@ -153,6 +151,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen * @throws MailRepositoryStoreException if any error occurs while parsing the Configuration or * retrieving the MailRepository */ + @Override @SuppressWarnings("deprecation") public synchronized MailRepository select(String destination) throws MailRepositoryStoreException { int idx = destination.indexOf(':'); @@ -206,9 +205,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen } - /** - * @see org.apache.james.mailrepository.api.MailRepositoryStore#getUrls() - */ + @Override public synchronized List<String> getUrls() { return new ArrayList<>(repositories.keySet()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java index cffff50..16133fe 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java @@ -54,6 +54,7 @@ public class ConfigurationBeanFactoryPostProcessor implements BeanFactoryPostPro /** * Parse the configuration file and depending on it register the beans */ + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java index 7638f39..1948169 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java @@ -48,10 +48,7 @@ public class FileSystemBeanFactoryPostProcessor implements BeanFactoryPostProces this.fileSystem = fileSystem; } - /** - * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory - * (org.springframework.beans.factory.config.ConfigurableListableBeanFactory) - */ + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException { String[] names = factory.getBeanDefinitionNames(); for (String name : names) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java index 5795712..4eb9fd9 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java @@ -37,10 +37,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; */ public class IndexerConfigurationBeanFactoryPostProcessor implements BeanFactoryPostProcessor { - /** - * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory - * (org.springframework.beans.factory.config.ConfigurableListableBeanFactory) - */ + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class); try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java index 5daa4bf..dd81722 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java @@ -53,6 +53,7 @@ public class MailboxConfigurationBeanFactoryPostProcessor implements BeanFactory JCR_MAILBOXMANAGER, MAILDIR_MAILBOXMANAGER, HBASE_MAILBOXMANAGER, CASSANDRA_MAILBOXMANAGER); + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class); try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java b/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java index 16795e6..b97f124 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java @@ -47,10 +47,7 @@ public class JamesServerApplicationContext extends ClassPathXmlApplicationContex return resourceLoader; } - /** - * @see - * org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String) - */ + @Override public Resource getResource(String fileURL) { // delegate the loading to the resourceloader Resource r = getResourceLoader().getResource(fileURL); @@ -60,34 +57,22 @@ public class JamesServerApplicationContext extends ClassPathXmlApplicationContex return r; } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory() - */ + @Override public String getAbsoluteDirectory() { return getResourceLoader().getAbsoluteDirectory(); } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory() - */ + @Override public String getConfDirectory() { return getResourceLoader().getConfDirectory(); } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory() - */ + @Override public String getVarDirectory() { return getResourceLoader().getVarDirectory(); } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory() - */ + @Override public String getRootDirectory() { return getResourceLoader().getRootDirectory(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java b/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java index eafcded..b073a39 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java @@ -35,6 +35,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i */ private final JamesResourceLoader resourceLoader = new DefaultJamesResourceLoader(new JamesDirectoriesProvider() { + @Override public String getAbsoluteDirectory() { if (absoluteDirectory == null) { return getRootDirectory(); @@ -45,6 +46,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i /** */ + @Override public String getConfDirectory() { if (confDirectory == null) { return getRootDirectory() + "/WEB-INF/conf/"; @@ -55,6 +57,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i /** */ + @Override public String getRootDirectory() { if (rootDirectory == null) { // the root dir is the same as the servlets path @@ -66,6 +69,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i /** */ + @Override public String getVarDirectory() { if (varDirectory == null) { return getRootDirectory() + "/var/"; @@ -80,10 +84,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i private String varDirectory; private String confDirectory; - /** - * @see - * org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String) - */ + @Override public Resource getResource(String fileURL) { // delegate the loading to the resourceloader Resource r = resourceLoader.getResource(fileURL); @@ -109,34 +110,22 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i this.confDirectory = confDirectory; } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory() - */ + @Override public String getAbsoluteDirectory() { return resourceLoader.getAbsoluteDirectory(); } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory() - */ + @Override public String getConfDirectory() { return resourceLoader.getConfDirectory(); } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory() - */ + @Override public String getVarDirectory() { return resourceLoader.getVarDirectory(); } - /** - * @see - * org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory() - */ + @Override public String getRootDirectory() { return resourceLoader.getRootDirectory(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java index 4f59727..951e6cb 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java @@ -43,10 +43,7 @@ public abstract class AbstractLifecycleBeanPostProcessor<T> implements BeanPostP this.factory = (ConfigurableListableBeanFactory) factory; } - /** - * @see org.springframework.beans.factory.config.BeanPostProcessor - * #postProcessBeforeInitialization(java.lang.Object, java.lang.String) - */ + @Override @SuppressWarnings("unchecked") public final Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { try { @@ -65,10 +62,7 @@ public abstract class AbstractLifecycleBeanPostProcessor<T> implements BeanPostP return bean; } - /** - * @see org.springframework.beans.factory.config.BeanPostProcessor - * #postProcessAfterInitialization(java.lang.Object, java.lang.String) - */ + @Override @SuppressWarnings("unchecked") public final Object postProcessAfterInitialization(Object bean, String name) throws BeansException { try { @@ -125,9 +119,7 @@ public abstract class AbstractLifecycleBeanPostProcessor<T> implements BeanPostP this.order = order; } - /** - * @see org.springframework.core.Ordered#getOrder() - */ + @Override public int getOrder() { return order; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java index 451a97b..0e26e36 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java @@ -64,9 +64,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc this.configurationMappings = configurationMappings; } - /** - * @see ConfigurationProvider#registerConfiguration(String, HierarchicalConfiguration) - */ + @Override public void registerConfiguration(String beanName, HierarchicalConfiguration conf) { configurations.put(beanName, conf); } @@ -77,6 +75,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { if (configurationMappings != null) { for (String key : configurationMappings.keySet()) { @@ -86,9 +85,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc } } - /** - * @see ConfigurationProvider#getConfiguration(java.lang.String) - */ + @Override public HierarchicalConfiguration getConfiguration(String name) throws ConfigurationException { HierarchicalConfiguration conf = configurations.get(name); @@ -134,10 +131,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc } - /** - * @see - * org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader) - */ + @Override public void setResourceLoader(ResourceLoader loader) { this.loader = loader; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java index df45b7d..d2adee1 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java @@ -55,10 +55,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid this.logs = logs; } - /** - * @see - * org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ + @Override public void afterPropertiesSet() throws Exception { if (logs != null) { for (String key : logs.keySet()) { @@ -68,33 +65,23 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid } } - /** - * @see - * org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String) - */ + @Override public Logger getLog(String name) { logMap.putIfAbsent(name, createLog(PREFIX + name)); return logMap.get(name); } - /** - * @see - * org.apache.james.container.spring.lifecycle.LogProvider#registerLog(java.lang.String, org.slf4j.Logger) - */ + @Override public void registerLog(String beanName, Logger log) { logMap.put(beanName, log); } - /** - * @see LogProviderManagementMBean#getSupportedLogLevels() - */ + @Override public List<String> getSupportedLogLevels() { return Arrays.asList("DEBUG", "INFO", "WARN", "ERROR", "OFF"); } - /** - * @see LogProviderManagementMBean#getLogLevels() - */ + @Override public Map<String, String> getLogLevels() { TreeMap<String, String> levels = new TreeMap<>(); for (String name : logMap.keySet()) { @@ -107,9 +94,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid } - /** - * @see LogProviderManagementMBean#getLogLevel(java.lang.String) - */ + @Override public String getLogLevel(String component) { Logger log = logMap.get(component); if (log == null) { @@ -123,9 +108,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid return level.toString(); } - /** - * @see LogProviderManagementMBean#setLogLevel(String, String) - */ + @Override public void setLogLevel(String component, String loglevel) { if (!getSupportedLogLevels().contains(loglevel)) { throw new IllegalArgumentException("Not supported loglevel given"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java index c4344af..6ec3d07 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java @@ -133,9 +133,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati } } - /** - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ + @Override public void setBeanClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; } @@ -274,16 +272,12 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati return setter != null ? AnnotationUtils.getAnnotation(setter, getAnnotation()) : null; } - /** - * @see org.springframework.osgi.context.BundleContextAware#setBundleContext(org.osgi.framework.BundleContext) - */ + @Override public void setBundleContext(BundleContext context) { this.bundleContext = context; } - /** - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = beanFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java index 2570b06..cd8b485 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java @@ -24,9 +24,7 @@ import org.springframework.osgi.service.exporter.OsgiServicePropertiesResolver; public class OSGIResourceAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<Resource> { - /** - * @see org.apache.james.container.spring.lifecycle.osgi.AbstractOSGIAnnotationBeanPostProcessor#getAnnotation() - */ + @Override protected Class<Resource> getAnnotation() { return Resource.class; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java index bdfb6f3..3e7d555 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java @@ -31,11 +31,7 @@ public class SpringResolver implements MailboxManagerResolver, ApplicationContex private ApplicationContext context; - /** - * @see - * org.springframework.context.ApplicationContextAware#setApplicationContext - * (org.springframework.context.ApplicationContext) - */ + @Override public void setApplicationContext(ApplicationContext context) { this.context = context; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java b/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java index 6590f97..e86a5fd 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java @@ -46,6 +46,7 @@ public class DefaultJamesResourceLoader extends DefaultResourceLoader implements * * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String) */ + @Override public Resource getResource(String fileURL) { Resource r; if (fileURL.startsWith(FileSystem.CLASSPATH_PROTOCOL)) { @@ -70,18 +71,22 @@ public class DefaultJamesResourceLoader extends DefaultResourceLoader implements return r; } + @Override public String getAbsoluteDirectory() { return jamesDirectoriesProvider.getAbsoluteDirectory(); } + @Override public String getConfDirectory() { return jamesDirectoriesProvider.getConfDirectory(); } + @Override public String getVarDirectory() { return jamesDirectoriesProvider.getVarDirectory(); } + @Override public String getRootDirectory() { return jamesDirectoriesProvider.getRootDirectory(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java b/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java index ddb4dfe..e0bb63a 100644 --- a/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java +++ b/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java @@ -40,9 +40,7 @@ public class BodyOffsetInputStream extends InputStream { this.in = new PushbackInputStream(in, 3); } - /** - * @see InputStream#read() - */ + @Override public int read() throws IOException { int i = in.read(); if (i != -1) { @@ -110,16 +108,12 @@ public class BodyOffsetInputStream extends InputStream { } - /** - * Mark is not supported by this implementation - */ + @Override public boolean markSupported() { return false; } - /** - * Throws {@link IOException} - */ + @Override public void reset() throws IOException { throw new IOException("Not supported"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java b/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java index 4dcee20..5296e16 100644 --- a/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java +++ b/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java @@ -49,6 +49,7 @@ public class RestrictingRMISocketFactory extends RMISocketFactory { * the given port. The address can be specified by the System Property * james.jmx.address. If none is given it will use localhost */ + @Override public ServerSocket createServerSocket(int port) throws IOException { ServerSocket socket = new ServerSocket(); socket.bind(new InetSocketAddress(address, port)); @@ -59,6 +60,7 @@ public class RestrictingRMISocketFactory extends RMISocketFactory { /** * Create a new {@link Socket} for the given host and port */ + @Override public Socket createSocket(String host, int port) throws IOException { return new Socket(host, port); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java ---------------------------------------------------------------------- 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 743b886..3f5df93 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 @@ -161,6 +161,7 @@ public class BayesianAnalyzer { * instance with. * @return The result of the comparison (before, equal, after). */ + @Override public final int compareTo(TokenProbabilityStrength anotherTokenProbabilityStrength) { int result = (int) ((anotherTokenProbabilityStrength.strength - strength) * 1000000); if (result == 0) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java index 2940290..9c3f499 100644 --- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java +++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java @@ -56,12 +56,14 @@ public class JMXEnabledScheduledThreadPoolExecutor extends ScheduledThreadPoolEx registerMBean(); } + @Override protected void beforeExecute(Thread t, Runnable r) { super.beforeExecute(t, r); inProgress.add(r); startTime.set(System.currentTimeMillis()); } + @Override protected void afterExecute(Runnable r, Throwable t) { long time = System.currentTimeMillis() - startTime.get(); synchronized (this) { @@ -117,44 +119,32 @@ public class JMXEnabledScheduledThreadPoolExecutor extends ScheduledThreadPoolEx return super.shutdownNow(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks() - */ + @Override public synchronized int getTotalTasks() { return totalTasks; } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime() - */ + @Override public synchronized double getAverageTaskTime() { return (totalTasks == 0) ? 0 : totalTime / totalTasks; } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads() - */ + @Override public int getActiveThreads() { return getPoolSize(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks() - */ + @Override public int getActiveTasks() { return getActiveCount(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks() - */ + @Override public int getQueuedTasks() { return getQueue().size(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads() - */ + @Override public int getMaximalThreads() { return getMaximumPoolSize(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java index e4110ba..2a42464 100644 --- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java +++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java @@ -50,12 +50,14 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements registerMBean(); } + @Override protected void beforeExecute(Thread t, Runnable r) { super.beforeExecute(t, r); inProgress.add(r); startTime.set(System.currentTimeMillis()); } + @Override protected void afterExecute(Runnable r, Throwable t) { long time = System.currentTimeMillis() - startTime.get(); synchronized (this) { @@ -111,44 +113,32 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements return super.shutdownNow(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks() - */ + @Override public synchronized int getTotalTasks() { return totalTasks; } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime() - */ + @Override public synchronized double getAverageTaskTime() { return (totalTasks == 0) ? 0 : totalTime / totalTasks; } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads() - */ + @Override public int getActiveThreads() { return getPoolSize(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks() - */ + @Override public int getActiveTasks() { return getActiveCount(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks() - */ + @Override public int getQueuedTasks() { return getQueue().size(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads() - */ + @Override public int getMaximalThreads() { return getMaximumPoolSize(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java b/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java index 08465d7..2c8d4fe 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java @@ -76,8 +76,6 @@ public class DoublingRetrySchedule implements RetrySchedule { this.multiplier = Math.max(1, multiplier); } - /** - */ @Override public long getInterval(int index) { if (startInterval > 0) { @@ -90,9 +88,6 @@ public class DoublingRetrySchedule implements RetrySchedule { return multiplier * Math.min((long) (startInterval * Math.pow(2, index)), maxInterval); } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder builder = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java index dcc46c0..1b4f53b 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java @@ -70,8 +70,7 @@ public abstract class ExceptionRetryHandler implements RetryHandler { this.maxRetries = maxRetries; } - /** - */ + @Override public Object perform() throws Exception { boolean success = false; Object result = null; @@ -114,15 +113,13 @@ public abstract class ExceptionRetryHandler implements RetryHandler { } return isRetryable; } - - /** - */ + + @Override public void postFailure(Exception ex, int retryCount) { // no-op } - /** - */ + @Override public abstract Object operation() throws Exception; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java index 84c0ab8..2c8ff64 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java @@ -45,8 +45,6 @@ public abstract class LoggingRetryHandler extends NamingExceptionRetryHandler { super(exceptionClasses, proxy, schedule, maxRetries); } - /** - */ @Override public void postFailure(NamingException ex, int retryCount) { super.postFailure(ex, retryCount); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java index f269fa7..5395b43 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java @@ -49,8 +49,6 @@ public abstract class NamingExceptionRetryHandler extends ExceptionRetryHandler super(exceptionClasses, proxy, schedule, maxRetries); } - /** - */ @Override public Object perform() throws NamingException { try { @@ -63,8 +61,6 @@ public abstract class NamingExceptionRetryHandler extends ExceptionRetryHandler } } - /** - */ @Override public void postFailure(Exception ex, int retryCount) { postFailure(((NamingException) ex), retryCount); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
