Author: norman
Date: Sat Sep 17 18:47:43 2011
New Revision: 1172046
URL: http://svn.apache.org/viewvc?rev=1172046&view=rev
Log:
Merge RetCodeResponse with Response interface
Removed:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/RetCodeResponse.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java?rev=1172046&r1=1172045&r2=1172046&view=diff
==============================================================================
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java
Sat Sep 17 18:47:43 2011
@@ -27,7 +27,19 @@ import java.util.List;
*
*/
public interface Response {
+ /**
+ * Return return-code
+ * @return
+ */
+ String getRetCode();
+
+ /**
+ * Set the return-code used for this response
+ *
+ * @param retCode
+ */
+ void setRetCode(String retCode);
/**
* Append line to response
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java?rev=1172046&r1=1172045&r2=1172046&view=diff
==============================================================================
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java
Sat Sep 17 18:47:43 2011
@@ -22,14 +22,13 @@ import org.apache.james.protocols.api.Co
import org.apache.james.protocols.api.CommandHandlerResultHandler;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.Response;
-import org.apache.james.protocols.api.RetCodeResponse;
/**
*
*
*
*/
-public abstract class AbstractCommandHandlerResultLogger<R extends
RetCodeResponse, S extends ProtocolSession> implements
CommandHandlerResultHandler<R, S> {
+public abstract class AbstractCommandHandlerResultLogger<R extends Response, S
extends ProtocolSession> implements CommandHandlerResultHandler<R, S> {
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java?rev=1172046&r1=1172045&r2=1172046&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
Sat Sep 17 18:47:43 2011
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.protocols.api.RetCodeResponse;
+import org.apache.james.protocols.api.Response;
/**
* Contains an SMTP result
*/
-public class SMTPResponse implements RetCodeResponse {
+public class SMTPResponse implements Response {
private String retCode = null;
private List<CharSequence> lines = null;
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=1172046&r1=1172045&r2=1172046&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
Sat Sep 17 18:47:43 2011
@@ -30,7 +30,6 @@ import java.util.StringTokenizer;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
-import org.apache.james.protocols.api.RetCodeResponse;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -61,7 +60,7 @@ public class MailCmdHandler extends Abst
public Response onCommand(SMTPSession session, Request request) {
Response response = super.onCommand(session, request);
// Check if the response was not ok
- if (((RetCodeResponse)
response).getRetCode().equals(SMTPRetCode.MAIL_OK) == false) {
+ if (response.getRetCode().equals(SMTPRetCode.MAIL_OK) == false) {
// cleanup the session
session.getState().remove(SMTPSession.SENDER);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
