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 2011/11/22 08:56:31 UTC
svn commit: r1204847 - in
/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core:
./ esmtp/
Author: norman
Date: Tue Nov 22 07:56:29 2011
New Revision: 1204847
URL: http://svn.apache.org/viewvc?rev=1204847&view=rev
Log:
Replace SMTPResponse with Response for the return types where ever possible. This allows easier extension of the classes
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -52,7 +52,7 @@ public abstract class AbstractHookableCm
public Response onCommand(SMTPSession session, Request request) {
String command = request.getCommand();
String parameters = request.getArgument();
- SMTPResponse response = doFilterChecks(session, command, parameters);
+ Response response = doFilterChecks(session, command, parameters);
if (response == null) {
@@ -79,7 +79,7 @@ public abstract class AbstractHookableCm
* the paramaters
* @return SMTPResponse
*/
- private SMTPResponse processHooks(SMTPSession session, String command,
+ private Response processHooks(SMTPSession session, String command,
String parameters) {
List<Hook> hooks = getHooks();
if (hooks != null) {
@@ -102,11 +102,27 @@ public abstract class AbstractHookableCm
// call the core cmd if we receive a ok return code of the hook so no other hooks are executed
if ((hRes.getResult() & HookReturnCode.OK) == HookReturnCode.OK) {
- SMTPResponse response = doCoreCmd(session, command, parameters);
+ final Response response = doCoreCmd(session, command, parameters);
if ((hRes.getResult() & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) {
- response.setEndSession(true);
+ return new Response() {
+
+ @Override
+ public boolean isEndSession() {
+ return true;
+ }
+
+ @Override
+ public String getRetCode() {
+ return response.getRetCode();
+ }
+
+ @Override
+ public List<CharSequence> getLines() {
+ return response.getLines();
+ }
+ };
}
- return response;
+ return response;
} else {
SMTPResponse res = calcDefaultSMTPResponse(hRes);
if (res != null) {
@@ -195,7 +211,7 @@ public abstract class AbstractHookableCm
* @param parameters
* @return smtp response if a syntax error was detected, otherwise <code>null</code>
*/
- protected abstract SMTPResponse doFilterChecks(SMTPSession session,
+ protected abstract Response doFilterChecks(SMTPSession session,
String command, String parameters);
/**
@@ -206,7 +222,7 @@ public abstract class AbstractHookableCm
* @param parameters
* @return smtp response
*/
- protected abstract SMTPResponse doCoreCmd(SMTPSession session,
+ protected abstract Response doCoreCmd(SMTPSession session,
String command, String parameters);
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -93,7 +93,7 @@ public class DataCmdHandler implements C
*/
public Response onCommand(SMTPSession session, Request request) {
String parameters = request.getArgument();
- SMTPResponse response = doDATAFilter(session,parameters);
+ Response response = doDATAFilter(session,parameters);
if (response == null) {
return doDATA(session, parameters);
@@ -163,7 +163,7 @@ public class DataCmdHandler implements C
}
}
- protected SMTPResponse doDATAFilter(SMTPSession session, String argument) {
+ protected Response doDATAFilter(SMTPSession session, String argument) {
if ((argument != null) && (argument.length() > 0)) {
return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG)+" Unexpected argument provided with DATA command");
}
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -52,7 +53,7 @@ public class HeloCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doCoreCmd(SMTPSession session, String command,
+ protected Response doCoreCmd(SMTPSession session, String command,
String parameters) {
session.getConnectionState().put(SMTPSession.CURRENT_HELO_MODE,
COMMAND_NAME);
@@ -67,7 +68,7 @@ public class HeloCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doFilterChecks(SMTPSession session, String command,
+ protected Response doFilterChecks(SMTPSession session, String command,
String parameters) {
session.resetState();
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -76,7 +76,7 @@ public class MailCmdHandler extends Abst
* @param argument
* the argument passed in with the command by the SMTP client
*/
- private SMTPResponse doMAIL(SMTPSession session, String argument) {
+ private Response doMAIL(SMTPSession session, String argument) {
StringBuilder responseBuffer = new StringBuilder();
MailAddress sender = (MailAddress) session.getState().get(
SMTPSession.SENDER);
@@ -101,7 +101,7 @@ public class MailCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doCoreCmd(SMTPSession session, String command,
+ protected Response doCoreCmd(SMTPSession session, String command,
String parameters) {
return doMAIL(session, parameters);
}
@@ -110,7 +110,7 @@ public class MailCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doFilterChecks(SMTPSession session, String command,
+ protected Response doFilterChecks(SMTPSession session, String command,
String parameters) {
return doMAILFilter(session, parameters);
}
@@ -121,7 +121,7 @@ public class MailCmdHandler extends Abst
* @param argument
* the argument passed in with the command by the SMTP client
*/
- private SMTPResponse doMAILFilter(SMTPSession session, String argument) {
+ private Response doMAILFilter(SMTPSession session, String argument) {
String sender = null;
if ((argument != null) && (argument.indexOf(":") > 0)) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -49,7 +50,7 @@ public class QuitCmdHandler extends Abst
* @param argument
* the argument passed in with the command by the SMTP client
*/
- private SMTPResponse doQUIT(SMTPSession session, String argument) {
+ private Response doQUIT(SMTPSession session, String argument) {
SMTPResponse ret;
if ((argument == null) || (argument.length() == 0)) {
StringBuilder response = new StringBuilder();
@@ -81,7 +82,7 @@ public class QuitCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doCoreCmd(SMTPSession session, String command,
+ protected Response doCoreCmd(SMTPSession session, String command,
String parameters) {
return doQUIT(session, parameters);
}
@@ -90,7 +91,7 @@ public class QuitCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doFilterChecks(SMTPSession session, String command,
+ protected Response doFilterChecks(SMTPSession session, String command,
String parameters) {
return null;
}
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.Locale;
import java.util.StringTokenizer;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -59,7 +60,7 @@ public class RcptCmdHandler extends Abst
* parameters passed in with the command by the SMTP client
*/
@SuppressWarnings("unchecked")
- protected SMTPResponse doCoreCmd(SMTPSession session, String command,
+ protected Response doCoreCmd(SMTPSession session, String command,
String parameters) {
Collection<MailAddress> rcptColl = (Collection<MailAddress>) session.getState().get(
SMTPSession.RCPT_LIST);
@@ -86,7 +87,7 @@ public class RcptCmdHandler extends Abst
* @param argument
* the argument passed in with the command by the SMTP client
*/
- protected SMTPResponse doFilterChecks(SMTPSession session, String command,
+ protected Response doFilterChecks(SMTPSession session, String command,
String argument) {
String recipient = null;
if ((argument != null) && (argument.indexOf(":") > 0)) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -59,7 +59,7 @@ public class RsetCmdHandler implements C
* @param argument the argument passed in with the command by the SMTP client
* @return
*/
- private SMTPResponse doRSET(SMTPSession session, String argument) {
+ private Response doRSET(SMTPSession session, String argument) {
if ((argument == null) || (argument.length() == 0)) {
session.resetState();
return new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS)+" OK");
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -51,14 +52,14 @@ public class UnknownCmdHandler extends A
}
@Override
- protected SMTPResponse doCoreCmd(SMTPSession session, String command, String parameters) {
+ protected Response doCoreCmd(SMTPSession session, String command, String parameters) {
StringBuilder result = new StringBuilder();
result.append(DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD)).append(" Command ").append(command).append(" unrecognized.");
return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, result);
}
@Override
- protected SMTPResponse doFilterChecks(SMTPSession session, String command, String parameters) {
+ protected Response doFilterChecks(SMTPSession session, String command, String parameters) {
session.getState().put("CURR_COMMAND", command);
return null;
}
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -70,7 +70,7 @@ public class AuthCmdHandler
}
- private SMTPResponse handleCommand(SMTPSession session, String line) {
+ private Response handleCommand(SMTPSession session, String line) {
// See JAMES-939
// According to RFC2554:
@@ -84,7 +84,7 @@ public class AuthCmdHandler
return onCommand(session, line);
}
- protected abstract SMTPResponse onCommand(SMTPSession session, String l);
+ protected abstract Response onCommand(SMTPSession session, String l);
}
@@ -123,7 +123,7 @@ public class AuthCmdHandler
* @param session SMTP session
* @param argument the argument passed in with the command by the SMTP client
*/
- private SMTPResponse doAUTH(SMTPSession session, String argument) {
+ private Response doAUTH(SMTPSession session, String argument) {
if (session.getUser() != null) {
return new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER)+" User has previously authenticated. "
+ " Further authentication is not required!");
@@ -140,7 +140,7 @@ public class AuthCmdHandler
String userpass;
if (initialResponse == null) {
session.pushLineHandler(new AbstractSMTPLineHandler() {
- protected SMTPResponse onCommand(SMTPSession session, String l) {
+ protected Response onCommand(SMTPSession session, String l) {
return doPlainAuthPass(session, l);
}
});
@@ -153,7 +153,7 @@ public class AuthCmdHandler
if (initialResponse == null) {
session.pushLineHandler(new AbstractSMTPLineHandler() {
- protected SMTPResponse onCommand(SMTPSession session, String l) {
+ protected Response onCommand(SMTPSession session, String l) {
return doLoginAuthPass(session, l);
}
});
@@ -182,7 +182,7 @@ public class AuthCmdHandler
* @param session SMTP session object
* @param initialResponse the initial response line passed in with the AUTH command
*/
- private SMTPResponse doPlainAuthPass(SMTPSession session, String userpass) {
+ private Response doPlainAuthPass(SMTPSession session, String userpass) {
String user = null, pass = null;
try {
if (userpass != null) {
@@ -237,7 +237,7 @@ public class AuthCmdHandler
// with in the if clause below
}
// Authenticate user
- SMTPResponse response = doAuthTest(session, user, pass, "PLAIN");
+ Response response = doAuthTest(session, user, pass, "PLAIN");
session.popLineHandler();
@@ -250,7 +250,7 @@ public class AuthCmdHandler
* @param session SMTP session object
* @param initialResponse the initial response line passed in with the AUTH command
*/
- private SMTPResponse doLoginAuthPass(SMTPSession session, String user) {
+ private Response doLoginAuthPass(SMTPSession session, String user) {
if (user != null) {
try {
user = new String(Base64.decodeBase64(user));
@@ -272,7 +272,7 @@ public class AuthCmdHandler
return this;
}
- protected SMTPResponse onCommand(SMTPSession session, String l) {
+ protected Response onCommand(SMTPSession session, String l) {
return doLoginAuthPassCheck(session, user, l);
}
@@ -280,7 +280,7 @@ public class AuthCmdHandler
return new SMTPResponse(SMTPRetCode.AUTH_READY, "UGFzc3dvcmQ6"); // base64 encoded "Password:"
}
- private SMTPResponse doLoginAuthPassCheck(SMTPSession session, String user, String pass) {
+ private Response doLoginAuthPassCheck(SMTPSession session, String user, String pass) {
if (pass != null) {
try {
pass = new String(Base64.decodeBase64(pass));
@@ -295,7 +295,7 @@ public class AuthCmdHandler
// Authenticate user
- SMTPResponse response = doAuthTest(session, user, pass, "LOGIN");
+ Response response = doAuthTest(session, user, pass, "LOGIN");
return response;
}
@@ -309,12 +309,12 @@ public class AuthCmdHandler
* @param authType
* @return
*/
- private SMTPResponse doAuthTest(SMTPSession session, String user, String pass, String authType) {
+ private Response doAuthTest(SMTPSession session, String user, String pass, String authType) {
if ((user == null) || (pass == null)) {
return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,"Could not decode parameters for AUTH "+authType);
}
- SMTPResponse res = null;
+ Response res = null;
List<AuthHook> hooks = getHooks();
@@ -366,7 +366,7 @@ public class AuthCmdHandler
* @param result the HookResult which should converted to SMTPResponse
* @return the calculated SMTPResponse for the given HookReslut
*/
- protected SMTPResponse calcDefaultSMTPResponse(HookResult result) {
+ protected Response calcDefaultSMTPResponse(HookResult result) {
if (result != null) {
int rCode = result.getResult();
String smtpRetCode = result.getSmtpRetCode();
@@ -429,7 +429,7 @@ public class AuthCmdHandler
* @param authType the unknown auth type
* @param initialResponse the initial response line passed in with the AUTH command
*/
- private SMTPResponse doUnknownAuth(SMTPSession session, String authType, String initialResponse) {
+ private Response doUnknownAuth(SMTPSession session, String authType, String initialResponse) {
if (session.getLogger().isInfoEnabled()) {
StringBuilder errorBuffer =
new StringBuilder(128)
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1204847&r1=1204846&r2=1204847&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java Tue Nov 22 07:56:29 2011
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -56,7 +57,7 @@ public class EhloCmdHandler extends Abst
* @param argument
* the argument passed in with the command by the SMTP client
*/
- private SMTPResponse doEHLO(SMTPSession session, String argument) {
+ private Response doEHLO(SMTPSession session, String argument) {
SMTPResponse resp = new SMTPResponse(SMTPRetCode.MAIL_OK, new StringBuilder(session.getHelloName()).append(" Hello ").append(argument)
.append(" [")
.append(session.getRemoteAddress().getAddress().getHostAddress()).append("])"));
@@ -125,7 +126,7 @@ public class EhloCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doCoreCmd(SMTPSession session, String command,
+ protected Response doCoreCmd(SMTPSession session, String command,
String parameters) {
return doEHLO(session, parameters);
}
@@ -134,7 +135,7 @@ public class EhloCmdHandler extends Abst
* @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
* java.lang.String, java.lang.String)
*/
- protected SMTPResponse doFilterChecks(SMTPSession session, String command,
+ protected Response doFilterChecks(SMTPSession session, String command,
String parameters) {
session.resetState();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org