Author: norman
Date: Fri Nov 18 14:45:49 2011
New Revision: 1203675
URL: http://svn.apache.org/viewvc?rev=1203675&view=rev
Log:
Remove @deprecated code usage
Modified:
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/ReceivedDataLineFilter.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
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
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=1203675&r1=1203674&r2=1203675&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
Fri Nov 18 14:45:49 2011
@@ -109,7 +109,7 @@ public class DataCmdHandler implements C
*/
@SuppressWarnings("unchecked")
protected SMTPResponse doDATA(SMTPSession session, String argument) {
- MailEnvelope env = createEnvelope(session, (MailAddress)
session.getState().get(SMTPSession.SENDER), new
ArrayList<MailAddress>((Collection)session.getState().get(SMTPSession.RCPT_LIST)));
+ MailEnvelope env = createEnvelope(session, (MailAddress)
session.getState().get(SMTPSession.SENDER), new
ArrayList<MailAddress>((Collection<MailAddress>)session.getState().get(SMTPSession.RCPT_LIST)));
session.getState().put(MAILENV, env);
session.pushLineHandler(lineHandler);
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=1203675&r1=1203674&r2=1203675&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
Fri Nov 18 14:45:49 2011
@@ -59,9 +59,8 @@ public class HeloCmdHandler extends Abst
COMMAND_NAME);
StringBuilder response = new StringBuilder();
response.append(session.getHelloName()).append(
- " Hello ").append(parameters).append(" (").append(
- session.getRemoteHost()).append(" [").append(
- session.getRemoteIPAddress()).append("])");
+ " Hello ").append(parameters).append(" [").append(
+
session.getRemoteAddress().getAddress().getHostAddress()).append("])");
return new SMTPResponse(SMTPRetCode.MAIL_OK, response);
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java?rev=1203675&r1=1203674&r2=1203675&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
Fri Nov 18 14:45:49 2011
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.mailet.MailAddress;
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
@@ -62,7 +63,8 @@ public class ReceivedDataLineFilter impl
return resp;
}
- private Response addNewReceivedMailHeaders(SMTPSession session,
LineHandler<SMTPSession> next) {
+ @SuppressWarnings("unchecked")
+ private Response addNewReceivedMailHeaders(SMTPSession session,
LineHandler<SMTPSession> next) {
StringBuilder headerLineBuffer = new StringBuilder();
String heloMode = (String) session.getConnectionState().get(
@@ -72,14 +74,14 @@ public class ReceivedDataLineFilter impl
// Put our Received header first
headerLineBuffer.append(RFC2822Headers.RECEIVED + ": from ").append(
- session.getRemoteHost());
+ session.getRemoteAddress().getHostName());
if (heloName != null) {
headerLineBuffer.append(" (").append(heloMode).append(" ").append(
heloName).append(") ");
}
- headerLineBuffer.append(" ([").append(session.getRemoteIPAddress())
+ headerLineBuffer.append("
([").append(session.getRemoteAddress().getAddress().getHostAddress())
.append("])").append("\r\n");
Response response = next.onLine(session,
headerLineBuffer.toString().getBytes(CHARSET));
@@ -111,7 +113,7 @@ public class ReceivedDataLineFilter impl
headerLineBuffer.append(" ID ").append(session.getSessionID());
- if (((Collection)
session.getState().get(SMTPSession.RCPT_LIST)).size() == 1) {
+ if (((Collection<?>)
session.getState().get(SMTPSession.RCPT_LIST)).size() == 1) {
// Only indicate a recipient if they're the only recipient
// (prevents email address harvesting and large headers in
// bulk email)
@@ -120,7 +122,7 @@ public class ReceivedDataLineFilter impl
headerLineBuffer.delete(0, headerLineBuffer.length());
headerLineBuffer.delete(0, headerLineBuffer.length());
- headerLineBuffer.append(" for <").append(((List)
session.getState().get(SMTPSession.RCPT_LIST)).get(0).toString()).append(">;").append("\r\n");
+ headerLineBuffer.append(" for
<").append(((List<MailAddress>)
session.getState().get(SMTPSession.RCPT_LIST)).get(0).toString()).append(">;").append("\r\n");
response = next.onLine(session,
headerLineBuffer.toString().getBytes(CHARSET));
if (response != 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=1203675&r1=1203674&r2=1203675&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
Fri Nov 18 14:45:49 2011
@@ -351,7 +351,7 @@ public class AuthCmdHandler
}
res = new SMTPResponse(SMTPRetCode.AUTH_FAILED, "Authentication
Failed");
- session.getLogger().error("AUTH method "+authType+" failed from " +
user + "@" + session.getRemoteIPAddress());
+ session.getLogger().error("AUTH method "+authType+" failed from " +
user + "@" + session.getRemoteAddress().getAddress().getHostAddress());
return res;
}
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=1203675&r1=1203674&r2=1203675&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
Fri Nov 18 14:45:49 2011
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.protocols.api.handler.WiringException;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -56,7 +55,7 @@ public class EhloCmdHandler extends Abst
*/
private SMTPResponse doEHLO(SMTPSession session, String argument) {
SMTPResponse resp = new SMTPResponse(SMTPRetCode.MAIL_OK, new
StringBuilder(session.getHelloName()).append(" Hello ").append(argument)
- .append(" (").append(session.getRemoteHost()).append(" [")
+ .append(" [")
.append(session.getRemoteIPAddress()).append("])"));
session.getConnectionState().put(SMTPSession.CURRENT_HELO_MODE,
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java?rev=1203675&r1=1203674&r2=1203675&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
Fri Nov 18 14:45:49 2011
@@ -24,7 +24,6 @@ package org.apache.james.protocols.smtp.
import java.util.Collection;
import java.util.StringTokenizer;
-import org.apache.james.protocols.api.handler.ConnectHandler;
import org.apache.james.protocols.smtp.DNSService;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
@@ -123,7 +122,7 @@ public class DNSRBLHandler implements R
* This whould make no sense.
*/
if (session.isRelayingAllowed()) {
- session.getLogger().info("Ipaddress " +
session.getRemoteIPAddress() + " is allowed to relay. Don't check it");
+ session.getLogger().info("Ipaddress " +
session.getRemoteAddress().getAddress() + " is allowed to relay. Don't check
it");
return;
}
@@ -146,7 +145,7 @@ public class DNSRBLHandler implements R
return;
} catch (java.net.UnknownHostException uhe) {
if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug("IpAddress " +
session.getRemoteIPAddress() + " not listed on " + rblList[i]);
+ session.getLogger().debug("IpAddress " +
session.getRemoteAddress().getAddress() + " not listed on " + rblList[i]);
}
}
}
@@ -188,7 +187,7 @@ public class DNSRBLHandler implements R
* @see
org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender,
MailAddress rcpt) {
- checkDNSRBL(session, session.getRemoteIPAddress());
+ checkDNSRBL(session,
session.getRemoteAddress().getAddress().getHostAddress());
if (!session.isRelayingAllowed()) {
String blocklisted = (String)
session.getConnectionState().get(RBL_BLOCKLISTED_MAIL_ATTRIBUTE_NAME);
@@ -196,7 +195,7 @@ public class DNSRBLHandler implements R
if (blocklisted != null) { // was found in the RBL
if (blocklistedDetail == null) {
return new
HookResult(HookReturnCode.DENY,DSNStatus.getStatus(DSNStatus.PERMANENT,
- DSNStatus.SECURITY_AUTH) + " Rejected:
unauthenticated e-mail from " + session.getRemoteIPAddress()
+ DSNStatus.SECURITY_AUTH) + " Rejected:
unauthenticated e-mail from " + session.getRemoteAddress().getAddress()
+ " is restricted. Contact the postmaster for
details.");
} else {
return new
HookResult(HookReturnCode.DENY,DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SECURITY_AUTH)
+ " " + blocklistedDetail);
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java?rev=1203675&r1=1203674&r2=1203675&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
Fri Nov 18 14:45:49 2011
@@ -43,7 +43,7 @@ public class SupressDuplicateRcptHandler
*/
@SuppressWarnings("unchecked")
public HookResult doRcpt(SMTPSession session, MailAddress sender,
MailAddress rcpt) {
- Collection rcptList = (Collection)
session.getState().get(SMTPSession.RCPT_LIST);
+ Collection<MailAddress> rcptList = (Collection<MailAddress>)
session.getState().get(SMTPSession.RCPT_LIST);
// Check if the recipient is already in the rcpt list
if(rcptList != null && rcptList.contains(rcpt)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
