Changeset 175

Show
Ignore:
Timestamp:
01/08/08 21:40:19 (1 year ago)
Author:
jfp
Message:

refact

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/jsmtpd/src/org/jsmtpd/Controler.java

    r174 r175  
    2222 
    2323import java.io.IOException; 
    24 import java.util.Iterator; 
    2524import java.util.List; 
    2625 
    …… 
    205204         
    206205        List<IGenericPlugin> tempList = PluginStore.getInstance().getFilterList(); 
    207         for (Iterator iter = tempList.iterator(); iter.hasNext();) { 
    208             IGenericPlugin element = (IGenericPlugin) iter.next(); 
    209             log.info("Plugin loaded : " + element.getPluginName()); 
    210         } 
     206        for (IGenericPlugin genericPlugin : tempList) { 
     207                log.info("Plugin loaded : " + genericPlugin.getPluginName()); 
     208                } 
    211209 
    212210        try { 
    …… 
    274272 
    275273        List<IGenericPlugin> plugins = PluginStore.getInstance().getFilterList(); 
    276         for (Iterator iter = plugins.iterator(); iter.hasNext();) { 
    277             IGenericPlugin module = (IGenericPlugin) iter.next(); 
    278             log.info( "Shutting down plugin : " + module.getPluginName()); 
     274        for (IGenericPlugin module : plugins) { 
     275                log.info( "Shutting down plugin : " + module.getPluginName()); 
    279276            module.shutdownPlugin(); 
    280         } 
     277               } 
    281278        IGenericPlugin module = PluginStore.getInstance().getResolver(); 
    282279        log.debug("Shutting down plugin : " + module.getPluginName()); 

  • trunk/jsmtpd/src/org/jsmtpd/core/common/PluginStore.java

    r136 r175  
    2121package org.jsmtpd.core.common; 
    2222 
    23 import java.util.Iterator; 
    2423import java.util.LinkedList; 
    2524import java.util.List; 
    …… 
    6160    public List<IGenericPlugin> getFilterList() { 
    6261        LinkedList<IGenericPlugin> fl = new LinkedList<IGenericPlugin>(); 
    63         for (Iterator iter = plugins.iterator(); iter.hasNext();) { 
    64             LoadedPlugin element = (LoadedPlugin) iter.next(); 
    65             fl.add(element.getModule()); 
    66         } 
     62        for (LoadedPlugin loadedPlugin : plugins) { 
     63                fl.add(loadedPlugin.getModule()); 
     64                } 
    6765        return fl; 
    6866    } 
    6967 
    7068    public IGenericPlugin getPluginByLogicalName(String logicalName) throws ModuleNotFoundException { 
    71         for (Iterator iter = plugins.iterator(); iter.hasNext();) { 
    72             LoadedPlugin element = (LoadedPlugin) iter.next(); 
    73             if (element.getLogicalName().equals(logicalName)) 
    74                 return element.getModule(); 
    75         } 
    76  
     69        for (LoadedPlugin plugin : plugins) { 
     70                if (plugin.getLogicalName().equals(logicalName)) 
     71                return plugin.getModule(); 
     72                } 
    7773        throw new ModuleNotFoundException(logicalName); 
    7874    } 

  • trunk/jsmtpd/src/org/jsmtpd/core/common/smtpExtension/IProtocolHandler.java

    r112 r175  
    4444    public void setSecured(boolean secured); 
    4545 
    46     public List getCommandHistory(); 
     46    public List<String>getCommandHistory(); 
    4747 
    4848    public void addCommandHistory(String command); 

  • trunk/jsmtpd/src/org/jsmtpd/core/receive/InputIPFilterChecker.java

    r136 r175  
    2222 
    2323import java.net.InetAddress; 
    24 import java.util.Iterator; 
    2524import java.util.LinkedList; 
    2625import java.util.List; 
    …… 
    3332 
    3433public class InputIPFilterChecker { 
    35     private List ipFilters=new LinkedList(); 
     34    private List<IFilterIP> ipFilters=new LinkedList<IFilterIP>(); 
    3635    private Log log = LogFactory.getLog(InputIPFilterChecker.class); 
     36     
    3737    public InputIPFilterChecker (){ 
    3838        ipFilters=PluginStore.getInstance().getInputIPFilters(); 
    …… 
    4040     
    4141    public boolean checkIPAgainstFilters (InetAddress toCheck) { 
    42         for (Iterator iter = ipFilters.iterator(); iter.hasNext();) { 
    43             IFilterIP element = (IFilterIP) iter.next(); 
    44             if (!element.checkIP(toCheck)) { 
    45                 log.warn("Client ip " + toCheck.getHostAddress() + " is blacklisted by " + element.getPluginName() + ", closing connection"); 
     42        for (IFilterIP filter : ipFilters) { 
     43                if (!filter.checkIP(toCheck)) { 
     44                log.warn("Client ip " + toCheck.getHostAddress() + " is blacklisted by " + filter.getPluginName() + ", closing connection"); 
    4645                return false; 
    47             } 
    48         } 
     46            }   
     47               } 
    4948        return true; 
    5049    } 

  • trunk/jsmtpd/src/org/jsmtpd/core/receive/ProtocolHandler.java

    r174 r175  
    2727import java.net.Socket; 
    2828import java.util.Date; 
    29 import java.util.Iterator; 
    3029import java.util.LinkedList; 
    3130import java.util.List; 
    …… 
    337336            List<Rcpt> rcpts = mail.getRcpt(); 
    338337            String rc = ""; 
    339             for (Iterator iter = rcpts.iterator(); iter.hasNext();) { 
    340                 Rcpt element = (Rcpt) iter.next(); 
    341                 rc += "<" + element.getEmailAddress().toString() + ">;"; 
    342             } 
     338            for (Rcpt rcpt : rcpts) { 
     339                 rc += "<" + rcpt.getEmailAddress().toString() + ">;"; 
     340                        } 
    343341            dsp.appendString("Received: from " + remote + " by " + localHost + " (Jsmtpd) for " + rc + " " + DateUtil.currentRFCDate()); 
    344342 
    …… 
    554552 
    555553 
    556     public List getCommandHistory() { 
     554    public List<String> getCommandHistory() { 
    557555        return commandHistory; 
    558556    } 

  • trunk/jsmtpd/src/org/jsmtpd/core/send/DeliveryHandler.java

    r158 r175  
    2525import java.util.ArrayList; 
    2626import java.util.HashMap; 
    27 import java.util.Iterator; 
    2827import java.util.LinkedList; 
    2928import java.util.List; 
    …… 
    104103        Map<String,List<Rcpt>> batch = prepareBatch(in); 
    105104 
    106         for (Iterator iter = batch.keySet().iterator(); iter.hasNext();) { 
    107             String domain = (String) iter.next(); 
     105        for (String domain : batch.keySet()) { 
    108106            List<Rcpt> domainBatch = batch.get(domain); 
    109107            //Get the first recipient and use it to determine if it's local or remote domain 
    …… 
    125123        // the delivery plugins will modify the status of each recipient (success, temporary failure, fatal failure). 
    126124        // We need to check if retries does not exceed a threshold. 
    127         for (Iterator iter = rcpt.iterator(); iter.hasNext();) { 
    128             Rcpt element = (Rcpt) iter.next(); 
     125        for (Rcpt element : rcpt) {; 
    129126            if (element.getDeliveryAttempts() > maxRetries) { 
    130127                element.setDelivered(Rcpt.STATUS_ERROR_FATAL); //change to fatal 
    …… 
    162159        List<Rcpt> rawRcpt = in.getRcpt(); 
    163160 
    164         for (Iterator iter = rawRcpt.iterator(); iter.hasNext();) { 
    165             Rcpt rcpt = (Rcpt) iter.next(); 
     161        for (Rcpt rcpt : rawRcpt) { 
    166162            if (!rcpt.isDelivered()) { // skip already delivered 
    167163                log.debug("Delivery handler adding "+rcpt.getEmailAddress().toString()+" to batch (num retry="+rcpt.getDeliveryAttempts()+")"); 
    …… 
    204200        // If there is a fatal error, notify sender. 
    205201        boolean bounce=false; 
    206         for (Iterator iter = e.getRcpt().iterator(); iter.hasNext();) { 
    207             Rcpt element = (Rcpt) iter.next(); 
     202        for (Rcpt element : e.getRcpt()) { 
    208203            if (element.getStatus()==Rcpt.STATUS_ERROR_FATAL) { 
    209204                bounce=true; 
    …… 
    218213            messages.add(""); 
    219214            messages.add("I'm afraid I can't deliver your email to : "); 
    220             for (Iterator iter = e.getRcpt().iterator(); iter.hasNext();) { 
    221                 Rcpt element = (Rcpt) iter.next(); 
     215 
     216               for (Rcpt element : e.getRcpt()) { 
    222217                if (element.getStatus() == Rcpt.STATUS_ERROR_FATAL) 
    223218                    messages.add("\t Recipent: " + element.getEmailAddress().toString() + ", fatal error: "+element.getLastError()); 
    …… 
    236231    private void sendNotification() { 
    237232        boolean bounce=false; 
    238         for (Iterator iter = e.getRcpt().iterator(); iter.hasNext();) { 
    239             Rcpt element = (Rcpt) iter.next(); 
     233        for (Rcpt element : e.getRcpt()) { 
    240234            if (element.getStatus()==Rcpt.STATUS_ERROR_NOT_FATAL) { 
    241235                bounce=true; 
    …… 
    250244            messages.add(""); 
    251245            messages.add("You wanted me to deliver your mail, but I could not do immediatly for : "); 
    252             for (Iterator iter = e.getRcpt().iterator(); iter.hasNext();) { 
    253                 Rcpt element = (Rcpt) iter.next(); 
     246            for (Rcpt element : e.getRcpt()) { 
    254247                if (element.getStatus() == Rcpt.STATUS_ERROR_FATAL) 
    255248                    messages.add("\t Recipent: " + element.getEmailAddress().toString() + ", fatal error (I give up) : "+element.getLastError()); 

  • trunk/jsmtpd/src/org/jsmtpd/core/send/QueueService.java

    r130 r175  
    2525import java.io.IOException; 
    2626import java.util.Collections; 
    27 import java.util.Iterator; 
    2827import java.util.LinkedList; 
    2928import java.util.List; 
    …… 
    253252    public void shutdownService() { 
    254253        running = false; 
    255         for (Iterator iter = directService.iterator(); iter.hasNext();) { 
    256             Email element = (Email) iter.next(); 
     254        for (Email element : directService) { 
    257255            try { 
    258256                Email.save(tempPath + "mqueue/retry/" + element.getDiskName(), element); 

  • trunk/jsmtpd/src/org/jsmtpd/generic/threadpool/GenericThreadPool.java

    r123 r175  
    2121package org.jsmtpd.generic.threadpool; 
    2222 
    23 import java.util.Iterator; 
    2423import java.util.LinkedList; 
    2524 
    …… 
    111110     */ 
    112111    public synchronized boolean hasFreeThread() { 
    113         for (Iterator iter = threads.iterator(); iter.hasNext();) { 
    114             ThreadWorker element = (ThreadWorker) iter.next(); 
     112        for (ThreadWorker element : threads) { 
    115113            if (element.isFree()) 
    116114                return true; 
    …… 
    124122    public synchronized int countFreeThread() { 
    125123        int count = 0; 
    126         for (Iterator iter = threads.iterator(); iter.hasNext();) { 
    127             ThreadWorker element = (ThreadWorker) iter.next(); 
     124        for (ThreadWorker element : threads) { 
    128125            if (element.isFree()) 
    129126                count++; 
    …… 
    139136    public synchronized void assignFreeThread(Object obj) throws BusyThreadPoolException { 
    140137        int i = 0; 
    141         for (Iterator iter = threads.iterator(); iter.hasNext();) { 
    142             ThreadWorker element = (ThreadWorker) iter.next(); 
     138        for (ThreadWorker element : threads) { 
    143139            if (element.isFree()) { 
    144140                log.debug("Worker "+element.getName()+" is free, assigning job"); 

  • trunk/jsmtpd/src/org/jsmtpd/generic/threadpool/GrowingThreadPool.java

    r142 r175  
    2222 
    2323import java.util.HashSet; 
    24 import java.util.Iterator; 
    2524import java.util.LinkedList; 
    2625import java.util.List; 
    …… 
    141140     */ 
    142141    public synchronized boolean hasFreeThread() { 
    143         for (Iterator iter = threads.iterator(); iter.hasNext();) { 
    144             ThreadWorker element = (ThreadWorker) iter.next(); 
     142        for (ThreadWorker element : threads) { 
    145143            if (element.isFree()) 
    146144                return true; 
    …… 
    156154    public synchronized int countFreeThread() { 
    157155        int count = 0; 
    158         for (Iterator iter = threads.iterator(); iter.hasNext();) { 
    159             ThreadWorker element = (ThreadWorker) iter.next(); 
     156        for (ThreadWorker element : threads) { 
    160157            if (element.isFree()) 
    161158                count++; 

  • trunk/jsmtpd/src/org/jsmtpd/plugins/GenericRBLFilter.java

    r164 r175  
    44import java.net.InetAddress; 
    55import java.util.ArrayList; 
    6 import java.util.Iterator; 
    76import java.util.List; 
    87 
    …… 
    6766        String reverse = parts[3] + "." + parts[2] + "." + parts[1] + "." + parts[0]; 
    6867 
    69         // For each RBL server, try to resolve. First successfull resolution fails the filter (eg it means that's the ip is blacklisted) 
    70         for (Iterator iter = serverList.iterator(); iter.hasNext();) { 
    71             String element = (String) iter.next(); 
     68        // For each RBL server, try to resolve. First successfull resolution fails the filter (eg it means that's the ip is blacklisted 
     69        for (String element : serverList) { 
    7270            String toCheck = reverse + "." + element; 
    7371            log.debug("Client ip: " + ipString + " RBL filtering with " + element);