http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java index fd4cd35..e3e5476 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java @@ -102,10 +102,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#addToEnvironment(java.lang.String, - * java.lang.Object) - */ @Override public Object addToEnvironment(final String propName, final Object propVal) throws NamingException { @@ -119,9 +115,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object) - */ @Override public void bind(final Name name, final Object obj) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -135,9 +128,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#bind(java.lang.String, java.lang.Object) - */ @Override public void bind(final String name, final Object obj) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -151,9 +141,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#close() - */ @Override public void close() throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -167,10 +154,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#composeName(javax.naming.Name, - * javax.naming.Name) - */ @Override public Name composeName(final Name name, final Name prefix) throws NamingException { return (Name) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -183,9 +166,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#composeName(java.lang.String, java.lang.String) - */ @Override public String composeName(final String name, final String prefix) throws NamingException { return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -198,9 +178,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#createSubcontext(javax.naming.Name) - */ @Override public Context createSubcontext(final Name name) throws NamingException { final Context context = getDelegate(); @@ -213,9 +190,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }; } - /** - * @see javax.naming.Context#createSubcontext(java.lang.String) - */ @Override public Context createSubcontext(final String name) throws NamingException { final Context context = getDelegate(); @@ -228,10 +202,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }; } - /** - * @return - * @see javax.naming.Context#destroySubcontext(javax.naming.Name) - */ @Override public void destroySubcontext(final Name name) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -245,9 +215,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#destroySubcontext(java.lang.String) - */ @Override public void destroySubcontext(final String name) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -261,9 +228,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#getEnvironment() - */ @Override public Hashtable<?, ?> getEnvironment() throws NamingException { return (Hashtable<?, ?>) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, @@ -276,9 +240,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#getNameInNamespace() - */ @Override public String getNameInNamespace() throws NamingException { return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -291,9 +252,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#getNameParser(javax.naming.Name) - */ @Override public NameParser getNameParser(final Name name) throws NamingException { return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -306,9 +264,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#getNameParser(java.lang.String) - */ @Override public NameParser getNameParser(final String name) throws NamingException { return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -385,9 +340,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#lookup(javax.naming.Name) - */ @Override public Object lookup(final Name name) throws NamingException { return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -400,9 +352,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#lookup(java.lang.String) - */ @Override public Object lookup(final String name) throws NamingException { return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -415,9 +364,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#lookupLink(javax.naming.Name) - */ @Override public Object lookupLink(final Name name) throws NamingException { return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -430,9 +376,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#lookupLink(java.lang.String) - */ @Override public Object lookupLink(final String name) throws NamingException { return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -445,9 +388,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#rebind(javax.naming.Name, java.lang.Object) - */ @Override public void rebind(final Name name, final Object obj) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -461,9 +401,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#rebind(java.lang.String, java.lang.Object) - */ @Override public void rebind(final String name, final Object obj) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -477,9 +414,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#removeFromEnvironment(java.lang.String) - */ @Override public Object removeFromEnvironment(final String propName) throws NamingException { return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -492,9 +426,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#rename(javax.naming.Name, javax.naming.Name) - */ @Override public void rename(final Name oldName, final Name newName) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -508,9 +439,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#rename(java.lang.String, java.lang.String) - */ @Override public void rename(final String oldName, final String newName) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -524,9 +452,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#unbind(javax.naming.Name) - */ @Override public void unbind(final Name name) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries @@ -540,9 +465,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - * @see javax.naming.Context#unbind(java.lang.String) - */ @Override public void unbind(final String name) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries) { @@ -555,15 +477,12 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy }.perform(); } - /** - */ + @Override public Context getDelegate() { return delegate; } - /** - */ @Override public void resetDelegate() throws Exception { if (null != delegate) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java index 047be38..32c0004 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java @@ -57,10 +57,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC super(schedule, maxRetries); } - /** - * @see javax.naming.directory.DirContext#bind(javax.naming.Name, - * java.lang.Object, javax.naming.directory.Attributes) - */ @Override public void bind(final Name name, final Object obj, final Attributes attrs) throws NamingException { @@ -74,10 +70,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#bind(java.lang.String, - * java.lang.Object, javax.naming.directory.Attributes) - */ @Override public void bind(final String name, final Object obj, final Attributes attrs) throws NamingException { @@ -91,10 +83,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#createSubcontext(javax.naming.Name, - * javax.naming.directory.Attributes) - */ @Override public DirContext createSubcontext(final Name name, final Attributes attrs) throws NamingException { @@ -108,10 +96,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#createSubcontext(java.lang.String, - * javax.naming.directory.Attributes) - */ @Override public DirContext createSubcontext(final String name, final Attributes attrs) throws NamingException { @@ -125,9 +109,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#getAttributes(javax.naming.Name) - */ @Override public Attributes getAttributes(final Name name) throws NamingException { return (Attributes) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, @@ -140,9 +121,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#getAttributes(java.lang.String) - */ @Override public Attributes getAttributes(final String name) throws NamingException { return (Attributes) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, @@ -155,10 +133,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#getAttributes(javax.naming.Name, - * java.lang.String[]) - */ @Override public Attributes getAttributes(final Name name, final String[] attrIds) throws NamingException { return (Attributes) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, @@ -171,10 +145,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#getAttributes(java.lang.String, - * java.lang.String[]) - */ @Override public Attributes getAttributes(final String name, final String[] attrIds) throws NamingException { @@ -188,9 +158,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#getSchema(javax.naming.Name) - */ @Override public DirContext getSchema(final Name name) throws NamingException { final Context context = getDelegate(); @@ -203,9 +170,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }; } - /** - * @see javax.naming.directory.DirContext#getSchema(java.lang.String) - */ @Override public DirContext getSchema(final String name) throws NamingException { final Context context = getDelegate(); @@ -218,9 +182,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }; } - /** - * @see javax.naming.directory.DirContext#getSchemaClassDefinition(javax.naming.Name) - */ @Override public DirContext getSchemaClassDefinition(final Name name) throws NamingException { final Context context = getDelegate(); @@ -233,9 +194,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }; } - /** - * @see javax.naming.directory.DirContext#getSchemaClassDefinition(java.lang.String) - */ @Override public DirContext getSchemaClassDefinition(final String name) throws NamingException { final Context context = getDelegate(); @@ -248,10 +206,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }; } - /** - * @see javax.naming.directory.DirContext#modifyAttributes(javax.naming.Name, - * javax.naming.directory.ModificationItem[]) - */ @Override public void modifyAttributes(final Name name, final ModificationItem[] mods) throws NamingException { @@ -265,10 +219,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String, - * javax.naming.directory.ModificationItem[]) - */ @Override public void modifyAttributes(final String name, final ModificationItem[] mods) throws NamingException { @@ -282,10 +232,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#modifyAttributes(javax.naming.Name, - * int, javax.naming.directory.Attributes) - */ @Override public void modifyAttributes(final Name name, final int modOp, final Attributes attrs) throws NamingException { @@ -299,10 +245,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String, - * int, javax.naming.directory.Attributes) - */ @Override public void modifyAttributes(final String name, final int modOp, final Attributes attrs) throws NamingException { @@ -316,10 +258,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#rebind(javax.naming.Name, - * java.lang.Object, javax.naming.directory.Attributes) - */ @Override public void rebind(final Name name, final Object obj, final Attributes attrs) throws NamingException { @@ -333,10 +271,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC }.perform(); } - /** - * @see javax.naming.directory.DirContext#rebind(java.lang.String, - * java.lang.Object, javax.naming.directory.Attributes) - */ @Override public void rebind(final String name, final Object obj, final Attributes attrs) throws NamingException { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java index 760c29f..c144132 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java @@ -51,9 +51,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements super(schedule, maxRetries); } - /** - * @see javax.naming.ldap.LdapContext#extendedOperation(javax.naming.ldap.ExtendedRequest) - */ @Override public ExtendedResponse extendedOperation(final ExtendedRequest request) throws NamingException { return (ExtendedResponse) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @@ -64,9 +61,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements }.perform(); } - /** - * @see javax.naming.ldap.LdapContext#getConnectControls() - */ @Override public Control[] getConnectControls() throws NamingException { return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @@ -77,9 +71,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements }.perform(); } - /** - * @see javax.naming.ldap.LdapContext#getRequestControls() - */ @Override public Control[] getRequestControls() throws NamingException { return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @@ -90,9 +81,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements }.perform(); } - /** - * @see javax.naming.ldap.LdapContext#getResponseControls() - */ @Override public Control[] getResponseControls() throws NamingException { return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @@ -103,9 +91,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements }.perform(); } - /** - * @see javax.naming.ldap.LdapContext#newInstance(javax.naming.ldap.Control[]) - */ @Override public LdapContext newInstance(final Control[] requestControls) throws NamingException { final Context context = getDelegate(); @@ -118,9 +103,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements }; } - /** - * @see javax.naming.ldap.LdapContext#reconnect(javax.naming.ldap.Control[]) - */ @Override public void reconnect(final Control[] connCtls) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @@ -132,9 +114,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements }.perform(); } - /** - * @see javax.naming.ldap.LdapContext#setRequestControls(javax.naming.ldap.Control[]) - */ @Override public void setRequestControls(final Control[] requestControls) throws NamingException { new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java index f6335bb..d8a20fd 100644 --- a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java @@ -54,22 +54,16 @@ public class ExceptionRetryHandlerTest { private class TestRetryingProxy implements ExceptionRetryingProxy { - /** - */ @Override public Context getDelegate() { return null; } - /** - */ @Override public Context newDelegate() throws Exception { return null; } - /** - */ @Override public void resetDelegate() throws Exception { } @@ -77,8 +71,6 @@ public class ExceptionRetryHandlerTest { private class TestRetrySchedule implements RetrySchedule { - /** - */ @Override public long getInterval(int index) { return index; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java index 351d494..fe1b1e1 100644 --- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java @@ -52,22 +52,16 @@ public class NamingExceptionRetryHandlerTest { private class TestRetryingProxy implements ExceptionRetryingProxy { - /** - */ @Override public Context getDelegate() { return null; } - /** - */ @Override public Context newDelegate() throws NamingException { return null; } - /** - */ @Override public void resetDelegate() throws NamingException { } @@ -75,8 +69,6 @@ public class NamingExceptionRetryHandlerTest { private class TestRetrySchedule implements RetrySchedule { - /** - */ @Override public long getInterval(int index) { return index; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java index be722db..033a2e0 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java @@ -33,6 +33,7 @@ public class CassandraDomainListTest extends AbstractDomainListTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { cassandra = CassandraCluster.create(new CassandraDomainListModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java index a5b21d8..8fe0e98 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java @@ -35,12 +35,14 @@ public class CassandraRecipientRewriteTableTest extends AbstractRecipientRewrite private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { cassandra = CassandraCluster.create(new CassandraRRTModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java index 8f039fb..93352ee 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java @@ -34,6 +34,7 @@ public class CassandraSieveRepositoryTest extends AbstractSieveRepositoryTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { cassandra = CassandraCluster.create(new CassandraSieveRepositoryModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java index 7ac7e55..a3e5955 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java @@ -34,12 +34,14 @@ public class CassandraUsersRepositoryTest extends AbstractUsersRepositoryTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { cassandra = CassandraCluster.create(new CassandraUsersRepositoryModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java index 00f05e2..caed732 100755 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java @@ -161,6 +161,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart); } + @Override public void configure(HierarchicalConfiguration configuration) throws ConfigurationException { /* The repository configuration @@ -381,10 +382,12 @@ public class MBoxMailRepository implements MailRepository, Configurable { ins.seek(messageStart - 1); } MessageAction op = new MessageAction() { + @Override public boolean isComplete() { return true; } + @Override public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) { if (key.equals(generateKeyValue(bodyText))) { LOGGER.debug("{} Located message. Returning MIME message", this.getClass().getName()); @@ -432,10 +435,12 @@ public class MBoxMailRepository implements MailRepository, Configurable { } this.mList = new Hashtable<>((int) initialCapacity); this.parseMboxFile(ins, new MessageAction() { + @Override public boolean isComplete() { return false; } + @Override public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) { String key = generateKeyValue(bodyText); mList.put(key, messageStart); @@ -461,9 +466,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { } } - /** - * @see org.apache.james.mailrepository.api.MailRepository#store(Mail) - */ + @Override public void store(Mail mc) { LOGGER.debug("Will store message to file {}", mboxFile); @@ -499,9 +502,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { } } - /** - * @see org.apache.james.mailrepository.api.MailRepository#list() - */ + @Override public Iterator<String> list() { ArrayList<String> keys = loadKeysAsArray(); @@ -524,9 +525,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { return new ArrayList<>(mList.keySet()); } - /** - * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String) - */ + @Override public Mail retrieve(String key) { loadKeys(); @@ -544,9 +543,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { return res; } - /** - * @see org.apache.james.mailrepository.api.MailRepository#remove(Mail) - */ + @Override public void remove(Mail mail) { ArrayList<Mail> remArray = new ArrayList<>(); remArray.add(mail); @@ -597,9 +594,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { } } - /** - * @see org.apache.james.mailrepository.api.MailRepository#remove(Collection) - */ + @Override public void remove(final Collection<Mail> mails) { LOGGER.debug("Removing entry for key {}", mails); // The plan is as follows: @@ -610,10 +605,12 @@ public class MBoxMailRepository implements MailRepository, Configurable { RandomAccessFile ins = new RandomAccessFile(mboxFile, "r"); // The source final RandomAccessFile outputFile = new RandomAccessFile(mboxFile + WORKEXT, "rw"); // The destination parseMboxFile(ins, new MessageAction() { + @Override public boolean isComplete() { return false; } + @Override public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) { // Write out the messages as we go, until we reach the key // we want @@ -671,9 +668,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { } } - /** - * @see org.apache.james.mailrepository.api.MailRepository#remove(String) - */ + @Override public void remove(String key) { loadKeys(); try { @@ -689,16 +684,12 @@ public class MBoxMailRepository implements MailRepository, Configurable { unlockMBox(); } - /** - * @see org.apache.james.mailrepository.api.MailRepository#lock(String) - */ + @Override public boolean lock(String key) { return false; } - /** - * @see org.apache.james.mailrepository.api.MailRepository#unlock(String) - */ + @Override public boolean unlock(String key) { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java index ec39f82..ed37186 100644 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java @@ -73,22 +73,17 @@ public class MimeMessageStreamRepositorySource extends MimeMessageSource { * * @return the String ID */ + @Override public String getSourceId() { return repositoryName + "/" + key; } - /** - * Return the InputStream - * - * @return stream return the InputStream - */ + @Override public InputStream getInputStream() throws IOException { return sr.get(key); } - /** - * @see org.apache.james.server.core.MimeMessageSource#getMessageSize() - */ + @Override public long getMessageSize() throws IOException { if (size == -1) { if (sr instanceof org.apache.james.repository.file.FilePersistentStreamRepository) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java index c9c597b..54984aa 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java @@ -207,6 +207,7 @@ public class SieveFileRepository implements SieveRepository { } } + @Override public List<ScriptSummary> listScripts(String user) throws StorageException { File[] files = getUserDirectory(user).listFiles(); List<ScriptSummary> summaries = new ArrayList<>(files.length); @@ -275,6 +276,7 @@ public class SieveFileRepository implements SieveRepository { return new DateTime(getActiveFile(user).lastModified()); } + @Override public void setActive(String user, String name) throws ScriptNotFoundException, StorageException { synchronized (lock) { // Turn off currently active script, if any http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java index d2aca34..1d47ff2 100644 --- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java @@ -72,9 +72,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { this.fileSystem = fileSystem; } - /** - * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration) - */ + @Override protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException { super.doConfigure(configuration); destination = configuration.getString("destination.[@URL]"); @@ -105,16 +103,12 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { } } - /** - * @see org.apache.james.user.api.UsersRepository#list() - */ + @Override public Iterator<String> list() { return objectRepository.list(); } - /** - * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doAddUser(org.apache.james.user.api.model.User) - */ + @Override protected void doAddUser(User user) throws UsersRepositoryException { if (contains(user.getUserName())) { throw new UsersRepositoryException(user.getUserName() + " already exists."); @@ -126,10 +120,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { } } - /** - * @throws UsersRepositoryException - * @see org.apache.james.user.api.UsersRepository#getUserByName(java.lang.String) - */ + @Override public synchronized User getUserByName(String name) throws UsersRepositoryException { if (ignoreCase) { name = getRealName(name); @@ -182,10 +173,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { return getRealName(name, ignoreCase); } - /** - * @throws UsersRepositoryException - * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doUpdateUser(org.apache.james.user.api.model.User) - */ + @Override protected void doUpdateUser(User user) throws UsersRepositoryException { try { objectRepository.put(user.getUserName(), user); @@ -194,18 +182,14 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { } } - /** - * @see org.apache.james.user.api.UsersRepository#removeUser(java.lang.String) - */ + @Override public synchronized void removeUser(String name) throws UsersRepositoryException { if (!objectRepository.remove(name)) { throw new UsersRepositoryException("User " + name + " does not exist"); } } - /** - * @see org.apache.james.user.api.UsersRepository#contains(java.lang.String) - */ + @Override public boolean contains(String name) throws UsersRepositoryException { if (ignoreCase) { return containsCaseInsensitive(name); @@ -228,10 +212,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { return false; } - /** - * @see org.apache.james.user.api.UsersRepository#test(java.lang.String, - * java.lang.String) - */ + @Override public boolean test(String name, String password) throws UsersRepositoryException { User user; try { @@ -245,9 +226,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { return user.verifyPassword(password); } - /** - * @see org.apache.james.user.api.UsersRepository#countUsers() - */ + @Override public int countUsers() throws UsersRepositoryException { int count = 0; for (Iterator<String> it = list(); it.hasNext(); it.next()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java index c9797d5..a2a69aa 100644 --- a/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java @@ -66,6 +66,7 @@ public class FileMailRepositoryTest { @DisplayName("Default configuration") public class DefaultFileMailRepositoryTest extends GenericFileMailRepositoryTest { + @Override protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { configuration.addProperty("[@FIFO]", "false"); configuration.addProperty("[@CACHEKEYS]", "true"); @@ -77,6 +78,7 @@ public class FileMailRepositoryTest { @DisplayName("No cache configuration") public class NoCacheFileMailRepositoryTest extends GenericFileMailRepositoryTest { + @Override protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { configuration.addProperty("[@FIFO]", "false"); configuration.addProperty("[@CACHEKEYS]", "false"); @@ -88,6 +90,7 @@ public class FileMailRepositoryTest { @DisplayName("Fifo configuration") public class FifoFileMailRepositoryTest extends GenericFileMailRepositoryTest { + @Override protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { configuration.addProperty("[@FIFO]", "true"); configuration.addProperty("[@CACHEKEYS]", "true"); @@ -99,6 +102,7 @@ public class FileMailRepositoryTest { @DisplayName("Fifo no cache configuration") public class FifoNoCacheFileMailRepositoryTest extends GenericFileMailRepositoryTest { + @Override protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { configuration.addProperty("[@FIFO]", "true"); configuration.addProperty("[@CACHEKEYS]", "false"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java index 07d7f79..0c59bea 100644 --- a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java @@ -43,12 +43,14 @@ public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableT private final DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); + @Override @Before public void setUp() throws Exception { defaultConfiguration.setDelimiterParsingDisabled(true); super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java index 876b004..dd194f5 100644 --- a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java @@ -21,17 +21,21 @@ public class SieveFileRepositoryTest extends AbstractSieveRepositoryTest { private FileSystem fileSystem; + @Override @Before public void setUp() throws Exception { this.fileSystem = new FileSystem() { + @Override public File getBasedir() throws FileNotFoundException { return new File(System.getProperty("java.io.tmpdir")); } + @Override public InputStream getResource(String url) throws IOException { return new FileInputStream(getFile(url)); } + @Override public File getFile(String fileURL) throws FileNotFoundException { return new File(getBasedir(), fileURL.substring(FileSystem.FILE_PROTOCOL.length())); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java index 2f45630..a2826cf 100644 --- a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java @@ -54,6 +54,7 @@ public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest { this.usersRepository = getUsersRepository(); } + @Override @After public void tearDown() throws IOException { FileUtils.forceDelete(targetRepositoryFolder); @@ -100,6 +101,7 @@ public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest { public void addUserShouldThrowWhenSameUsernameWithDifferentCase() throws UsersRepositoryException { } + @Override protected void disposeUsersRepository() throws UsersRepositoryException { if (this.usersRepository != null) { Iterator<String> i = this.usersRepository.list(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java index e1289b8..d7bdbcc 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java @@ -56,9 +56,6 @@ public class HBaseDomainList extends AbstractDomainList { super(dns); } - /** - * @see org.apache.james.domainlist.api.DomainList#containsDomain(String) - */ @Override protected boolean containsDomainInternal(String domain) throws DomainListException { HTableInterface table = null; @@ -84,9 +81,6 @@ public class HBaseDomainList extends AbstractDomainList { return false; } - /** - * @see org.apache.james.domainlist.api.DomainList#addDomain(String) - */ @Override public void addDomain(String domain) throws DomainListException { String lowerCasedDomain = domain.toLowerCase(Locale.US); @@ -136,9 +130,6 @@ public class HBaseDomainList extends AbstractDomainList { } } - /** - * @see org.apache.james.domainlist.lib.AbstractDomainList#getDomainListInternal() - */ @Override protected List<String> getDomainListInternal() throws DomainListException { List<String> list = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java index 93709ab..1a3cf51 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java @@ -54,9 +54,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { private static final Logger log = LoggerFactory.getLogger(HBaseRecipientRewriteTable.class.getName()); private static final String ROW_SEPARATOR = "@"; - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#addMappingInternal(String, String, String) - */ @Override protected void addMappingInternal(String user, String domain, Mapping mapping) throws RecipientRewriteTableException { String fixedUser = getFixedUser(user); @@ -70,9 +67,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { } } - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getUserDomainMappingsInternal(String, String) - */ @Override protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException { @@ -109,9 +103,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { return list; } - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getAllMappingsInternal() - */ @Override protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException { HTableInterface table = null; @@ -161,9 +152,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { return map; } - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddressInternal(String, String) - */ @Override protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException { HTableInterface table = null; @@ -203,9 +191,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { return null; } - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#removeMappingInternal(String, String, String) - */ @Override protected void removeMappingInternal(String user, String domain, Mapping mapping) throws RecipientRewriteTableException { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java index 701b998..024b5b8 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java @@ -58,18 +58,12 @@ public class HBaseUsersRepository extends AbstractUsersRepository { */ private String algo; - /** - * @see org.apache.james.user.lib.AbstractUsersRepository#doConfigure(HierarchicalConfiguration) - */ @Override public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException { algo = config.getString("algorithm", "MD5"); super.doConfigure(config); } - /** - * @see org.apache.james.user.api.UsersRepository#getUserByName(String) - */ @Override public User getUserByName(String name) throws UsersRepositoryException { KeyValue keyValue = getKeyValue(name); @@ -80,9 +74,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository { return user; } - /** - * @see org.apache.james.user.api.UsersRepository#updateUser(User) - */ @Override public void updateUser(User user) throws UsersRepositoryException { if (user == null) { @@ -98,9 +89,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository { putUser((DefaultUser) user, false); } - /** - * @see org.apache.james.user.api.UsersRepository#removeUser(String) - */ @Override public void removeUser(String name) throws UsersRepositoryException { HTableInterface table = null; @@ -123,18 +111,12 @@ public class HBaseUsersRepository extends AbstractUsersRepository { } } - /** - * @see org.apache.james.user.api.UsersRepository#contains(String) - */ @Override public boolean contains(String name) throws UsersRepositoryException { KeyValue keyValue = getKeyValue(name.toLowerCase(Locale.US)); return (keyValue != null); } - /** - * @see org.apache.james.user.api.UsersRepository#test(String, String) - */ @Override public boolean test(String name, String password) throws UsersRepositoryException { KeyValue keyValue = getKeyValue(name); @@ -146,9 +128,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository { return false; } - /** - * @see org.apache.james.user.api.UsersRepository#countUsers() - */ @Override public int countUsers() throws UsersRepositoryException { HTableInterface table = null; @@ -181,9 +160,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository { } } - /** - * @see org.apache.james.user.api.UsersRepository#list() - */ @Override public Iterator<String> list() throws UsersRepositoryException { List<String> list = new ArrayList<>(); @@ -217,9 +193,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository { return list.iterator(); } - /** - * @see org.apache.james.user.lib.AbstractUsersRepository#doAddUser(String, String) - */ @Override protected void doAddUser(String username, String password) throws UsersRepositoryException { DefaultUser user = new DefaultUser(username, algo); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java index 9b83fe2..d8af78c 100644 --- a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java +++ b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java @@ -46,6 +46,7 @@ public class HBaseDomainListTest extends AbstractDomainListTest { TablePool.getInstance(cluster.getConf()); } + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -59,9 +60,6 @@ public class HBaseDomainListTest extends AbstractDomainListTest { } } - /** - * @see org.apache.james.domainlist.lib.AbstractDomainListTest#createDomainList() - */ @Override protected DomainList createDomainList() throws Exception { HBaseDomainList domainList = new HBaseDomainList(getDNSServer("localhost")); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java b/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java index acfa754..7015000 100644 --- a/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java +++ b/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java @@ -43,14 +43,12 @@ public class HBaseRecipientRewriteTableTest extends AbstractRecipientRewriteTabl super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); } - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getRecipientRewriteTable() - */ @Override protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception { HBaseRecipientRewriteTable rrt = new HBaseRecipientRewriteTable(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java b/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java index 8267076..4099a3e 100644 --- a/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java +++ b/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java @@ -70,9 +70,6 @@ public class HBaseUsersRepositoryTest extends AbstractUsersRepositoryTest { } } - /** - * @see org.apache.james.user.lib.AbstractUsersRepositoryTest#getUsersRepository() - */ @Override protected AbstractUsersRepository getUsersRepository() throws Exception { HBaseUsersRepository userRepository = new HBaseUsersRepository(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java index 0b36906..1f9328c 100644 --- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java +++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java @@ -98,11 +98,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep CndImporter.registerNodeTypes(new InputStreamReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("org/apache/james/imap/jcr/james.cnd")), login()); } - /** - * @see - * org.apache.james.mailrepository.lib.AbstractMailRepository - * #doConfigure(org.apache.commons.configuration.HierarchicalConfiguration) - */ @Override public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException { this.workspace = config.getString("workspace", null); @@ -122,6 +117,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep return repository.login(creds, workspace); } + @Override public Iterator<String> list() throws MessagingException { try { Session session = login(); @@ -143,6 +139,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep } } + @Override public Mail retrieve(String key) throws MessagingException { try { Session session = login(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java index 35245d8..6248989 100644 --- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java +++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java @@ -67,6 +67,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { this.repository = repository; } + @Override public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException { this.workspace = config.getString("workspace", null); String username = config.getString("username", null); @@ -94,6 +95,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * @return the user being retrieved, null if the user doesn't exist * */ + @Override public User getUserByName(String username) { User user; try { @@ -142,6 +144,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * @throws UsersRepositoryException * If an error occurred */ + @Override public void updateUser(User user) throws UsersRepositoryException { if (user != null && user instanceof JCRUser) { final JCRUser jcrUser = (JCRUser) user; @@ -181,6 +184,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * the user to remove from the repository * @throws UsersRepositoryException */ + @Override public void removeUser(String username) throws UsersRepositoryException { try { final Session session = login(); @@ -212,6 +216,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * @return whether the user is in the repository * @throws UsersRepositoryException */ + @Override public boolean contains(String name) throws UsersRepositoryException { try { final Session session = login(); @@ -247,6 +252,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * * @since James 1.2.2 */ + @Override public boolean test(String username, String password) throws UsersRepositoryException { try { final Session session = login(); @@ -284,6 +290,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * @return the number of users in the repository * @throws UsersRepositoryException */ + @Override public int countUsers() throws UsersRepositoryException { try { final Session session = login(); @@ -314,6 +321,7 @@ public class JCRUsersRepository extends AbstractUsersRepository { * repository. * @throws UsersRepositoryException */ + @Override public Iterator<String> list() throws UsersRepositoryException { final Collection<String> userNames = new ArrayList<>(); try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java index 9eb20b5..c40fcf5 100644 --- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java +++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java @@ -57,6 +57,7 @@ public class JCRUser implements User { this.hashedSaltedPassword = hashedSaltedPassword; } + @Override public String getUserName() { return userName; } @@ -70,6 +71,7 @@ public class JCRUser implements User { return hashedSaltedPassword; } + @Override public boolean setPassword(String newPass) { final boolean result; if (newPass == null) { @@ -81,6 +83,7 @@ public class JCRUser implements User { return result; } + @Override public boolean verifyPassword(String pass) { final boolean result; result = pass != null && hashedSaltedPassword.equals(hashPassword(userName, pass)); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java index 3487a3c..9ce7211 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java @@ -161,6 +161,7 @@ public class JDBCMailRepository extends AbstractMailRepository { this.fileSystem = fileSystem; } + @Override protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException { super.doConfigure(configuration); LOGGER.debug("{}.configure()", getClass().getName()); @@ -372,9 +373,7 @@ public class JDBCMailRepository extends AbstractMailRepository { } } - /** - * @see org.apache.james.mailrepository.lib.AbstractMailRepository#internalStore(Mail) - */ + @Override protected void internalStore(Mail mc) throws IOException, MessagingException { Connection conn = null; try { @@ -591,9 +590,7 @@ public class JDBCMailRepository extends AbstractMailRepository { } } - /** - * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String) - */ + @Override @SuppressWarnings("unchecked") public Mail retrieve(String key) throws MessagingException { if (DEEP_DEBUG) { @@ -701,9 +698,7 @@ public class JDBCMailRepository extends AbstractMailRepository { } } - /** - * @see org.apache.james.mailrepository.lib.AbstractMailRepository#internalRemove(String) - */ + @Override protected void internalRemove(String key) throws MessagingException { Connection conn = null; PreparedStatement removeMessage = null; @@ -725,9 +720,7 @@ public class JDBCMailRepository extends AbstractMailRepository { } } - /** - * @see org.apache.james.mailrepository.api.MailRepository#list() - */ + @Override public Iterator<String> list() throws MessagingException { // System.err.println("listing messages"); Connection conn = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java index 16fbc98..fdba5f1 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java @@ -98,6 +98,7 @@ final class MessageInputStream extends InputStream { private PipedOutputStream out; + @Override public void run() { try { writeStream(mail, out, update); @@ -198,6 +199,7 @@ final class MessageInputStream extends InputStream { /** * @see java.lang.Throwable#getCause() */ + @Override public Throwable getCause() { return caughtException; } @@ -235,9 +237,7 @@ final class MessageInputStream extends InputStream { // wrapper methods - /** - * @see java.io.InputStream#available() - */ + @Override public int available() throws IOException { if (caughtException != null || wrapped == null) { throwException(); @@ -245,9 +245,7 @@ final class MessageInputStream extends InputStream { return wrapped.available(); } - /** - * @see java.io.InputStream#close() - */ + @Override public void close() throws IOException { if (caughtException != null || wrapped == null) { throwException(); @@ -256,23 +254,17 @@ final class MessageInputStream extends InputStream { wrapped = null; } - /** - * @see java.io.InputStream#mark(int) - */ + @Override public synchronized void mark(int readLimit) { wrapped.mark(readLimit); } - /** - * @see java.io.InputStream#markSupported() - */ + @Override public boolean markSupported() { return wrapped.markSupported(); } - /** - * @see java.io.InputStream#read(byte[], int, int) - */ + @Override public int read(byte[] b, int off, int len) throws IOException { if (caughtException != null || wrapped == null) { throwException(); @@ -280,9 +272,7 @@ final class MessageInputStream extends InputStream { return wrapped.read(b, off, len); } - /** - * @see java.io.InputStream#read(byte[]) - */ + @Override public int read(byte[] b) throws IOException { if (caughtException != null || wrapped == null) { throwException(); @@ -290,9 +280,7 @@ final class MessageInputStream extends InputStream { return wrapped.read(b); } - /** - * @see java.io.InputStream#reset() - */ + @Override public synchronized void reset() throws IOException { if (caughtException != null || wrapped == null) { throwException(); @@ -300,9 +288,7 @@ final class MessageInputStream extends InputStream { wrapped.reset(); } - /** - * @see java.io.InputStream#skip(long) - */ + @Override public long skip(long n) throws IOException { if (caughtException != null || wrapped == null) { throwException(); @@ -310,9 +296,7 @@ final class MessageInputStream extends InputStream { return wrapped.skip(n); } - /** - * @see java.io.InputStream#read() - */ + @Override public int read() throws IOException { if (caughtException != null || wrapped == null) { throwException(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java index 5f0658e..8f64a80 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java @@ -107,6 +107,7 @@ public class MimeMessageJDBCSource extends MimeMessageSource { * * @return the String ID */ + @Override public String getSourceId() { return repository.repositoryName + "/" + key; } @@ -119,6 +120,7 @@ public class MimeMessageJDBCSource extends MimeMessageSource { * * @see org.apache.james.server.core.MimeMessageSource#getInputStream() */ + @Override public synchronized InputStream getInputStream() throws IOException { Connection conn = null; PreparedStatement retrieveMessageStream = null; @@ -175,9 +177,8 @@ public class MimeMessageJDBCSource extends MimeMessageSource { /** * Runs a custom SQL statement to check the size of the message body - * - * @see org.apache.james.server.core.MimeMessageSource#getMessageSize() */ + @Override public synchronized long getMessageSize() throws IOException { if (size != -1) { return size; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java index 0335a99..a25d33d 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java @@ -141,6 +141,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable { this.dataSource = dataSource; } + @Override protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException { String destination = conf.getString("[@destinationURL]", null); @@ -194,10 +195,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable { doAddMapping(fixedUser, fixedDomain, mapping.asString()); } - /** - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddressInternal(java.lang.String, - * java.lang.String) - */ + @Override protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException { Connection conn = null; PreparedStatement mappingStmt = null; @@ -227,11 +225,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable { return null; } - /** - * @throws RecipientRewriteTableException - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddress(java.lang.String, - * java.lang.String) - */ + @Override protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException { Connection conn = null; PreparedStatement mappingStmt = null; @@ -259,10 +253,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable { return null; } - /** - * @throws RecipientRewriteTableException - * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getAllMappingsInternal() - */ + @Override protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException { Connection conn = null; PreparedStatement mappingStmt = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java index 2917e39..357d624 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java @@ -128,6 +128,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * the user to be removed * @throws UsersRepositoryException */ + @Override public void removeUser(String userName) throws UsersRepositoryException { User user = getUserByName(userName); if (user != null) { @@ -148,6 +149,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * * @since James 1.2.2 */ + @Override public User getUserByName(String name) throws UsersRepositoryException { return getUserByName(name, ignoreCase); } @@ -157,6 +159,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * * @return true or false */ + @Override public boolean contains(String name) throws UsersRepositoryException { User user = getUserByName(name, ignoreCase); return (user != null); @@ -185,6 +188,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * incorrect or the user doesn't exist * @since James 1.2.2 */ + @Override public boolean test(String name, String password) throws UsersRepositoryException { User user = getUserByName(name, ignoreCase); return user != null && user.verifyPassword(password); @@ -195,6 +199,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * * @return the number of users in the repository */ + @Override public int countUsers() throws UsersRepositoryException { List<String> usernames = listUserNames(); return usernames.size(); @@ -206,6 +211,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * @return Iterator over a collection of Strings, each being one user in the * repository. */ + @Override public Iterator<String> list() throws UsersRepositoryException { return listUserNames().iterator(); } @@ -344,9 +350,8 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * <sqlParameters table="JamesUsers"/> * </repository> * </pre> - * - * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration) */ + @Override protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException { LOGGER.debug("{}.configure()", getClass().getName()); @@ -474,6 +479,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * the user to add * @throws UsersRepositoryException */ + @Override protected void doAddUser(User user) throws UsersRepositoryException { Connection conn = null; PreparedStatement addUserStatement = null; @@ -530,6 +536,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * the user to update * @throws UsersRepositoryException */ + @Override protected void doUpdateUser(User user) throws UsersRepositoryException { Connection conn = null; PreparedStatement updateUserStatement = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java index b790d95..67697ab 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java @@ -35,9 +35,7 @@ import org.apache.james.user.lib.model.DefaultUser; @Deprecated public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository { - /** - * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet) - */ + @Override protected User readUserFromResultSet(ResultSet rsUsers) throws SQLException { // Get the column values String username = rsUsers.getString(1); @@ -68,18 +66,12 @@ public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository { return user; } - /** - * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.model.User, - * java.sql.PreparedStatement) - */ + @Override protected void setUserForInsertStatement(User user, PreparedStatement userInsert) throws SQLException { setUserForStatement(user, userInsert, false); } - /** - * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.model.User, - * java.sql.PreparedStatement) - */ + @Override protected void setUserForUpdateStatement(User user, PreparedStatement userUpdate) throws SQLException { setUserForStatement(user, userUpdate, true); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java index b7c0fc3..fcf2132 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java @@ -33,11 +33,13 @@ import org.junit.Before; */ public class JDBCRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest { + @Override @Before public void setUp() throws Exception { super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java index 5c868c1..6d4bbb3 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java @@ -38,11 +38,13 @@ import org.junit.Before; */ public class DefaultUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTest { + @Override @Before public void setUp() throws Exception { super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java index c04a713..a1f8e89 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java @@ -38,11 +38,13 @@ import org.junit.Before; */ public class JamesUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTest { + @Override @Before public void setUp() throws Exception { super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java index a465a42..1725390 100644 --- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java +++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java @@ -34,6 +34,7 @@ public class CassandraAccessTokenRepositoryTest extends AccessTokenRepositoryTes private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { cassandra = CassandraCluster.create(new CassandraAccessModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
