You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/08/22 19:38:03 UTC
svn commit: r806871 - in
/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver:
./ core/ core/esmtp/
Author: norman
Date: Sat Aug 22 17:38:02 2009
New Revision: 806871
URL: http://svn.apache.org/viewvc?rev=806871&view=rev
Log:
Start to generify
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/HandlersPackage.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPResponse.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HeloCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HelpCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/NoopCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/QuitCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RsetCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloExtension.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/HandlersPackage.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/HandlersPackage.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/HandlersPackage.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/HandlersPackage.java Sat Aug 22 17:38:02 2009
@@ -35,6 +35,6 @@
*
* @return Map
*/
- List<CommandHandler> getHandlers();
+ List getHandlers();
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPResponse.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPResponse.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPResponse.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPResponse.java Sat Aug 22 17:38:02 2009
@@ -28,7 +28,7 @@
public class SMTPResponse {
private String retCode = null;
- private List lines = null;
+ private List<String> lines = null;
private String rawLine = null;
private boolean endSession = false;
@@ -89,7 +89,7 @@
*/
public void appendLine(String line) {
if (lines == null) {
- lines = new LinkedList();
+ lines = new LinkedList<String>();
}
lines.add(line);
}
@@ -124,7 +124,7 @@
*
* @return all responseLines
*/
- public List getLines() {
+ public List<String> getLines() {
return lines;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -36,11 +36,11 @@
* Abstract class which Handle hooks.
*
*/
-public abstract class AbstractHookableCmdHandler extends AbstractLogEnabled
+public abstract class AbstractHookableCmdHandler<Hook> extends AbstractLogEnabled
implements CommandHandler, ExtensibleHandler {
- private List hooks;
+ private List<Hook> hooks;
private List rHooks;
/**
@@ -80,11 +80,11 @@
*/
private SMTPResponse processHooks(SMTPSession session, String command,
String parameters) {
- List hooks = getHooks();
+ List<Hook> hooks = getHooks();
if (hooks != null) {
int count = hooks.size();
for (int i = 0; i < count; i++) {
- Object rawHook = hooks.get(i);
+ Hook rawHook = hooks.get(i);
getLogger().debug("executing hook " + rawHook.getClass().getName());
HookResult hRes = callHook(rawHook, session, parameters);
if (rHooks != null) {
@@ -106,12 +106,12 @@
/**
* Must be implemented by hookable cmd handlers to make the effective call to an hook.
*
- * @param rawHook the hook (to be casted)
+ * @param rawHook the hook
* @param session the session
* @param parameters the parameters
* @return the HookResult, will be calculated using HookResultToSMTPResponse.
*/
- protected abstract HookResult callHook(Object rawHook, SMTPSession session, String parameters);
+ protected abstract HookResult callHook(Hook rawHook, SMTPSession session, String parameters);
/**
* Convert the HookResult to SMTPResponse using default values. Should be override for using own values
@@ -182,8 +182,8 @@
/**
* @see org.apache.james.smtpserver.ExtensibleHandler#getMarkerInterfaces()
*/
- public List getMarkerInterfaces() {
- List classes = new ArrayList(2);
+ public List<Class<?>> getMarkerInterfaces() {
+ List<Class<?>> classes = new ArrayList<Class<?>>(2);
classes.add(getHookInterface());
classes.add(HookResultHook.class);
return classes;
@@ -194,7 +194,7 @@
*
* @return interface
*/
- protected abstract Class getHookInterface();
+ protected abstract Class<Hook> getHookInterface();
/**
* @see org.apache.james.smtpserver.ExtensibleHandler#wireExtensions(java.lang.Class,
@@ -214,7 +214,7 @@
*
* @return
*/
- protected List getHooks() {
+ protected List<Hook> getHooks() {
return hooks;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -275,8 +275,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add("DATA");
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -54,8 +54,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HeloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HeloCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HeloCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HeloCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -33,7 +33,7 @@
/**
* Handles HELO command
*/
-public class HeloCmdHandler extends AbstractHookableCmdHandler implements
+public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> implements
CommandHandler {
/**
@@ -44,8 +44,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
@@ -90,7 +90,7 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#getHookInterface()
*/
- protected Class getHookInterface() {
+ protected Class<HeloHook> getHookInterface() {
return HeloHook.class;
}
@@ -98,8 +98,8 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.smtpserver.SMTPSession, java.lang.String)
*/
- protected HookResult callHook(Object rawHook, SMTPSession session, String parameters) {
- return ((HeloHook) rawHook).doHelo(session, parameters);
+ protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) {
+ return rawHook.doHelo(session, parameters);
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HelpCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HelpCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HelpCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/HelpCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -52,8 +52,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -41,7 +41,7 @@
/**
* Handles MAIL command
*/
-public class MailCmdHandler extends AbstractHookableCmdHandler implements
+public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> implements
CommandHandler {
/**
@@ -90,8 +90,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add("MAIL");
return implCommands;
@@ -252,7 +252,7 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#getHookInterface()
*/
- protected Class getHookInterface() {
+ protected Class<MailHook> getHookInterface() {
return MailHook.class;
}
@@ -260,8 +260,8 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.smtpserver.SMTPSession, java.lang.String)
*/
- protected HookResult callHook(Object rawHook, SMTPSession session, String parameters) {
- return ((MailHook) rawHook).doMail(session,(MailAddress) session.getState().get(SMTPSession.SENDER));
+ protected HookResult callHook(MailHook rawHook, SMTPSession session, String parameters) {
+ return rawHook.doMail(session,(MailAddress) session.getState().get(SMTPSession.SENDER));
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/NoopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/NoopCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/NoopCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/NoopCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -53,8 +53,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/QuitCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/QuitCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/QuitCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -32,7 +32,7 @@
/**
* Handles QUIT command
*/
-public class QuitCmdHandler extends AbstractHookableCmdHandler {
+public class QuitCmdHandler extends AbstractHookableCmdHandler<QuitHook> {
/**
* The name of the command handled by the command handler
@@ -72,8 +72,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
@@ -100,15 +100,15 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#getHookInterface()
*/
- protected Class getHookInterface() {
+ protected Class<QuitHook> getHookInterface() {
return QuitHook.class;
}
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.smtpserver.SMTPSession, java.lang.String)
*/
- protected HookResult callHook(Object rawHook, SMTPSession session, String parameters) {
- return ((QuitHook) rawHook).doQuit(session);
+ protected HookResult callHook(QuitHook rawHook, SMTPSession session, String parameters) {
+ return rawHook.doQuit(session);
}
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -36,7 +36,7 @@
/**
* Handles RCPT command
*/
-public class RcptCmdHandler extends AbstractHookableCmdHandler implements
+public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> implements
CommandHandler {
public static final Object CURRENT_RECIPIENT = "CURRENT_RECIPIENT"; // Current recipient
@@ -229,8 +229,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add("RCPT");
return implCommands;
@@ -239,7 +239,7 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#getHookInterface()
*/
- protected Class getHookInterface() {
+ protected Class<RcptHook> getHookInterface() {
return RcptHook.class;
}
@@ -247,9 +247,9 @@
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#callHook(java.lang.Object,
* org.apache.james.smtpserver.SMTPSession, java.lang.String)
*/
- protected HookResult callHook(Object rawHook, SMTPSession session,
+ protected HookResult callHook(RcptHook rawHook, SMTPSession session,
String parameters) {
- return ((RcptHook) rawHook).doRcpt(session,
+ return rawHook.doRcpt(session,
(MailAddress) session.getState().get(SMTPSession.SENDER),
(MailAddress) session.getState().get(CURRENT_RECIPIENT));
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RsetCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RsetCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RsetCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -69,8 +69,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -58,8 +58,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(UNKNOWN_COMMAND);
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -52,8 +52,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add(COMMAND_NAME);
return implCommands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -400,8 +400,8 @@
/**
* @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
*/
- public Collection getImplCommands() {
- Collection implCommands = new ArrayList();
+ public Collection<String> getImplCommands() {
+ Collection<String> implCommands = new ArrayList<String>();
implCommands.add("AUTH");
return implCommands;
@@ -410,9 +410,9 @@
/**
* @see org.apache.james.smtpserver.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.smtpserver.SMTPSession)
*/
- public List getImplementedEsmtpFeatures(SMTPSession session) {
+ public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
if (session.isAuthSupported()) {
- List resp = new LinkedList();
+ List<String> resp = new LinkedList<String>();
resp.add("AUTH LOGIN PLAIN");
resp.add("AUTH=LOGIN PLAIN");
return resp;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloCmdHandler.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloCmdHandler.java Sat Aug 22 17:38:02 2009
@@ -35,7 +35,7 @@
/**
* Handles EHLO command
*/
-public class EhloCmdHandler extends AbstractHookableCmdHandler implements
+public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> implements
CommandHandler {
/**
@@ -160,15 +160,15 @@
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#getHookInterface()
*/
- protected Class getHookInterface() {
+ protected Class<HeloHook> getHookInterface() {
return HeloHook.class;
}
/**
* @see org.apache.james.smtpserver.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.smtpserver.SMTPSession, java.lang.String)
*/
- protected HookResult callHook(Object rawHook, SMTPSession session, String parameters) {
- return ((HeloHook) rawHook).doHelo(session, parameters);
+ protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) {
+ return rawHook.doHelo(session, parameters);
}
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloExtension.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloExtension.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloExtension.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloExtension.java Sat Aug 22 17:38:02 2009
@@ -28,6 +28,6 @@
*/
public interface EhloExtension {
- List getImplementedEsmtpFeatures(SMTPSession session);
+ List<String> getImplementedEsmtpFeatures(SMTPSession session);
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java?rev=806871&r1=806870&r2=806871&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java Sat Aug 22 17:38:02 2009
@@ -48,8 +48,8 @@
/**
* @see org.apache.james.smtpserver.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.smtpserver.SMTPSession)
*/
- public List getImplementedEsmtpFeatures(SMTPSession session) {
- LinkedList resp = new LinkedList();
+ public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
+ LinkedList<String> resp = new LinkedList<String>();
// Extension defined in RFC 1870
long maxMessageSize = session.getConfigurationData()
.getMaxMessageSize();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org