Author: norman
Date: Sat Dec 30 10:26:15 2006
New Revision: 491270
URL: http://svn.apache.org/viewvc?view=rev&rev=491270
Log:
Change MessageHook implementation to return HookReturnCode.DECLINED insteed of
null. Null was workin but DECLINED is more correct.
Modified:
james/server/sandbox/handlerapi-experiment/ (props changed)
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
Propchange: james/server/sandbox/handlerapi-experiment/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 30 10:26:15 2006
@@ -1,4 +1,6 @@
+
.project
.classpath
bin
dist
+target
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
Sat Dec 30 10:26:15 2006
@@ -82,7 +82,7 @@
List hooks = getHooks();
if (hooks != null) {
- getLogger().debug("executing hooks");
+ getLogger().debug("executing hooks");
int count = hooks.size();
for (int i = 0; i < count; i++) {
Object rawHook = hooks.get(i);
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
Sat Dec 30 10:26:15 2006
@@ -27,6 +27,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
+import org.apache.james.smtpserver.hook.HookReturnCode;
import org.apache.james.smtpserver.hook.MessageHook;
import org.apache.mailet.Mail;
@@ -100,7 +101,7 @@
getLogger().error(me.getMessage());
}
- return null;
+ return new HookResult(HookReturnCode.DECLINED);
}
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
Sat Dec 30 10:26:15 2006
@@ -156,7 +156,7 @@
getLogger().info("Unable to add Junkscore to header: " +
e.getMessage());
}
}
- return null;
+ return new HookResult(HookReturnCode.DECLINED);
}
public static JunkScore getLazyJunkScoreHandler(Map state, String key) {
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
Sat Dec 30 10:26:15 2006
@@ -196,6 +196,6 @@
} catch (MessagingException e) {
getLogger().error(e.getMessage());
}
- return null;
+ return new HookResult(HookReturnCode.DECLINED);
}
}
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
Sat Dec 30 10:26:15 2006
@@ -188,7 +188,7 @@
}
} else {
- return null;
+ return new HookResult(HookReturnCode.DECLINED);
}
}
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java
Sat Dec 30 10:26:15 2006
@@ -30,6 +30,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.core.filter.fastfail.JunkScoreHandler;
import org.apache.james.smtpserver.hook.HookResult;
+import org.apache.james.smtpserver.hook.HookReturnCode;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
@@ -110,7 +111,7 @@
((JunkScore)
session.getConnectionState().get(JunkScore.JUNK_SCORE_SESSION)).setStoredScore(KEY2,
SCORE2);
HookResult response = handler.onMessage(session, m);
- assertNotNull("Rejected",response);
+ assertEquals("Rejected",response.getResult(), HookReturnCode.DENY);
}
public void testHeaderAction() throws ConfigurationException,
MessagingException {
@@ -128,6 +129,6 @@
MimeMessage message = m.getMessage();
assertNotNull("Header added",message.getHeader("X-JUNKSCORE")[0]);
assertNotNull("Header
added",message.getHeader("X-JUNKSCORE-COMPOSED")[0]);
- assertNull("Not rejected", response);
+ assertEquals("Not rejected",
response.getResult(),HookReturnCode.DECLINED);
}
}
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
Sat Dec 30 10:26:15 2006
@@ -32,6 +32,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.core.filter.fastfail.SpamAssassinHandler;
import org.apache.james.smtpserver.hook.HookResult;
+import org.apache.james.smtpserver.hook.HookReturnCode;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
@@ -116,7 +117,7 @@
handler.setSpamdRejectionHits(200.0);
HookResult response = handler.onMessage(session, mockedMail);
- assertNull("Email was not rejected", response);
+ assertEquals("Email was not rejected", response.getResult(),
HookReturnCode.DECLINED);
assertEquals("email was not spam", mockedMail.getAttribute(
SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME), "NO");
assertNotNull("spam hits", mockedMail.getAttribute(
@@ -139,7 +140,7 @@
handler.setSpamdRejectionHits(2000.0);
HookResult response = handler.onMessage(session, mockedMail);
- assertNull("Email was not rejected", response);
+ assertEquals("Email was not rejected", response.getResult(),
HookReturnCode.DECLINED);
assertEquals("email was spam", mockedMail.getAttribute(
SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME), "YES");
assertNotNull("spam hits", mockedMail.getAttribute(
@@ -161,7 +162,7 @@
handler.setSpamdRejectionHits(200.0);
HookResult response = handler.onMessage(session, mockedMail);
- assertNotNull("Email was rejected", response);
+ assertEquals("Email was rejected", response.getResult(),
HookReturnCode.DENY);
assertEquals("email was spam", mockedMail.getAttribute(
SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME), "YES");
assertNotNull("spam hits", mockedMail.getAttribute(
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java?view=diff&rev=491270&r1=491269&r2=491270
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
Sat Dec 30 10:26:15 2006
@@ -43,6 +43,7 @@
import org.apache.james.services.DNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.URIRBLHandler;
import org.apache.james.smtpserver.hook.HookResult;
+import org.apache.james.smtpserver.hook.HookReturnCode;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
@@ -176,7 +177,7 @@
handler.setUriRblServer(servers);
HookResult response = handler.onMessage(session, mockedMail);
- assertNull("Email was not rejected", response);
+ assertEquals("Email was not rejected",
response.getResult(),HookReturnCode.DECLINED);
}
public void testBlocked() throws IOException, MessagingException {
@@ -193,7 +194,7 @@
handler.setUriRblServer(servers);
HookResult response = handler.onMessage(session, mockedMail);
- assertNotNull("Email was rejected", response);
+ assertEquals("Email was rejected", response.getResult(),
HookReturnCode.DENY);
}
public void testBlockedMultiPart() throws IOException, MessagingException {
@@ -210,7 +211,7 @@
handler.setUriRblServer(servers);
HookResult response = handler.onMessage(session, mockedMail);
- assertNotNull("Email was rejected", response);
+ assertEquals("Email was rejected", response.getResult(),
HookReturnCode.DENY);
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
