http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java index f19b94a..9e3ea5d 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java @@ -64,6 +64,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * Called by the mailer container to indicate to a mailet that the * mailet is being taken out of service. */ + @Override public void destroy() { //Do nothing } @@ -123,6 +124,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * @param name - a String specifying the name of the initialization parameter * @return a String containing the value of the initalization parameter */ + @Override public String getInitParameter(String name) { return config.getInitParameter(name); } @@ -159,6 +161,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * @return an Iterator of String objects containing the names of * the mailet's initialization parameters */ + @Override public Iterator<String> getInitParameterNames() { return config.getInitParameterNames(); } @@ -168,6 +171,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * * @return the MailetConfig object that initialized this mailet */ + @Override public MailetConfig getMailetConfig() { return config; } @@ -178,6 +182,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * * @return the MailetContext object passed to this mailet by the init method */ + @Override public MailetContext getMailetContext() { return getMailetConfig().getMailetContext(); } @@ -189,6 +194,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * * @return information about this mailet, by default an empty string */ + @Override public String getMailetInfo() { return ""; } @@ -198,6 +204,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * * @return the name of this mailet instance */ + @Override public String getMailetName() { return config.getMailetName(); } @@ -216,6 +223,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * @throws MessagingException * if an exception occurs that interrupts the mailet's normal operation */ + @Override public void init(MailetConfig newConfig) throws MessagingException { config = newConfig; init(); @@ -270,6 +278,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * routing information * @throws javax.mail.MessagingException - if an exception occurs that interferes with the mailet's normal operation */ + @Override public abstract void service(Mail mail) throws javax.mail.MessagingException;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java index 9dc25dc..3c997ab 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java @@ -51,6 +51,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * Called by the mailet container to indicate to a matcher that the * matcher is being taken out of service. */ + @Override public void destroy() { //Do nothing } @@ -64,6 +65,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * * @return String a String containing the value of the initalization parameter */ + @Override public String getCondition() { return config.getCondition(); } @@ -73,6 +75,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * * @return MatcherConfig the MatcherConfig object that initialized this matcher */ + @Override public MatcherConfig getMatcherConfig() { return config; } @@ -83,6 +86,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * * @return MailetContext the MailetContext object passed to this matcher by the init method */ + @Override public MailetContext getMailetContext() { return getMatcherConfig().getMailetContext(); } @@ -94,6 +98,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * * @return String information about this matcher, by default an empty string */ + @Override public String getMatcherInfo() { return ""; } @@ -103,6 +108,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * * @return the name of this matcher instance */ + @Override public String getMatcherName() { return config.getMatcherName(); } @@ -121,6 +127,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * @throws MessagingException * if an exception occurs that interrupts the matcher's normal operation */ + @Override public void init(MatcherConfig newConfig) throws MessagingException { config = newConfig; init(); @@ -178,5 +185,6 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig { * @throws javax.mail.MessagingException - if an exception occurs that interferes with the mailet's normal operation * occurred */ + @Override public abstract Collection<MailAddress> match(Mail mail) throws MessagingException; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java index f63a6cd..ab50830 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java @@ -48,6 +48,7 @@ public abstract class GenericRecipientMatcher extends GenericMatcher { * @param mail - the message and routing information to determine whether to match * @return Collection the Collection of MailAddress objects that have been matched */ + @Override public final Collection<MailAddress> match(Mail mail) throws MessagingException { Collection<MailAddress> matching = new ArrayList<>(); for (MailAddress recipient : mail.getRecipients()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java index 97ad423..d009d70 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java @@ -42,30 +42,22 @@ public class MatcherInverter implements Matcher { this.wrappedMatcher = wrappedMatcher; } - /** - * @see org.apache.mailet.Matcher#destroy() - */ + @Override public void destroy() { wrappedMatcher.destroy(); } - /** - * @see org.apache.mailet.Matcher#getMatcherConfig() - */ + @Override public MatcherConfig getMatcherConfig() { return wrappedMatcher.getMatcherConfig(); } - /** - * @see org.apache.mailet.Matcher#getMatcherInfo() - */ + @Override public String getMatcherInfo() { return wrappedMatcher.getMatcherInfo(); } - /** - * @see org.apache.mailet.Matcher#destroy() - */ + @Override public void init(MatcherConfig config) throws MessagingException { wrappedMatcher.init(config); } @@ -74,6 +66,7 @@ public class MatcherInverter implements Matcher { * Return a Collection of "not matched" recipients * */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { // Create a new recipient Collection cause mail.getRecipients() give a reference to the internal // list of recipients. If we make changes there the original collection whould be corrupted http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java index 56ed750..16c7b5c 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java @@ -63,9 +63,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler { fieldDataFlavor = aDataFlavor; } - /** - * @see javax.activation.DataContentHandler#getContent(javax.activation.DataSource) - */ + @Override public Object getContent(DataSource aDataSource) throws IOException { Object content = null; try { @@ -86,10 +84,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler { protected abstract Object computeContent(DataSource aDataSource) throws MessagingException; - /** - * @see javax.activation.DataContentHandler#getTransferData(java.awt.datatransfer.DataFlavor, - * javax.activation.DataSource) - */ + @Override public Object getTransferData(DataFlavor aDataFlavor, DataSource aDataSource) throws UnsupportedFlavorException, IOException { Object content = null; @@ -99,9 +94,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler { return content; } - /** - * @see javax.activation.DataContentHandler#getTransferDataFlavors() - */ + @Override public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[]{getDataFlavor()}; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java index 128b757..49177b3 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java @@ -53,17 +53,13 @@ public class MessageDispositionNotification extends AbstractDataContentHandler { super(); } - /** - * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor() - */ + @Override protected ActivationDataFlavor computeDataFlavor() { return new ActivationDataFlavor(String.class, "message/disposition-notification", "Message String"); } - /** - * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource) - */ + @Override protected Object computeContent(DataSource aDataSource) throws MessagingException { String encoding = getCharacterSet(aDataSource.getContentType()); @@ -100,10 +96,7 @@ public class MessageDispositionNotification extends AbstractDataContentHandler { return content; } - /** - * @see javax.activation.DataContentHandler#writeTo(java.lang.Object, - * java.lang.String, java.io.OutputStream) - */ + @Override public void writeTo(Object aPart, String aMimeType, OutputStream aStream) throws IOException { if (!(aPart instanceof String)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java index f9979c5..c17be64 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java @@ -42,18 +42,13 @@ public class MultipartReport extends AbstractDataContentHandler { super(); } - /** - * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor() - */ + @Override protected ActivationDataFlavor computeDataFlavor() { return new ActivationDataFlavor(MimeMultipartReport.class, "multipart/report", "Multipart Report"); } - /** - * @see javax.activation.DataContentHandler#writeTo(java.lang.Object, - * java.lang.String, java.io.OutputStream) - */ + @Override public void writeTo(Object aPart, String aMimeType, OutputStream aStream) throws IOException { if (!(aPart instanceof MimeMultipartReport)) { @@ -67,9 +62,7 @@ public class MultipartReport extends AbstractDataContentHandler { } } - /** - * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource) - */ + @Override protected Object computeContent(DataSource aDataSource) throws MessagingException { return new MimeMultipartReport(aDataSource); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java index ddcf874..d95001c 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java @@ -39,6 +39,7 @@ public class MatcherInverterTest { public void testAllMatch() throws MessagingException { MatcherInverter inverter = new MatcherInverter(new GenericMatcher() { + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { return null; } @@ -57,6 +58,7 @@ public class MatcherInverterTest { MatcherInverter inverter = new MatcherInverter(new GenericMatcher() { + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { return mail.getRecipients(); } @@ -75,6 +77,7 @@ public class MatcherInverterTest { MatcherInverter inverter = new MatcherInverter(new GenericMatcher() { + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { return Arrays.asList(address1); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java index f7d279b..829d9f7 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java @@ -366,10 +366,12 @@ public class FakeMailContext implements MailetContext { this.postmaster = postmaster; } + @Override public void bounce(Mail mail, String message) throws MessagingException { bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.empty())); } + @Override public void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException { bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.ofNullable(bouncer))); } @@ -377,34 +379,42 @@ public class FakeMailContext implements MailetContext { /** * @deprecated use the generic dnsLookup method */ + @Override public Collection<String> getMailServers(String host) { return null; // trivial implementation } + @Override public MailAddress getPostmaster() { return postmaster; } + @Override public Object getAttribute(String name) { return attributes.get(name); } + @Override public Iterator<String> getAttributeNames() { return attributes.keySet().iterator(); } + @Override public int getMajorVersion() { return 0; // trivial implementation } + @Override public int getMinorVersion() { return 0; // trivial implementation } + @Override public String getServerInfo() { return "Mock Server"; } + @Override public boolean isLocalServer(String serverName) { return serverName.equals("localhost"); // trivial implementation } @@ -412,10 +422,12 @@ public class FakeMailContext implements MailetContext { /** * @deprecated use {@link #isLocalEmail(MailAddress)} instead */ + @Override public boolean isLocalUser(String userAccount) { return false; // trivial implementation } + @Override public boolean isLocalEmail(MailAddress mailAddress) { return false; // trivial implementation } @@ -423,6 +435,7 @@ public class FakeMailContext implements MailetContext { /** * @deprecated use {@link #log(LogLevel level, String message)} */ + @Override public void log(String message) { System.out.println(message); } @@ -430,15 +443,18 @@ public class FakeMailContext implements MailetContext { /** * @deprecated use {@link #log(LogLevel level, String message, Throwable t)} */ + @Override public void log(String message, Throwable t) { System.out.println(message); t.printStackTrace(System.out); } + @Override public void removeAttribute(String name) { // trivial implementation } + @Override public void sendMail(MimeMessage mimemessage) throws MessagingException { sentMails.add(sentMailBuilder() .message(mimemessage) @@ -446,6 +462,7 @@ public class FakeMailContext implements MailetContext { .build()); } + @Override public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg) throws MessagingException { sentMails.add(sentMailBuilder() .recipients(recipients) @@ -455,6 +472,7 @@ public class FakeMailContext implements MailetContext { .build()); } + @Override public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg, String state) throws MessagingException { sentMails.add(sentMailBuilder() .recipients(recipients) @@ -501,14 +519,17 @@ public class FakeMailContext implements MailetContext { /** * @deprecated use the generic dnsLookup method */ + @Override public Iterator<HostAddress> getSMTPHostAddresses(String domainName) { return null; // trivial implementation } + @Override public void setAttribute(String name, Object value) { throw new UnsupportedOperationException("MOCKed method"); } + @Override public void log(LogLevel level, String message) { if (logger.isPresent()) { switch (level) { @@ -529,6 +550,7 @@ public class FakeMailContext implements MailetContext { } } + @Override public void log(LogLevel level, String message, Throwable t) { if (logger.isPresent()) { switch (level) { @@ -550,6 +572,7 @@ public class FakeMailContext implements MailetContext { } } + @Override public List<String> dnsLookup(String name, RecordType type) throws LookupException { return null; // trivial implementation } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java index d86f793..73289d7 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java @@ -84,18 +84,22 @@ public class FakeMailetConfig implements MailetConfig { this.properties = properties; } + @Override public String getInitParameter(String name) { return properties.getProperty(name); } + @Override public Iterator<String> getInitParameterNames() { return properties.stringPropertyNames().iterator(); } + @Override public MailetContext getMailetContext() { return mailetContext; } + @Override public String getMailetName() { return mailetName; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java index a4438c8..c594c4d 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java @@ -226,6 +226,7 @@ public class SMIMEKeyHolder implements KeyHolder { * @param message The message to sign. * @return The signed <CODE>MimeMultipart</CODE>. */ + @Override public MimeMultipart generate(MimeMessage message) throws CertStoreException, NoSuchAlgorithmException, NoSuchProviderException, SMIMEException, OperatorCreationException, CertificateEncodingException { @@ -242,6 +243,7 @@ public class SMIMEKeyHolder implements KeyHolder { * @param content The content to sign. * @return The signed <CODE>MimeMultipart</CODE>. */ + @Override public MimeMultipart generate(MimeBodyPart content) throws CertStoreException, NoSuchAlgorithmException, NoSuchProviderException, SMIMEException, OperatorCreationException, CertificateEncodingException { @@ -293,6 +295,7 @@ public class SMIMEKeyHolder implements KeyHolder { * @return Value of property signerDistinguishedName. * @see #getSignerDistinguishedName(X509Certificate) */ + @Override public String getSignerDistinguishedName() { return getSignerDistinguishedName(getCertificate()); } @@ -302,6 +305,7 @@ public class SMIMEKeyHolder implements KeyHolder { * @return Value of property signerCN. * @see #getSignerCN(X509Certificate) */ + @Override public String getSignerCN() { return getSignerCN(getCertificate()); } @@ -311,6 +315,7 @@ public class SMIMEKeyHolder implements KeyHolder { * @return Value of property signerMailAddress. * @see #getSignerAddress(X509Certificate) */ + @Override public String getSignerAddress() { return getSignerAddress(getCertificate()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java index ab83934..8b266a9 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java @@ -426,9 +426,7 @@ public abstract class AbstractSign extends GenericMailet { /* ****************** End of setters and getters ********************** */ /* ******************************************************************** */ - /** - * Mailet initialization routine. - */ + @Override public void init() throws MessagingException { // check that all init parameters have been declared in allowedInitParameters @@ -467,6 +465,7 @@ public abstract class AbstractSign extends GenericMailet { * @param mail the mail to sign * @throws MessagingException if a problem arises signing the mail */ + @Override public void service(Mail mail) throws MessagingException { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java index 1697239..6fd176e 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java @@ -116,6 +116,7 @@ public class SMIMECheckSignature extends GenericMailet { } + @Override public void init() throws MessagingException { MailetConfig config = getMailetConfig(); @@ -152,6 +153,7 @@ public class SMIMECheckSignature extends GenericMailet { } + @Override public void service(Mail mail) throws MessagingException { // I extract the MimeMessage from the mail object and I check if the // mime type of the mail is one of the mime types that can contain a http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java index e5f372d..2e2019b 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java @@ -81,6 +81,7 @@ public class SMIMEDecrypt extends GenericMailet { private X509CertificateHolder certificateHolder; protected String mailAttribute = "org.apache.james.SMIMEDecrypt"; + @Override public void init() throws MessagingException { super.init(); @@ -120,9 +121,7 @@ public class SMIMEDecrypt extends GenericMailet { } } - /** - * @see org.apache.mailet.Mailet#service(org.apache.mailet.Mail) - */ + @Override @SuppressWarnings("unchecked") public void service(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java index 5024baa..dad9cb9 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java @@ -62,13 +62,12 @@ public class SMIMESign extends Sign { * * @return a string describing this mailet */ + @Override public String getMailetInfo() { return "SMIME Signature Mailet"; } - /** - * - */ + @Override protected String[] getAllowedInitParameters() { return new String[]{ "debug", @@ -107,6 +106,7 @@ public class SMIMESign extends Sign { * "[signerName]" <[signerAddress]> * </code></pre> */ + @Override public String getExplanationText() { String explanationText = super.getExplanationText(); if (explanationText == null) { @@ -129,6 +129,7 @@ public class SMIMESign extends Sign { * Initializer for property keyHolderClass. * Hardcodes it to {@link org.apache.james.transport.SMIMEKeyHolder}. */ + @Override protected void initKeyHolderClass() throws MessagingException { String keyHolderClassName = "org.apache.james.transport.SMIMEKeyHolder"; try { @@ -144,6 +145,7 @@ public class SMIMESign extends Sign { /** * If the <CODE><postmasterSigns></CODE> init parameter is missing sets it to <I>true</I>. */ + @Override protected void initPostmasterSigns() { setPostmasterSigns((getInitParameter("postmasterSigns") == null) ? true : Boolean.valueOf(getInitParameter("postmasterSigns"))); } @@ -151,6 +153,7 @@ public class SMIMESign extends Sign { /** * If the <CODE><rebuildFrom></CODE> init parameter is missing sets it to <I>true</I>. */ + @Override protected void initRebuildFrom() throws MessagingException { setRebuildFrom((getInitParameter("rebuildFrom") == null) ? true : Boolean.valueOf(getInitParameter("rebuildFrom"))); if (isDebug()) { @@ -170,6 +173,7 @@ public class SMIMESign extends Sign { * A text file with the massaged contents of {@link #getExplanationText} * is attached to the original message. */ + @Override protected MimeBodyPart getWrapperBodyPart(Mail mail) throws MessagingException, IOException { String explanationText = getExplanationText(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java index 6ab17b1..ecf8cd0 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java @@ -68,13 +68,12 @@ public class Sign extends AbstractSign { * * @return a string describing this mailet */ + @Override public String getMailetInfo() { return "Signature Mailet"; } - /** - * - */ + @Override protected String[] getAllowedInitParameters() { return new String[]{ "keyHolderClass", @@ -114,6 +113,7 @@ public class Sign extends AbstractSign { * "[signerName]" <[signerAddress]> * </code></pre> */ + @Override public String getExplanationText() { String explanationText = super.getExplanationText(); if (explanationText == null) { @@ -135,6 +135,7 @@ public class Sign extends AbstractSign { /** * If the <CODE><postmasterSigns></CODE> init parameter is missing sets it to <I>true</I>. */ + @Override protected void initPostmasterSigns() { setPostmasterSigns((getInitParameter("postmasterSigns") == null) ? true : Boolean.valueOf(getInitParameter("postmasterSigns"))); } @@ -142,6 +143,7 @@ public class Sign extends AbstractSign { /** * If the <CODE><rebuildFrom></CODE> init parameter is missing sets it to <I>true</I>. */ + @Override protected void initRebuildFrom() throws MessagingException { setRebuildFrom((getInitParameter("rebuildFrom") == null) ? true : Boolean.valueOf(getInitParameter("rebuildFrom"))); if (isDebug()) { @@ -161,6 +163,7 @@ public class Sign extends AbstractSign { * A text file with the massaged contents of {@link #getExplanationText} * is attached to the original message. */ + @Override protected MimeBodyPart getWrapperBodyPart(Mail mail) throws MessagingException, IOException { String explanationText = getExplanationText(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java index 4358375..067ec79 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java @@ -35,9 +35,7 @@ import org.apache.mailet.base.GenericMatcher; */ public class IsSMIMEEncrypted extends GenericMatcher { - /** - * @see org.apache.mailet.Matcher#match(org.apache.mailet.Mail) - */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { if (mail == null) { return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java index a730339..a38c31c 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java @@ -35,9 +35,7 @@ import org.apache.mailet.base.GenericMatcher; */ public class IsSMIMESigned extends GenericMatcher { - /** - * @see org.apache.mailet.Matcher#match(org.apache.mailet.Mail) - */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { if (mail == null) { return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java index 2c28328..db3dbf0 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java @@ -52,6 +52,7 @@ public class IsX509CertificateSubject extends GenericMatcher { protected String sourceAttribute; protected String check; + @Override public void init() throws MessagingException { String condition = getCondition(); if (condition == null || !condition.contains(";")) { @@ -63,6 +64,7 @@ public class IsX509CertificateSubject extends GenericMatcher { check = condition.substring(pos + 1, condition.length()); } + @Override @SuppressWarnings("unchecked") public Collection<MailAddress> match(Mail mail) throws MessagingException { List<X509Certificate> certificates; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java index 3630bfa..0e11422 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java @@ -69,11 +69,13 @@ public abstract class AbstractMailetdocsReport extends AbstractMavenReport { this.type = typeMatcher; } + @Override public boolean evaluate(Object subject) { return ((MailetMatcherDescriptor) subject).getType() == type; } } + @Override protected void executeReport(Locale locale) throws MavenReportException { getLog().info("Executing Mailets/Matchers Report"); @@ -234,26 +236,32 @@ public abstract class AbstractMailetdocsReport extends AbstractMavenReport { getSink().section1_(); } + @Override protected MavenProject getProject() { return project; } + @Override protected String getOutputDirectory() { return outputDirectory; } + @Override protected Renderer getSiteRenderer() { return siteRenderer; } + @Override public String getDescription(Locale arg0) { return "Documentation about bundled mailets"; } + @Override public String getName(Locale arg0) { return "Mailet Reference"; } + @Override public String getOutputName() { return "mailet-report"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java index 3a55340..4ff3485 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java @@ -53,6 +53,7 @@ public class AggregateMailetdocsReport extends AbstractMailetdocsReport { * within subprojects. * @param project not null */ + @Override protected final List<MailetMatcherDescriptor> buildDescriptors(MavenProject project) { final DefaultDescriptorsExtractor extractor = new DefaultDescriptorsExtractor(); if (project.isExecutionRoot()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java index 6f16793..5a368f6 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java @@ -50,9 +50,7 @@ public class MailetMatcherDescriptor { return name; } - /** - * @see #getName() - */ + @Override public String toString() { return getName(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java index 575a86a..a8d1a06 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java @@ -43,6 +43,7 @@ public class MailetdocsReport extends AbstractMailetdocsReport { * without recursion. * @param project not null */ + @Override protected List<MailetMatcherDescriptor> buildDescriptors(MavenProject project) { logProject(project); return new DefaultDescriptorsExtractor().extract(project, getLog()).descriptors(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java index d9cb0aa..688b3cc 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java @@ -98,6 +98,7 @@ public class AddHabeasWarrantMark extends GenericMailet { * @throws javax.mail.MessagingException - if an message or address parsing exception occurs or * an exception that interferes with the mailet's normal operation */ + @Override public void service(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); @@ -113,6 +114,7 @@ public class AddHabeasWarrantMark extends GenericMailet { * * @return a string describing this mailet */ + @Override public String getMailetInfo() { return "Add Habeas Warrant Mark. Must be used in accordance with a license from Habeas (see http://www.habeas.com for details)."; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java index cdb0c49..a06495f 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java @@ -243,11 +243,7 @@ public class ClamAVScan extends GenericMailet { */ private int nextAddressIndex; - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "Antivirus Check using ClamAV (CLAMD)"; } @@ -554,9 +550,7 @@ public class ClamAVScan extends GenericMailet { } } - /** - * Mailet initialization routine. - */ + @Override public void init() throws MessagingException { // check that all init parameters have been declared in allowedInitParameters @@ -591,6 +585,7 @@ public class ClamAVScan extends GenericMailet { * @param mail the mail to scan * @throws MessagingException if a problem arises */ + @Override public void service(Mail mail) throws MessagingException { // if already checked no action http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java index fd500df..33e556b 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java @@ -52,9 +52,7 @@ public class ClassifyBounce extends GenericMailet { */ private String headerName; - /** - * Initialize the mailet. - */ + @Override public void init() throws MessagingException { headerName = getInitParameter("headerName"); @@ -70,6 +68,7 @@ public class ClassifyBounce extends GenericMailet { * @param mail the mail being processed * @throws MessagingException if an error arises during message processing */ + @Override public void service(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); Classifier classifier = new Classifier(message); @@ -80,11 +79,7 @@ public class ClassifyBounce extends GenericMailet { //} } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "SetMimeHeader Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java index bbd1a67..02ec697 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java @@ -68,9 +68,7 @@ public class HeadersToHTTP extends GenericMailet { private String parameterValue = null; private boolean passThrough = true; - /** - * Initialize the mailet. - */ + @Override public void init() throws MessagingException { passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0); @@ -109,6 +107,7 @@ public class HeadersToHTTP extends GenericMailet { * the mail being processed * */ + @Override public void service(Mail mail) { try { LOGGER.debug("{} HeadersToHTTP: Starting", mail.getName()); @@ -187,11 +186,7 @@ public class HeadersToHTTP extends GenericMailet { return pairs; } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "HTTP POST serialised message"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java index b4d6f02..1c90259 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java @@ -53,15 +53,12 @@ public class OnlyText extends GenericMailet { private String optionsNotextProcessor = null; private final HashMap<String, String> charMap = new HashMap<>(); - /** - * returns a String describing this mailet. - * - * @return A desciption of this mailet - */ + @Override public String getMailetInfo() { return "OnlyText"; } + @Override public void init() throws MailetException { optionsNotextProcessor = getInitParameter(PARAMETER_NAME_NOTEXT_PROCESSOR); initEntityTable(); @@ -96,6 +93,7 @@ public class OnlyText extends GenericMailet { } + @Override public void service(Mail mail) throws MailetException { try { Object content = mail.getMessage().getContent(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java index 3366c86..9a539d9 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java @@ -46,6 +46,7 @@ public class PostmasterAlias extends GenericMailet { * * @throws MessagingException if an error is encountered while modifying the message */ + @Override public void service(Mail mail) throws MessagingException { Collection<MailAddress> postmasterAliases = mail.getRecipients() .stream() @@ -69,11 +70,7 @@ public class PostmasterAlias extends GenericMailet { && !getMailetContext().isLocalEmail(addr); } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "Postmaster aliasing mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java index 8f9ede6..26d50b6 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java @@ -66,11 +66,7 @@ public class RecoverAttachment extends GenericMailet { private String attributeName = null; - /** - * Checks if the mandatory parameters are present - * - * @throws MailetException - */ + @Override public void init() throws MailetException { attributeName = getInitParameter(ATTRIBUTE_PARAMETER_NAME); @@ -91,6 +87,7 @@ public class RecoverAttachment extends GenericMailet { * @throws MailetException * Thrown when an error situation is encountered. */ + @Override public void service(Mail mail) throws MailetException { @SuppressWarnings("unchecked") Map<String, byte[]> attachments = (Map<String, byte[]>) mail.getAttribute(attributeName); @@ -137,11 +134,7 @@ public class RecoverAttachment extends GenericMailet { } } - /** - * returns a String describing this mailet. - * - * @return A desciption of this mailet - */ + @Override public String getMailetInfo() { return "RecoverAttachment Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java index 4a3b14c..72a39d0 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java @@ -53,6 +53,7 @@ public class RemoveMailAttribute extends GenericMailet { private ImmutableList<String> attributesToRemove; + @Override public String getMailetInfo() { return "Remove Mail Attribute Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java index 58c6d20..3dde0d1 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java @@ -69,9 +69,7 @@ public class SerialiseToHTTP extends GenericMailet { private String messageKeyName = "message"; private boolean passThrough = true; - /** - * Initialize the mailet. - */ + @Override public void init() throws MessagingException { passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0); @@ -118,6 +116,7 @@ public class SerialiseToHTTP extends GenericMailet { * the mail being processed * */ + @Override public void service(Mail mail) { try { MimeMessage message = mail.getMessage(); @@ -202,11 +201,7 @@ public class SerialiseToHTTP extends GenericMailet { return data; } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "HTTP POST serialised message"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java index b58015c..bf7ed37 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java @@ -44,6 +44,7 @@ public class ServerTime extends GenericMailet { * * @throws javax.mail.MessagingException if an error is encountered while formulating the reply message */ + @Override public void service(Mail mail) throws javax.mail.MessagingException { MimeMessage response = (MimeMessage)mail.getMessage().reply(false); response.setSubject("The time is now..."); @@ -67,11 +68,7 @@ public class ServerTime extends GenericMailet { getMailetContext().sendMail(response); } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "ServerTime Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java index 9462731..891c448 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java @@ -239,11 +239,6 @@ public class StripAttachment extends GenericMailet { } } - /** - * returns a String describing this mailet. - * - * @return A desciption of this mailet - */ @Override public String getMailetInfo() { return "StripAttachment"; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java index 8353644..6959839 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java @@ -59,19 +59,17 @@ public class UnwrapText extends GenericMailet { private int quotewidth; - /** - * returns a String describing this mailet. - * - * @return A desciption of this mailet - */ + @Override public String getMailetInfo() { return "UnwrapText"; } + @Override public void init() throws MailetException { quotewidth = Integer.parseInt(getInitParameter(PARAMETER_NAME_QUOTEWIDTH, "-10")); } + @Override public void service(Mail mail) throws MailetException { try { // TODO replace non standard quotes (at least "> " with ">", otherwise the widely used "> > >" will not work. http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java index 876d790..63deea9 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java @@ -83,6 +83,7 @@ public class UseHeaderRecipients extends GenericMailet { * <p/> * initializes the DEBUG flag */ + @Override public void init() { isDebug = (getInitParameter("debug") == null) ? false : Boolean.valueOf(getInitParameter("debug")); } @@ -94,6 +95,7 @@ public class UseHeaderRecipients extends GenericMailet { * * @param mail incoming email */ + @Override public void service(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); @@ -122,11 +124,7 @@ public class UseHeaderRecipients extends GenericMailet { } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "UseHeaderRecipients Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java index d67f02c..a7adc7f 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java @@ -40,20 +40,18 @@ public class WrapText extends GenericMailet { private boolean optionFlowedDelsp = false; private int optionWidth = FlowedMessageUtils.RFC2646_WIDTH; - /** - * returns a String describing this mailet. - * - * @return A desciption of this mailet - */ + @Override public String getMailetInfo() { return "WrapText"; } + @Override public void init() throws MailetException { optionFlowedDelsp = getBooleanParameter(getInitParameter(PARAMETER_NAME_FLOWED_DELSP), optionFlowedDelsp); optionWidth = Integer.parseInt(getInitParameter(PARAMETER_NAME_WIDTH, "" + optionWidth)); } + @Override public void service(Mail mail) throws MailetException { // TODO We could even manage the flow when the message is quoted-printable try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java index 63fbe4c..c96a879 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java @@ -44,6 +44,7 @@ public class Counter extends GenericMailet { * * @param mail the mail to process */ + @Override public void service(Mail mail) { counter++; LOGGER.info("{}", counter); @@ -55,6 +56,7 @@ public class Counter extends GenericMailet { * * @return a string describing this mailet */ + @Override public String getMailetInfo() { return "Counter Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java index f3c4a95..4223551 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java @@ -45,6 +45,7 @@ public class DumpSystemErr extends GenericMailet { * * @throws MessagingException if an error occurs while writing the message */ + @Override public void service(Mail mail) throws MessagingException { try { MimeMessage message = mail.getMessage(); @@ -54,11 +55,7 @@ public class DumpSystemErr extends GenericMailet { } } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "Dumps message to System.err"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java index 27d8067..dec449a 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java @@ -40,15 +40,12 @@ public class ExceptionThrowingMailet extends GenericMailet { * * @throws MailetException in all cases */ + @Override public void service(Mail mail) throws MessagingException { throw new MailetException("General protection fault"); } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "ExceptionThrowingMailet Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java index 533bc01..bb0589e 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java @@ -30,20 +30,12 @@ import org.apache.mailet.base.GenericMailet; */ public class Identity extends GenericMailet { - /** - * Do nothing. - * - * @param mail the mail to be processed - */ + @Override public void service(Mail mail) { //Do nothing } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ + @Override public String getMailetInfo() { return "Identity Mailet"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java index ca626cc..e097e8e 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java @@ -54,6 +54,7 @@ public abstract class AbstractQuotaMatcher extends GenericMatcher { * * @throws MessagingException if either <CODE>isSenderChecked</CODE> or isRecipientChecked throw an exception */ + @Override public final Collection<MailAddress> match(Mail mail) throws MessagingException { Collection<MailAddress> matching = null; if (isSenderChecked(mail.getSender())) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java index 4df2e50..0f85cb0 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java @@ -31,10 +31,7 @@ import org.apache.mailet.base.GenericMatcher; public class All extends GenericMatcher { - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) - */ + @Override public Collection<MailAddress> match(Mail mail) { return mail.getRecipients(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java index f5b0b89..9d21236 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java @@ -93,10 +93,7 @@ public class AttachmentFileNameIs extends GenericMatcher { protected boolean unzipIsRequested; - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() throws MessagingException { /* sets up fileNameMasks variable by parsing the condition */ @@ -135,6 +132,7 @@ public class AttachmentFileNameIs extends GenericMatcher { * @param mail * @throws MessagingException if no matching attachment is found and at least one exception was thrown */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java index 9f977cd..cecf833 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java @@ -39,19 +39,13 @@ public class CommandForListserv extends GenericRecipientMatcher { private MailAddress listservAddress; - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() throws MessagingException { listservAddress = new MailAddress(getCondition()); } - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress) - */ + @Override public boolean matchRecipient(MailAddress recipient) { if (recipient.getDomain().equals(listservAddress.getDomain())) { if (recipient.getLocalPart().equals(listservAddress.getLocalPart() + "-on") http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java index bea2b2c..57ca67d 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java @@ -46,10 +46,7 @@ public class CommandListservMatcher extends GenericRecipientMatcher { private MailAddress listservAddress; - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() throws MessagingException { listservAddress = new MailAddress(getCondition()); } @@ -60,6 +57,7 @@ public class CommandListservMatcher extends GenericRecipientMatcher { * @param recipient * @return true if matches, false otherwise */ + @Override public boolean matchRecipient(MailAddress recipient) { if (recipient.getDomain().equals(listservAddress.getDomain())) { if (recipient.getLocalPart().startsWith(listservAddress.getLocalPart() + "-")) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java index b7a284f..44f3260 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java @@ -64,10 +64,7 @@ public class CompareNumericHeaderValue extends GenericMatcher { private Double headerValue; - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() throws MessagingException { StringTokenizer st = new StringTokenizer(getCondition(), " \t", false); if (st.hasMoreTokens()) { @@ -115,10 +112,7 @@ public class CompareNumericHeaderValue extends GenericMatcher { } - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) - */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { if (headerName == null) { // should never get here http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java index db28d4c..3d5892d 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java @@ -43,6 +43,7 @@ public class FetchedFrom extends GenericMatcher { public static final String X_FETCHED_FROM = "X-fetched-from"; + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); String fetchHeaderValue = message.getHeader(X_FETCHED_FROM, null); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java index 47f6c4d..1f1c082 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java @@ -35,9 +35,7 @@ import org.apache.mailet.Experimental; @Experimental public class FileRegexMatcher extends GenericRegexMatcher { - /** - * @see org.apache.james.transport.matchers.GenericRegexMatcher#init() - */ + @Override public void init() throws MessagingException { java.io.RandomAccessFile patternSource = null; try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java index 385f772..ca32879 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java @@ -56,14 +56,10 @@ public abstract class GenericRegexMatcher extends GenericMatcher { } } - /** - * @see org.apache.mailet.GenericMatcher#GenericMatcher() - */ + @Override public abstract void init() throws MessagingException; - /** - * @see org.apache.mailet.GenericMatcher#match(Mail) - */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java index c1fa48a..e3557ae 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java @@ -45,6 +45,7 @@ public class HasAttachment extends GenericMatcher { * Either every recipient is matching or neither of them. * @throws MessagingException if no attachment is found and at least one exception was thrown */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { Exception anException = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java index 8ee224e..2c5e930 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java @@ -87,6 +87,7 @@ public class HasHabeasWarrantMark extends GenericMatcher { { "X-Habeas-SWE-9", "mark in spam to <http://www.habeas.com/report/>." }, }; + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); @@ -125,6 +126,7 @@ public class HasHabeasWarrantMark extends GenericMatcher { * @return a String containing matcher information */ + @Override public String getMatcherInfo() { return "Habeas Warrant Mark Matcher (see http://www.habeas.com for details)."; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java index d83623b..e4c8cbb 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java @@ -93,6 +93,7 @@ public class HasHeader extends GenericMatcher { private List<HeaderCondition> headerConditions; + @Override public void init() throws MessagingException { headerConditions = new ArrayList<>(); StringTokenizer conditionTokenizer = new StringTokenizer(getCondition(), CONDITION_SEPARATOR); @@ -114,6 +115,7 @@ public class HasHeader extends GenericMatcher { } } + @Override public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException { for (HeaderCondition headerCondition : headerConditions) { if (!headerCondition.isMatching(mail.getMessage())) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java index b71ad88..78f1d75 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java @@ -52,6 +52,7 @@ public class HasHeaderWithPrefix extends GenericMatcher { } } + @Override public String getMatcherInfo() { return "HasHeaderWithPrefix Matcher"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java index 3f2d64f..ffe6666 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java @@ -44,15 +44,12 @@ public class HasMailAttribute extends GenericMatcher { private String attributeName; - /** - * Return a string describing this matcher. - * - * @return a string describing this matcher - */ + @Override public String getMatcherInfo() { return "Has Mail Attribute Matcher"; } + @Override public void init() throws MessagingException { attributeName = getCondition(); } @@ -63,6 +60,7 @@ public class HasMailAttribute extends GenericMatcher { * set on the mail * **/ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { if (mail.getAttribute(attributeName) != null) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java index 8f45d1f..ac02bee 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java @@ -84,6 +84,7 @@ public class HasMailAttributeWithValue extends GenericMatcher { * * @param mail */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { Object attributeValue = mail.getAttribute(getAttributeName()); @@ -126,10 +127,7 @@ public class HasMailAttributeWithValue extends GenericMatcher { fieldAttributeValue = attributeValue; } - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() throws MessagingException { String condition = getCondition().trim(); int commaPosition = condition.indexOf(','); @@ -146,11 +144,7 @@ public class HasMailAttributeWithValue extends GenericMatcher { setAttributeValue(condition.substring(commaPosition + 1).trim()); } - /** - * Return a string describing this matcher. - * - * @return a string describing this matcher - */ + @Override public String getMatcherInfo() { return "Has Mail Attribute With Value Matcher"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java index 4c8bc5d..9dc822e 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java @@ -52,15 +52,12 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher { private String attributeName; private Pattern pattern = null; - /** - * Return a string describing this matcher. - * - * @return a string describing this matcher - */ + @Override public String getMatcherInfo() { return "Has Mail Attribute Value Matcher"; } + @Override public void init(MatcherConfig conf) throws MessagingException { String condition = conf.getCondition(); int idx = condition.indexOf(','); @@ -84,6 +81,7 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher { * interpreted as a regular expression matches the toString value of the * corresponding attributes value. **/ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { Serializable obj = mail.getAttribute(attributeName); //to be a little more generic the toString of the value is what is matched against http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java index deaf188..1dc2ecf 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java @@ -51,10 +51,12 @@ public class HasMimeType extends GenericMatcher { private Set<String> acceptedContentTypes; + @Override public void init() throws javax.mail.MessagingException { acceptedContentTypes = ImmutableSet.copyOf(Splitter.on(",").trimResults().split(getCondition())); } + @Override public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException { Optional<String> mimeTypes = getMimeTypeFromMessage(mail.getMessage()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java index 36c0684..5225255 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java @@ -36,10 +36,7 @@ public class HostIs extends GenericRecipientMatcher { private Collection<String> hosts; - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() { StringTokenizer st = new StringTokenizer(getCondition(), ", ", false); hosts = new Vector<>(); @@ -48,10 +45,7 @@ public class HostIs extends GenericRecipientMatcher { } } - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress) - */ + @Override public boolean matchRecipient(MailAddress recipient) { return hosts.contains(recipient.getDomain().toLowerCase(Locale.US)); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
