Author: norman
Date: Sat Aug 22 18:18:17 2009
New Revision: 806877
URL: http://svn.apache.org/viewvc?rev=806877&view=rev
Log:
Generify
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ExtensibleHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.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/esmtp/AuthCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/EhloCmdHandler.java
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ExtensibleHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ExtensibleHandler.java?rev=806877&r1=806876&r2=806877&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ExtensibleHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ExtensibleHandler.java
Sat Aug 22 18:18:17 2009
@@ -31,7 +31,7 @@
* Return a List of interfaces of plugins that will
* extend this.
*/
- List getMarkerInterfaces();
+ List<Class<?>> getMarkerInterfaces();
/**
* Method called during initialization after all the handlers have been
declared
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=806877&r1=806876&r2=806877&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Sat Aug 22 18:18:17 2009
@@ -281,10 +281,10 @@
public Map<String,Object> getState() {
Object res = getConnectionState().get(SMTPSession.SESSION_STATE_MAP);
if (res == null || !(res instanceof Map)) {
- res = new HashMap();
+ res = new HashMap<String,Object>();
getConnectionState().put(SMTPSession.SESSION_STATE_MAP, res);
}
- return (Map) res;
+ return (Map<String,Object>) res;
}
/**
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java?rev=806877&r1=806876&r2=806877&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
Sat Aug 22 18:18:17 2009
@@ -46,7 +46,7 @@
*/
public class SMTPHandlerChain extends AbstractLogEnabled implements
Configurable, Serviceable, Initializable {
- private List handlers = new LinkedList();
+ private List<Object> handlers = new LinkedList<Object>();
private ServiceManager serviceManager;
@@ -91,7 +91,7 @@
Properties cmds = new Properties();
cmds.setProperty("Default CoreCmdHandlerLoader",
CoreCmdHandlerLoader.class
.getName());
- Enumeration e = cmds.keys();
+ Enumeration<Object> e = cmds.keys();
while (e.hasMoreElements()) {
String cmdName = (String) e.nextElement();
String className = cmds.getProperty(cmdName);
@@ -140,7 +140,7 @@
// commandDispatcherLineHandler.enableLogging(getLogger());
// handlers.add(commandDispatcherLineHandler);
- Iterator h = handlers.iterator();
+ Iterator<Object> h = handlers.iterator();
while(h.hasNext()) {
Object next = h.next();
@@ -175,10 +175,10 @@
// if it is a commands handler add it to the map with key as
command
// name
if (handler instanceof HandlersPackage) {
- List c = ((HandlersPackage) handler).getHandlers();
+ List<String> c = ((HandlersPackage) handler).getHandlers();
- for (Iterator i = c.iterator(); i.hasNext(); ) {
- String cName = i.next().toString();
+ for (Iterator<String> i = c.iterator(); i.hasNext(); ) {
+ String cName = i.next();
DefaultConfiguration cmdConf = new DefaultConfiguration(
"handler");
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=806877&r1=806876&r2=806877&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 18:18:17 2009
@@ -47,7 +47,7 @@
/**
* A map of parameterHooks
*/
- private Map paramHooks;
+ private Map<String, MailParametersHook> paramHooks;
@@ -176,7 +176,7 @@
// Handle the SIZE extension keyword
if (paramHooks.containsKey(mailOptionName)) {
- MailParametersHook hook = (MailParametersHook)
paramHooks.get(mailOptionName);
+ MailParametersHook hook =
paramHooks.get(mailOptionName);
SMTPResponse res =
calcDefaultSMTPResponse(hook.doMailParameter(session, mailOptionName,
mailOptionValue));
if (res != null) {
return res;
@@ -268,8 +268,8 @@
/**
* @see
org.apache.james.smtpserver.core.AbstractHookableCmdHandler#getMarkerInterfaces()
*/
- public List getMarkerInterfaces() {
- List l = super.getMarkerInterfaces();
+ public List<Class<?>> getMarkerInterfaces() {
+ List<Class<?>> l = super.getMarkerInterfaces();
l.add(MailParametersHook.class);
return l;
}
@@ -279,9 +279,9 @@
*/
public void wireExtensions(Class interfaceName, List extension) {
if (MailParametersHook.class.equals(interfaceName)) {
- this.paramHooks = new HashMap();
- for (Iterator i = extension.iterator(); i.hasNext(); ) {
- MailParametersHook hook = (MailParametersHook) i.next();
+ this.paramHooks = new HashMap<String, MailParametersHook>();
+ for (Iterator<MailParametersHook> i = extension.iterator();
i.hasNext(); ) {
+ MailParametersHook hook = i.next();
String[] params = hook.getMailParamNames();
for (int k = 0; k < params.length; k++) {
paramHooks.put(params[k], hook);
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=806877&r1=806876&r2=806877&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 18:18:17 2009
@@ -90,7 +90,7 @@
/**
* The AuthHooks
*/
- private List hooks;
+ private List<AuthHook> hooks;
private List rHooks;
@@ -292,15 +292,15 @@
SMTPResponse res = null;
- List hooks = getHooks();
+ List<AuthHook> hooks = getHooks();
if (hooks != null) {
int count = hooks.size();
for (int i = 0; i < count; i++) {
- Object rawHook = hooks.get(i);
+ AuthHook rawHook = hooks.get(i);
getLogger().debug("executing hook " + rawHook);
- HookResult hRes = ((AuthHook) rawHook).doAuth(session, user,
pass);
+ HookResult hRes = rawHook.doAuth(session, user, pass);
if (rHooks != null) {
for (int i2 = 0; i2 < rHooks.size(); i2++) {
@@ -452,7 +452,7 @@
*
* @return
*/
- protected List getHooks() {
+ protected List<AuthHook> getHooks() {
return hooks;
}
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=806877&r1=806876&r2=806877&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 18:18:17 2009
@@ -43,7 +43,7 @@
*/
private final static String COMMAND_NAME = "EHLO";
- private List ehloExtensions;
+ private List<EhloExtension> ehloExtensions;
/**
* Handler method called upon receipt of a EHLO command. Responds with a
@@ -80,8 +80,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,8 +90,8 @@
/**
* @see org.apache.james.smtpserver.ExtensibleHandler#getMarkerInterfaces()
*/
- public List getMarkerInterfaces() {
- List classes = super.getMarkerInterfaces();
+ public List<Class<?>> getMarkerInterfaces() {
+ List<Class<?>> classes = super.getMarkerInterfaces();
classes.add(EhloExtension.class);
return classes;
}
@@ -117,11 +117,11 @@
if (ehloExtensions != null) {
int count = ehloExtensions.size();
for (int i = 0; i < count; i++) {
- List lines = ((EhloExtension) ehloExtensions.get(i))
+ List<String> lines = ((EhloExtension) ehloExtensions.get(i))
.getImplementedEsmtpFeatures(session);
if (lines != null) {
for (int j = 0; j < lines.size(); j++) {
- resp.appendLine((String) lines.get(j));
+ resp.appendLine(lines.get(j));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
