You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/03/16 10:17:42 UTC
[03/22] james-project git commit: JAMES-2352 use @Override instead of
javadoc comments
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
index a9fc452..76e8518 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
@@ -63,17 +63,12 @@ public final class MailetManagement extends StandardMBean implements MailetManag
lastProcessing.set(processTime);
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetName()
- */
+ @Override
public String getMailetName() {
return config.getMailetName();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetParameters()
- */
+ @Override
public String[] getMailetParameters() {
List<String> parameterList = new ArrayList<>();
Iterator<String> iterator = config.getInitParameterNames();
@@ -85,46 +80,32 @@ public final class MailetManagement extends StandardMBean implements MailetManag
return parameterList.toArray(new String[parameterList.size()]);
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
- */
+ @Override
public long getErrorCount() {
return errorCount.get();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
- */
+ @Override
public long getFastestProcessing() {
return fastestProcessing.get();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
- */
+ @Override
public long getHandledMailCount() {
return getErrorCount() + getSuccessCount();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
- */
+ @Override
public long getSlowestProcessing() {
return slowestProcessing.get();
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
- */
+ @Override
public long getSuccessCount() {
return successCount.get();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
- */
+ @Override
public long getLastProcessing() {
return lastProcessing.get();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
index ccc572a..27a3779 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
@@ -67,79 +67,53 @@ public final class MatcherManagement extends StandardMBean implements MatcherMan
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatcherName()
- */
+ @Override
public String getMatcherName() {
return matcherConfig.getMatcherName();
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatcherCondition()
- */
+ @Override
public String getMatcherCondition() {
return matcherConfig.getCondition();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
- */
+ @Override
public long getErrorCount() {
return errorCount.get();
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
- */
+ @Override
public long getFastestProcessing() {
return fastestProcessing.get();
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
- */
+ @Override
public long getHandledMailCount() {
return getSuccessCount() + getErrorCount();
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
- */
+ @Override
public long getSlowestProcessing() {
return slowestProcessing.get();
}
- /**
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
- */
+ @Override
public long getSuccessCount() {
return successCount.get();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatchedCount()
- */
+ @Override
public long getMatchedCount() {
return matchedCount.get();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getNotMatchedCount()
- */
+ @Override
public long getNotMatchedCount() {
return notMatchedCount.get();
}
- /**
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
- */
+ @Override
public long getLastProcessing() {
return lastProcessing.get();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
index d2c5000..0423bf3 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
@@ -45,6 +45,7 @@ public class And extends GenericCompositeMatcher {
* @return Collection of Recipient from the And composition results of the
* child Matchers.
*/
+ @Override
public Collection<MailAddress> match(final Mail mail) throws MessagingException {
ImmutableList<Set<MailAddress>> individualMatchedResults = performMatchOnMatchers(mail);
return computeIntersection(individualMatchedResults);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
index 4fe2acf..a8cf2d5 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
@@ -40,6 +40,7 @@ public abstract class GenericCompositeMatcher extends GenericMatcher implements
* @param matcher
* Matcher child of the CompositeMatcher.
*/
+ @Override
public void add(Matcher matcher) {
matchers.add(matcher);
}
@@ -47,6 +48,7 @@ public abstract class GenericCompositeMatcher extends GenericMatcher implements
/**
* @return Immutable collection for the child matchers
*/
+ @Override
public List<Matcher> getMatchers() {
return ImmutableList.copyOf(matchers);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
index 35fde7e..d39be52 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
@@ -42,6 +42,7 @@ import com.google.common.collect.Lists;
*/
public class Not extends GenericCompositeMatcher {
+ @Override
public Collection<MailAddress> match(Mail mail) throws MessagingException {
Collection<MailAddress> finalResult = Optional.ofNullable(Lists.newArrayList(mail.getRecipients())).orElse(new ArrayList<>());
for (Matcher matcher : getMatchers()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
index 0eeb1f9..8321dc8 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
@@ -37,6 +37,7 @@ import org.apache.mailet.Matcher;
*/
public class Or extends GenericCompositeMatcher {
+ @Override
public Collection<MailAddress> match(Mail mail) throws MessagingException {
HashSet<MailAddress> result = new HashSet<>();
for (Matcher matcher : getMatchers()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
index 49ba0cc..3170b43 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
@@ -42,6 +42,7 @@ import com.google.common.collect.Sets;
*/
public class Xor extends GenericCompositeMatcher {
+ @Override
public Collection<MailAddress> match(Mail mail) throws MessagingException {
Collection<MailAddress> finalResult = null;
boolean first = true;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
index 1a716e5..8c28422 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
@@ -65,21 +65,14 @@ public abstract class AbstractStateCompositeProcessor implements MailProcessor,
listeners.remove(listener);
}
- /**
- * @see
- * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
- */
+ @Override
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.config = config;
this.enableJmx = config.getBoolean("[@enableJmx]", true);
}
- /**
- * Service the given {@link Mail} by hand the {@link Mail} over the
- * {@link MailProcessor} which is responsible for the
- * {@link Mail#getState()}
- */
+ @Override
public void service(Mail mail) throws MessagingException {
long start = System.currentTimeMillis();
MessagingException ex = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index ce78eaa..4666e98 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -93,10 +93,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
}
- /**
- * @see
- * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
- */
+ @Override
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.state = config.getString("[@state]", null);
if (state == null) {
@@ -395,10 +392,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
*/
private static final String TERMINATING_MAILET_NAME = "Terminating%Mailet%Name";
- /**
- * @see
- * org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
- */
+ @Override
public void service(Mail mail) {
if (!(Mail.ERROR.equals(mail.getState()))) {
// Don't complain if we fall off the end of the
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
index 410ee62..a66f25f 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
@@ -77,6 +77,7 @@ public abstract class AbstractRecipientRewriteTable extends GenericMailet {
* @param mail
* the mail to process
*/
+ @Override
public void service(Mail mail) throws MessagingException {
if (mail.getAttribute(MARKER) != null) {
mail.removeAttribute(MARKER);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
index 5f2fb45..7e9c29a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
@@ -154,6 +154,7 @@ public class BayesianAnalysis extends GenericMailet {
*
* @return a string describing this mailet
*/
+ @Override
public String getMailetInfo() {
return "BayesianAnalysis Mailet";
}
@@ -225,6 +226,7 @@ public class BayesianAnalysis extends GenericMailet {
* @throws MessagingException
* if a problem arises
*/
+ @Override
public void init() throws MessagingException {
String repositoryPath = getInitParameter("repositoryPath");
@@ -284,6 +286,7 @@ public class BayesianAnalysis extends GenericMailet {
* @throws MessagingException
* if a problem arises
*/
+ @Override
public void service(Mail mail) throws MessagingException {
try {
@@ -417,6 +420,7 @@ public class BayesianAnalysis extends GenericMailet {
/**
* Thread entry point.
*/
+ @Override
public void run() {
LOGGER.info("CorpusLoader thread started: will wake up every " + CORPUS_RELOAD_INTERVAL + " ms");
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
index 0447333..2769732 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
@@ -148,11 +148,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
private String feedType;
- /**
- * Return a string describing this mailet.
- *
- * @return a string describing this mailet
- */
+ @Override
public String getMailetInfo() {
return "BayesianAnalysisFeeder Mailet";
}
@@ -195,12 +191,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
this.fs = fs;
}
- /**
- * Mailet initialization routine.
- *
- * @throws MessagingException
- * if a problem arises
- */
+ @Override
public void init() throws MessagingException {
String repositoryPath = getInitParameter("repositoryPath");
@@ -242,6 +233,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
* @param mail
* The Mail message to be scanned.
*/
+ @Override
public void service(Mail mail) {
boolean dbUpdated = false;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
index c4869ef..b8ef707 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
@@ -70,9 +70,7 @@ public class FromRepository extends GenericMailet {
this.mailStore = mailStore;
}
- /**
- * Initialize the mailet, loading configuration information.
- */
+ @Override
public void init() throws MessagingException {
repositoryPath = getInitParameter("repositoryPath");
processor = (getInitParameter("processor") == null) ? Mail.DEFAULT : getInitParameter("processor");
@@ -97,6 +95,7 @@ public class FromRepository extends GenericMailet {
* triggering e-mail (eventually parameterize via the trigger
* message)
*/
+ @Override
public void service(Mail trigger) throws MessagingException {
trigger.setState(Mail.GHOST);
Collection<String> processed = new ArrayList<>();
@@ -128,11 +127,7 @@ public class FromRepository extends GenericMailet {
}
}
- /**
- * Return a string describing this mailet.
- *
- * @return a string describing this mailet
- */
+ @Override
public String getMailetInfo() {
return "FromRepository Mailet";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
index ef8bf1c..1b7e46c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
@@ -70,9 +70,7 @@ public class JDBCAlias extends GenericMailet {
// The JDBCUtil helper class
private final JDBCUtil theJDBCUtil = new JDBCUtil();
- /**
- * Initialize the mailet
- */
+ @Override
public void init() throws MessagingException {
String mappingsURL = getInitParameter("mappings");
@@ -113,6 +111,7 @@ public class JDBCAlias extends GenericMailet {
}
}
+ @Override
public void service(Mail mail) throws MessagingException {
// Then loop through each address in the recipient list and try to map
// it according to the alias table
@@ -168,11 +167,7 @@ public class JDBCAlias extends GenericMailet {
recipients.addAll(recipientsToAdd);
}
- /**
- * Return a string describing this mailet.
- *
- * @return a string describing this mailet
- */
+ @Override
public String getMailetInfo() {
return "JDBC aliasing mailet";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
index 34111e6..4da4680 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
@@ -128,9 +128,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
this.datasource = datasource;
}
- /**
- * Initialize the mailet
- */
+ @Override
public void init() throws MessagingException {
if (getInitParameter("table") == null) {
throw new MailetException("Table location not specified for JDBCRecipientRewriteTable");
@@ -175,6 +173,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
* @param recipientsMap
* the mapping of virtual to real recipients
*/
+ @Override
protected void mapRecipients(Map<MailAddress, String> recipientsMap) throws MessagingException {
Connection conn = null;
PreparedStatement mappingStmt = null;
@@ -208,6 +207,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
}
+ @Override
public String getMailetInfo() {
return "JDBC Virtual User Table mailet";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
index a9e7fc9..168f918 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
@@ -57,14 +57,17 @@ public class LocalDelivery extends GenericMailet {
this.mailboxManager = mailboxManager;
}
+ @Override
public void service(Mail mail) throws MessagingException {
mailDispatcher.dispatch(mail);
}
+ @Override
public String getMailetInfo() {
return "Local Delivery Mailet";
}
+ @Override
public void init() throws MessagingException {
mailDispatcher = MailDispatcher.builder()
.mailStore(SimpleMailStore.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
index da2f6a5..cdf1b57 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
@@ -154,6 +154,7 @@ public class RemoteDelivery extends GenericMailet {
this.startThreads = startThreads;
}
+ @Override
public void init() throws MessagingException {
configuration = new RemoteDeliveryConfiguration(getMailetConfig(), domainList);
queue = queueFactory.createQueue(configuration.getOutGoingQueueName());
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
index b466f55..277cee3 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
@@ -61,9 +61,7 @@ public class SPF extends GenericMailet {
public static final String EXPLANATION_ATTRIBUTE = "org.apache.james.transport.mailets.spf.explanation";
public static final String RESULT_ATTRIBUTE = "org.apache.james.transport.mailets.spf.result";
- /**
- * @see org.apache.mailet.base.GenericMailet#init()
- */
+ @Override
public void init() {
addHeader = Boolean.valueOf(getInitParameter("addHeader", "false"));
SPFLoggerAdapter logger = new SPFLoggerAdapter(Boolean.valueOf(getInitParameter("debug", "false")));
@@ -71,9 +69,7 @@ public class SPF extends GenericMailet {
spf = new DefaultSPF(logger);
}
- /**
- * @see org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
- */
+ @Override
public void service(Mail mail) throws MessagingException {
String sender;
MailAddress senderAddr = mail.getSender();
@@ -116,70 +112,86 @@ public class SPF extends GenericMailet {
this.debug = debug;
}
+ @Override
public void debug(String arg0) {
if (debug) {
LOGGER.debug(arg0);
}
}
+ @Override
public void debug(String arg0, Throwable arg1) {
if (debug) {
LOGGER.debug(arg0, arg1);
}
}
+ @Override
public void error(String arg0) {
LOGGER.error(arg0);
}
+ @Override
public void error(String arg0, Throwable arg1) {
LOGGER.error(arg0, arg1);
}
+ @Override
public void fatalError(String arg0) {
LOGGER.error(arg0);
}
+ @Override
public void fatalError(String arg0, Throwable arg1) {
LOGGER.error(arg0, arg1);
}
+ @Override
public Logger getChildLogger(String childName) {
return new SPFLoggerAdapter(name + "." + childName, debug);
}
+ @Override
public void info(String arg0) {
LOGGER.info(arg0);
}
+ @Override
public void info(String arg0, Throwable arg1) {
LOGGER.info(arg0, arg1);
}
+ @Override
public boolean isDebugEnabled() {
return LOGGER.isDebugEnabled();
}
+ @Override
public boolean isErrorEnabled() {
return LOGGER.isErrorEnabled();
}
+ @Override
public boolean isFatalErrorEnabled() {
return LOGGER.isErrorEnabled();
}
+ @Override
public boolean isInfoEnabled() {
return LOGGER.isInfoEnabled();
}
+ @Override
public boolean isWarnEnabled() {
return LOGGER.isWarnEnabled();
}
+ @Override
public void warn(String arg0) {
LOGGER.warn(arg0);
}
+ @Override
public void warn(String arg0, Throwable arg1) {
LOGGER.warn(arg0, arg1);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
index 400977d..bb8189c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
@@ -79,9 +79,7 @@ public class SpamAssassin extends GenericMailet {
this.usersRepository = usersRepository;
}
- /**
- * @see org.apache.mailet.base.GenericMailet#init()
- */
+ @Override
public void init() throws MessagingException {
spamdHost = Optional.ofNullable(getInitParameter(SPAMD_HOST))
.filter(s -> !Strings.isNullOrEmpty(s))
@@ -91,9 +89,7 @@ public class SpamAssassin extends GenericMailet {
Port.assertValid(spamdPort);
}
- /**
- * @see org.apache.mailet.base.GenericMailet#service(Mail)
- */
+ @Override
public void service(Mail mail) throws MessagingException {
MimeMessage message = mail.getMessage();
@@ -114,9 +110,7 @@ public class SpamAssassin extends GenericMailet {
}
}
- /**
- * @see org.apache.mailet.base.GenericMailet#getMailetInfo()
- */
+ @Override
public String getMailetInfo() {
return "Checks message against SpamAssassin";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
index 0dafb5d..bdcbf18 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
@@ -83,6 +83,7 @@ public class UsersRepositoryAliasingForwarding extends GenericMailet {
processor.processMail(mail);
}
+ @Override
public String getMailetInfo() {
return "Local User Aliasing and Forwarding Mailet";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
index 35e1eef..2a4889a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
@@ -179,9 +179,7 @@ public class WhiteListManager extends GenericMailet {
return this.sqlParameters;
}
- /**
- * Initializes the mailet.
- */
+ @Override
public void init() throws MessagingException {
automaticInsert = Boolean.valueOf(getInitParameter("automaticInsert"));
LOGGER.debug("automaticInsert: {}", automaticInsert);
@@ -241,9 +239,7 @@ public class WhiteListManager extends GenericMailet {
deleteByPK = sqlQueries.getSqlString("deleteByPK", true);
}
- /**
- * Services the mailet.
- */
+ @Override
public void service(Mail mail) throws MessagingException {
// check if it's a local sender
@@ -285,11 +281,7 @@ public class WhiteListManager extends GenericMailet {
}
- /**
- * Returns a string describing this mailet.
- *
- * @return a string describing this mailet
- */
+ @Override
public String getMailetInfo() {
return "White List Manager mailet";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
index 084acd5..736bed8 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
@@ -81,9 +81,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
*/
private Map<String, String> mappings = new HashMap<>();
- /**
- * Initialize the mailet
- */
+ @Override
public void init() throws MessagingException {
String mapping = getInitParameter("mapping");
@@ -99,6 +97,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
* @param recipientsMap
* the mapping of virtual to real recipients
*/
+ @Override
protected void mapRecipients(Map<MailAddress, String> recipientsMap) throws MessagingException {
Collection<MailAddress> recipients = recipientsMap.keySet();
@@ -114,6 +113,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
}
+ @Override
public String getMailetInfo() {
return "XML Virtual User Table mailet";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
index 15d97f9..ec207da 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
@@ -29,6 +29,7 @@ import com.github.steveash.guavate.Guavate;
public class DiscardAction extends FileIntoAction implements MailAction {
+ @Override
public void execute(Action action, Mail mail, final ActionContext context)
throws MessagingException {
if (action instanceof ActionDiscard) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
index 299ab01..f9fcd90 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
@@ -37,6 +37,7 @@ public class FileIntoAction implements MailAction {
private static final char HIERARCHY_DELIMITER = '.';
+ @Override
public void execute(Action action, Mail mail, ActionContext context) throws MessagingException {
if (action instanceof ActionFileInto) {
final ActionFileInto fileIntoAction = (ActionFileInto) action;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
index cdba9ca..f5665b4 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
@@ -34,6 +34,7 @@ public class KeepAction extends FileIntoAction implements MailAction {
private static final String INBOX = "INBOX";
+ @Override
public void execute(Action action, Mail mail, ActionContext context)
throws MessagingException {
if (action instanceof ActionKeep) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
index f22af50..4fff11e 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
public class RedirectAction implements MailAction {
private static final Logger LOGGER = LoggerFactory.getLogger(RedirectAction.class.getName());
+ @Override
public void execute(Action action, Mail mail, ActionContext context)
throws MessagingException {
if (action instanceof ActionRedirect) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index 473221b..25f2b61 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -51,6 +51,7 @@ import org.slf4j.LoggerFactory;
public class RejectAction implements MailAction {
private static final Logger LOGGER = LoggerFactory.getLogger(RejectAction.class);
+ @Override
public void execute(Action action, Mail mail, ActionContext context)
throws MessagingException {
if (action instanceof ActionReject) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
index 0d082a8..6ec17af 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
@@ -103,14 +103,17 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
setMailetContext(aMailetContext);
}
+ @Override
public DateTime getScriptActivationDate() {
return scriptActivationDate;
}
+ @Override
public DateTime getScriptInterpretationDate() {
return scriptInterpretationDate;
}
+ @Override
public MailAddress getRecipient() {
return recipient;
}
@@ -124,6 +127,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
return getMail().getMessage();
}
+ @Override
public List<Action> getActions() {
List<Action> actions = null;
if (null == (actions = getActionsBasic())) {
@@ -141,10 +145,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
return fieldActions;
}
+ @Override
public void addAction(Action action) {
getActions().add(action);
}
+ @Override
public void executeActions() throws SieveException {
final List<Action> actions = getActions();
for (final Action action: actions) {
@@ -168,9 +174,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
setActions(computeActions());
}
- /**
- * @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
- */
+ @Override
public List<String> getHeader(String name) throws SieveMailException {
try {
String[] headers = getMessage().getHeader(name);
@@ -180,9 +184,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
- /**
- * @see org.apache.jsieve.mail.MailAdapter#getHeaderNames()
- */
+ @Override
public List<String> getHeaderNames() throws SieveMailException {
Set<String> headerNames = new HashSet<>();
try {
@@ -196,16 +198,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
- /**
- * @see org.apache.jsieve.mail.MailAdapter#getMatchingHeader(String)
- */
+ @Override
public List<String> getMatchingHeader(String name) throws SieveMailException {
return MailUtils.getMatchingHeader(this, name);
}
- /**
- * @see org.apache.jsieve.mail.MailAdapter#getSize()
- */
+ @Override
public int getSize() throws SieveMailException {
try {
return (int) getMail().getMessageSize();
@@ -230,6 +228,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
return envelopes;
}
+ @Override
public List<String> getEnvelope(String name) throws SieveMailException {
List<String> values = new ArrayList<>(1);
String value = getEnvelopes().get(name);
@@ -239,16 +238,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
return values;
}
- /**
- * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelopeNames()
- */
+ @Override
public List<String> getEnvelopeNames() throws SieveMailException {
return new ArrayList<>(getEnvelopes().keySet());
}
- /**
- * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getMatchingEnvelope(String)
- */
+ @Override
public List<String> getMatchingEnvelope(String name) throws SieveMailException {
final List<String> matchedEnvelopeValues = new ArrayList<>(32);
for (String envelopeName: getEnvelopeNames()) {
@@ -336,6 +331,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
+ " Message ID: " + (null == messageID ? "null" : messageID);
}
+ @Override
public String getContentType() throws SieveMailException {
try {
return getMessage().getContentType();
@@ -344,6 +340,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
+ @Override
public Address[] parseAddresses(String arg) throws SieveMailException, InternetAddressException {
try {
List<String> headerValues = getHeader(arg);
@@ -368,18 +365,22 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
+ @Override
public String getServerInfo() {
return getMailetContext().getServerInfo();
}
+ @Override
public void post(String uri, Mail mail) throws MessagingException {
poster.post(uri, mail);
}
+ @Override
public void post(MailAddress sender, Collection<MailAddress> recipients, MimeMessage mail) throws MessagingException {
getMailetContext().sendMail(sender, recipients, mail);
}
+ @Override
public boolean isInBodyText(List<String> phrasesCaseInsensitive) throws SieveMailException {
try {
return MessageMatcher.builder()
@@ -393,6 +394,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
+ @Override
public boolean isInBodyRaw(List<String> phrasesCaseInsensitive) throws SieveMailException {
try {
return MessageMatcher.builder()
@@ -406,6 +408,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
+ @Override
public boolean isInBodyContent(List<String> contentTypes, List<String> phrasesCaseInsensitive) throws SieveMailException {
try {
return MessageMatcher.builder()
@@ -419,5 +422,6 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
+ @Override
public void setContext(SieveContext context) {}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
index 1b8bd74..c07201f 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
@@ -181,6 +181,7 @@ public class ManageSieveMailet extends GenericMailet implements MessageToCoreToM
}
}
+ @Override
@VisibleForTesting
public String getHelp() throws MessagingException {
if (null == help) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
index 12d8b79..0a585aa 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
@@ -141,6 +141,7 @@ public class ProcessRedirectNotify {
super(originalMessage);
}
+ @Override
protected void updateHeaders() throws MessagingException {
if (getMessageID() == null) {
super.updateHeaders();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
index 60722a2..cd22059 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
@@ -88,6 +88,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
* to be safe, it is not used by JavaMail 1.3. This is the only method used
* by JavaMail 1.4.
*/
+ @Override
public Socket createSocket() throws IOException {
Socket s = new Socket();
s.bind(new InetSocketAddress(bindAddress, 0));
@@ -99,6 +100,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
* is the one which is used by JavaMail 1.3. This is not used by JavaMail
* 1.4.
*/
+ @Override
public Socket createSocket(String host, int port) throws IOException {
return new Socket(host, port, bindAddress, 0);
}
@@ -108,6 +110,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
* to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
* 1.4.
*/
+ @Override
public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort) throws IOException {
return new Socket(host, port, clientHost == null ? bindAddress : clientHost, clientPort);
}
@@ -117,6 +120,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
* to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
* 1.4.
*/
+ @Override
public Socket createSocket(InetAddress host, int port) throws IOException {
return new Socket(host, port, bindAddress, 0);
}
@@ -126,6 +130,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
* to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
* 1.4.
*/
+ @Override
public Socket createSocket(InetAddress address, int port, InetAddress clientAddress, int clientPort) throws IOException {
return new Socket(address, port, clientAddress == null ? bindAddress : clientAddress, clientPort);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
index 338cf06..acbbad5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
@@ -131,6 +131,7 @@ public abstract class AbstractSQLWhitelistMatcher extends GenericMatcher {
super.init();
}
+ @Override
public Collection<MailAddress> match(Mail mail) throws MessagingException {
// check if it's a local sender
MailAddress senderMailAddress = mail.getSender();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
index 6adc888..a384396 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
@@ -94,6 +94,7 @@ public abstract class AbstractStorageQuota extends AbstractQuotaMatcher {
* @param recipient
* the recipient to check
*/
+ @Override
protected boolean isRecipientChecked(MailAddress recipient) throws MessagingException {
MailetContext mailetContext = getMailetContext();
return super.isRecipientChecked(recipient) && (mailetContext.isLocalEmail(recipient));
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
index 75e6756..043bfb0 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
@@ -63,6 +63,7 @@ public class InSpammerBlacklist extends GenericMatcher {
this.dnsServer = dnsService;
}
+ @Override
public void init() throws MessagingException {
network = getCondition();
@@ -73,6 +74,7 @@ public class InSpammerBlacklist extends GenericMatcher {
}
+ @Override
public Collection<MailAddress> match(Mail mail) {
String host = mail.getRemoteAddr();
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
index dca0547..5022879 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
@@ -71,17 +71,12 @@ public class IsInWhiteList extends AbstractSQLWhitelistMatcher {
selectByPK = sqlQueries.getSqlString("selectByPK", true);
}
- /**
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getSQLSectionName()
- */
+ @Override
protected String getSQLSectionName() {
return "WhiteList";
}
- /**
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
- * #matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
- */
+ @Override
protected boolean matchedWhitelist(MailAddress recipientMailAddress, Mail mail) throws MessagingException {
MailAddress senderMailAddress = mail.getSender();
String senderUser = senderMailAddress.getLocalPart().toLowerCase(Locale.US);
@@ -178,18 +173,12 @@ public class IsInWhiteList extends AbstractSQLWhitelistMatcher {
return false;
}
- /**
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
- * #getTableCreateQueryName()
- */
+ @Override
protected String getTableCreateQueryName() {
return "createWhiteListTable";
}
- /**
- * @see
- * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName()
- */
+ @Override
protected String getTableName() {
return "whiteListTableName";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
index ff60d47..c4415fe 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
@@ -33,10 +33,7 @@ import org.apache.mailet.Matcher;
@Experimental
public class MailboxQuotaFixed extends AbstractStorageQuota {
- /**
- * @see org.apache.james.mailet.standard.matchers.AbstractQuotaMatcher
- * #getQuota(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
- */
+ @Override
protected long getQuota(MailAddress arg0, Mail arg1) throws MessagingException {
return parseQuota(this.getCondition());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
index 2978859..8b0f20c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
@@ -66,9 +66,7 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
this.dns = dns;
}
- /**
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getSQLSectionName()
- */
+ @Override
protected String getSQLSectionName() {
return "NetworkWhiteList";
}
@@ -80,10 +78,7 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
}
- /**
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
- * #matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
- */
+ @Override
protected boolean matchedWhitelist(MailAddress recipientMailAddress, Mail mail) throws MessagingException {
Connection conn = null;
PreparedStatement selectStmt = null;
@@ -140,17 +135,12 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
}
}
- /**
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableCreateQueryName()
- */
+ @Override
protected String getTableCreateQueryName() {
return "createNetworkWhiteListTable";
}
- /**
- * @see
- * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName()
- */
+ @Override
protected String getTableName() {
return "networkWhiteListTableName";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
index a6ce9ea..2ad4291 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
public class SenderInFakeDomain extends AbstractNetworkMatcher {
private static final Logger LOGGER = LoggerFactory.getLogger(SenderInFakeDomain.class);
+ @Override
public Collection<MailAddress> match(Mail mail) {
if (mail.getSender() == null) {
return null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
index 19f5fa0..8d015c4 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
@@ -252,20 +252,11 @@ class Account implements Comparable<Account> {
fieldSequenceNumber = sequenceNumber;
}
- /**
- * Compares this object with the specified object for order. Returns a
- * negative integer, zero, or a positive integer if this object is less
- * than, equal to, or greater than the specified object.
- *
- * @see java.lang.Comparable#compareTo(Object)
- */
+ @Override
public int compareTo(Account account) {
return getSequenceNumber() - account.getSequenceNumber();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean equals(Object obj) {
if (this == obj) {
@@ -281,9 +272,6 @@ class Account implements Comparable<Account> {
return getSequenceNumber() == other.getSequenceNumber();
}
- /**
- * {@inheritDoc}
- */
@Override
public int hashCode() {
return 31 * 17 + getSequenceNumber();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
index 76c9898..5cd5279 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
@@ -402,9 +402,8 @@ public class FetchMail implements Runnable, Configurable {
* a new <code>ParsedConfiguration</code>, an <code>Account</code> for each
* configured static account and a
* <code>ParsedDynamicAccountParameters</code> for each dynamic account.
- *
- * @see org.apache.james.lifecycle.api.Configurable#configure(HierarchicalConfiguration)
*/
+ @Override
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
// Set any Session parameters passed in the Configuration
setSessionParameters(configuration);
@@ -459,6 +458,7 @@ public class FetchMail implements Runnable, Configurable {
/**
* Method target triggered fetches mail for each configured account.
*/
+ @Override
public void run() {
// if we are already fetching then just return
if (isFetching()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
index 4a650f3..d571b9d 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
@@ -87,10 +87,7 @@ public class FetchScheduler implements FetchSchedulerMBean, Configurable {
this.domainList = domainList;
}
- /**
- * @see
- * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
- */
+ @Override
public final void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.conf = config;
}
@@ -149,6 +146,7 @@ public class FetchScheduler implements FetchSchedulerMBean, Configurable {
*
* @return is the service enabled.
*/
+ @Override
public final boolean isEnabled() {
return enabled;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
index 3d2e11d..2f446b7 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
@@ -64,9 +64,8 @@ public class FolderProcessor extends ProcessorAbstract {
* Method process opens a Folder, fetches the Envelopes for all of its
* Messages, creates a <code>MessageProcessor</code> and runs it to process
* each message.
- *
- * @see org.apache.james.fetchmail.ProcessorAbstract#process()
*/
+ @Override
public void process() throws MessagingException {
int messagesProcessed = 0;
int messageCount = 0;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
index 1e33fc1..313b9d6 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
@@ -292,9 +292,8 @@ public class MessageProcessor extends ProcessorAbstract {
/**
* Method process attempts to deliver a fetched message.
- *
- * @see org.apache.james.fetchmail.ProcessorAbstract#process()
*/
+ @Override
public void process() throws MessagingException {
// Log delivery attempt
LOGGER.debug("Attempting delivery of message with id. {}", getMessageIn().getMessageID());
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
index a41460f..773aa85 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
@@ -46,9 +46,8 @@ public class StoreProcessor extends ProcessorAbstract {
* Method process connects to a Folder in a Message Store, creates a
* <code>FolderProcessor</code> and runs it to process the messages in the
* Folder.
- *
- * @see org.apache.james.fetchmail.ProcessorAbstract#process()
*/
+ @Override
public void process() throws MessagingException {
Store store = null;
Folder folder;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
index 51100aa..be5ba42 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
@@ -31,6 +31,7 @@ import org.apache.mailet.base.GenericMatcher;
import com.google.common.collect.ImmutableList;
public class SentByJmap extends GenericMatcher {
+ @Override
public Collection<MailAddress> match(Mail mail) {
String authUser = (String) mail.getAttribute(MailMetadata.MAIL_METADATA_USERNAME_ATTRIBUTE);
if (authUser != null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
index 556adec..9b281bf 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
@@ -77,6 +77,7 @@ public class GetMailboxesMethod implements Method {
return GetMailboxesRequest.class;
}
+ @Override
public Stream<JmapResponse> process(JmapRequest request, ClientId clientId, MailboxSession mailboxSession) {
Preconditions.checkArgument(request instanceof GetMailboxesRequest);
GetMailboxesRequest mailboxesRequest = (GetMailboxesRequest) request;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
index 4dfa901..22f9579 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
@@ -84,6 +84,7 @@ public class SetMailboxesCreationProcessor implements SetMailboxesProcessor {
this.mailboxIdFactory = mailboxIdFactory;
}
+ @Override
public SetMailboxesResponse process(SetMailboxesRequest request, MailboxSession mailboxSession) {
TimeMetric timeMetric = metricFactory.timer(JMAP_PREFIX + "SetMailboxesCreationProcessor");
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
index c81a2a1..2030c08 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
@@ -78,6 +78,7 @@ public class SetMailboxesDestructionProcessor implements SetMailboxesProcessor {
this.mailboxFactory = mailboxFactory;
}
+ @Override
public SetMailboxesResponse process(SetMailboxesRequest request, MailboxSession mailboxSession) {
TimeMetric timeMetric = metricFactory.timer(JMAP_PREFIX + "SetMailboxesDestructionProcessor");
ImmutableMap<MailboxId, Mailbox> idToMailbox = mapDestroyRequests(request, mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
index eaad72a..49e191e 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
@@ -58,6 +58,7 @@ public class SetMessagesMethod implements Method {
return SetMessagesRequest.class;
}
+ @Override
public Stream<JmapResponse> process(JmapRequest request, ClientId clientId, MailboxSession mailboxSession) {
Preconditions.checkArgument(request instanceof SetMessagesRequest);
SetMessagesRequest setMessagesRequest = (SetMessagesRequest) request;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
index 5508073..5ba1763 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
@@ -48,6 +48,7 @@ public enum MailboxProperty implements Property {
this.fieldName = fieldName;
}
+ @Override
public String asFieldName() {
return fieldName;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
index 47c2e5e..60a5f38 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
@@ -35,10 +35,7 @@ public abstract class AbstractNettyImapRequestLineReader extends ImapRequestLine
}
- /**
- * @see
- * org.apache.james.imap.decode.ImapRequestLineReader#commandContinuationRequest()
- */
+ @Override
protected void commandContinuationRequest() throws DecodingException {
// only write the request out if this is not a retry to process the
// request..
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
index 38917da..e778509 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
@@ -54,18 +54,14 @@ public class ChannelImapResponseWriter implements ImapResponseWriter {
this.zeroCopy = zeroCopy;
}
- /**
- * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
- */
+ @Override
public void write(byte[] buffer) throws IOException {
if (channel.isConnected()) {
channel.write(ChannelBuffers.wrappedBuffer(buffer));
}
}
- /**
- * @see org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal)
- */
+ @Override
public void write(Literal literal) throws IOException {
if (channel.isConnected()) {
InputStream in = literal.getInputStream();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
index d834e0b..b44df8d 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
@@ -133,17 +133,12 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
}
}
- /**
- * @see AbstractConfigurableAsyncServer#getDefaultPort()
- */
@Override
public int getDefaultPort() {
return 143;
}
- /**
- * @see AbstractConfigurableAsyncServer#getServiceType()
- */
+ @Override
public String getServiceType() {
return "IMAP Service";
}
@@ -158,6 +153,7 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
private final TimeUnit timeoutUnit = TimeUnit.SECONDS;
+ @Override
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = pipeline();
pipeline.addLast(GROUP_HANDLER, groupHandler);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
index 6e99515..ec6c2d8 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
@@ -68,11 +68,7 @@ public class ImapRequestFrameDecoder extends FrameDecoder implements NettyConsta
super.channelOpen(ctx, e);
}
- /**
- * @see
- * org.jboss.netty.handler.codec.frame.FrameDecoder#decode(org.jboss.netty.channel.ChannelHandlerContext,
- * org.jboss.netty.channel.Channel, org.jboss.netty.buffer.ChannelBuffer)
- */
+ @Override
@SuppressWarnings("unchecked")
protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception {
buffer.markReaderIndex();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
index 4f796bf..c090da0 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
@@ -57,6 +57,7 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead
* wrapped {@link ChannelBuffer} contains not enough data to read the next
* char
*/
+ @Override
public char nextChar() throws DecodingException {
if (!nextSeen) {
int next;
@@ -78,6 +79,7 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead
* {@link ChannelBuffer} contains enough data. If not it will throw a
* {@link NotEnoughDataException}
*/
+ @Override
public InputStream read(int size, boolean extraCRLF) throws DecodingException {
int crlf = 0;
if (extraCRLF) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
index f3da750..f10fa1a 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
@@ -62,49 +62,36 @@ public class NettyImapSession implements ImapSession, NettyConstants {
return channel;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#logout()
- */
+ @Override
public void logout() {
closeMailbox();
state = ImapSessionState.LOGOUT;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#authenticated()
- */
+ @Override
public void authenticated() {
this.state = ImapSessionState.AUTHENTICATED;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#deselect()
- */
+ @Override
public void deselect() {
this.state = ImapSessionState.AUTHENTICATED;
closeMailbox();
}
- /**
- * @see
- * org.apache.james.imap.api.process.ImapSession#selected(org.apache.james.imap.api.process.SelectedMailbox)
- */
+ @Override
public void selected(SelectedMailbox mailbox) {
this.state = ImapSessionState.SELECTED;
closeMailbox();
this.selectedMailbox = mailbox;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#getSelected()
- */
+ @Override
public SelectedMailbox getSelected() {
return this.selectedMailbox;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#getState()
- */
+ @Override
public ImapSessionState getState() {
return this.state;
}
@@ -116,18 +103,12 @@ public class NettyImapSession implements ImapSession, NettyConstants {
}
}
- /**
- * @see
- * org.apache.james.imap.api.process.ImapSession#getAttribute(java.lang.String)
- */
+ @Override
public Object getAttribute(String key) {
return attributesByKey.get(key);
}
- /**
- * @see
- * org.apache.james.imap.api.process.ImapSession#setAttribute(java.lang.String, java.lang.Object)
- */
+ @Override
public void setAttribute(String key, Object value) {
if (value == null) {
attributesByKey.remove(key);
@@ -136,9 +117,7 @@ public class NettyImapSession implements ImapSession, NettyConstants {
}
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#startTLS()
- */
+ @Override
public boolean startTLS() {
if (!supportStartTLS()) {
return false;
@@ -157,24 +136,17 @@ public class NettyImapSession implements ImapSession, NettyConstants {
return true;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#supportStartTLS()
- */
+ @Override
public boolean supportStartTLS() {
return sslContext != null;
}
- /**
- * @see
- * org.apache.james.imap.api.process.ImapSession#isCompressionSupported()
- */
+ @Override
public boolean isCompressionSupported() {
return compress;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#startCompression()
- */
+ @Override
public boolean startCompression() {
if (!isCompressionSupported()) {
return false;
@@ -201,49 +173,36 @@ public class NettyImapSession implements ImapSession, NettyConstants {
return true;
}
- /**
- * @see
- * org.apache.james.imap.api.process.ImapSession#pushLineHandler(org.apache.james.imap.api.process.ImapLineHandler)
- */
+ @Override
public void pushLineHandler(ImapLineHandler lineHandler) {
channel.setReadable(false);
channel.getPipeline().addBefore(REQUEST_DECODER, "lineHandler" + handlerCount++, new ImapLineHandlerAdapter(this, lineHandler));
channel.setReadable(true);
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#popLineHandler()
- */
+ @Override
public void popLineHandler() {
channel.setReadable(false);
channel.getPipeline().remove("lineHandler" + --handlerCount);
channel.setReadable(true);
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#isPlainAuthDisallowed()
- */
+ @Override
public boolean isPlainAuthDisallowed() {
return plainAuthDisallowed;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#isTLSActive()
- */
+ @Override
public boolean isTLSActive() {
return channel.getPipeline().get(SSL_HANDLER) != null;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#supportMultipleNamespaces()
- */
+ @Override
public boolean supportMultipleNamespaces() {
return false;
}
- /**
- * @see org.apache.james.imap.api.process.ImapSession#isCompressionActive()
- */
+ @Override
public boolean isCompressionActive() {
return channel.getPipeline().get(ZLIB_DECODER) != null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org