Return-Path: X-Original-To: apmail-roller-commits-archive@www.apache.org Delivered-To: apmail-roller-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95544101F6 for ; Sat, 15 Mar 2014 02:53:12 +0000 (UTC) Received: (qmail 57722 invoked by uid 500); 15 Mar 2014 02:53:12 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 57699 invoked by uid 500); 15 Mar 2014 02:53:11 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 57690 invoked by uid 99); 15 Mar 2014 02:53:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Mar 2014 02:53:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Mar 2014 02:53:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1A14A23889E1; Sat, 15 Mar 2014 02:52:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1577774 - in /roller/trunk/app/src/main/java/org/apache/roller: planet/business/ weblogger/business/runnable/ weblogger/pojos/ weblogger/ui/rendering/pagers/ weblogger/ui/rendering/util/cache/ weblogger/ui/struts2/admin/ weblogger/util/ Date: Sat, 15 Mar 2014 02:52:48 -0000 To: commits@roller.apache.org From: gmazza@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140315025249.1A14A23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gmazza Date: Sat Mar 15 02:52:48 2014 New Revision: 1577774 URL: http://svn.apache.org/r1577774 Log: ROL-1907 Switch from keySet to entrySet in 10 places Sonar has found. Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java Sat Mar 15 02:52:48 2014 @@ -107,28 +107,27 @@ public class MultiPlanetURLStrategy impl /** * Compose a map of key=value params into a query string. */ - public String getQueryString(Map params) { + public String getQueryString(Map params) { if(params == null) { return null; } StringBuilder queryString = new StringBuilder(); - - for(Object key : params.keySet()) { - String value = (String) params.get(key); - + + for (Map.Entry entry : params.entrySet()) { + if (queryString.length() == 0) { queryString.append("?"); } else { queryString.append("&"); } - - queryString.append(key); + + queryString.append(entry.getKey()); queryString.append("="); - queryString.append(value); + queryString.append(entry.getValue()); } - + return queryString.toString(); } Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java Sat Mar 15 02:52:48 2014 @@ -73,7 +73,7 @@ public interface PlanetURLStrategy { /** * Compose a map of key=value params into a query string. */ - String getQueryString(Map params); + String getQueryString(Map params); /** Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java Sat Mar 15 02:52:48 2014 @@ -79,10 +79,10 @@ public class HitCountProcessingJob imple long startTime = System.currentTimeMillis(); Weblog weblog; - for (String key : hitsTally.keySet()) { + for (Map.Entry entry : hitsTally.entrySet()) { try { - weblog = wmgr.getWeblogByHandle(key); - emgr.incrementHitCount(weblog, (hitsTally.get(key)).intValue()); + weblog = wmgr.getWeblogByHandle(entry.getKey()); + emgr.incrementHitCount(weblog, entry.getValue().intValue()); } catch (WebloggerException ex) { log.error(ex); } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sat Mar 15 02:52:48 2014 @@ -987,9 +987,9 @@ public class WeblogEntry implements Seri // now loop over mPagePlugins, matching // against Entry plugins (by name): // where a match is found render Plugin. - for (String key : inPlugins.keySet()) { - if (entryPlugins.contains(key)) { - WeblogEntryPlugin pagePlugin = inPlugins.get(key); + for (Map.Entry entry : inPlugins.entrySet()) { + if (entryPlugins.contains(entry.getKey())) { + WeblogEntryPlugin pagePlugin = entry.getValue(); try { ret = pagePlugin.render(this, ret); } catch (Exception e) { Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java Sat Mar 15 02:52:48 2014 @@ -125,10 +125,10 @@ public class WeblogEntriesDayPager exten // need to wrap pojos int count = 0; - for (Date key : mmap.keySet()) { + for (Map.Entry> entry : mmap.entrySet()) { // now we need to go through each entry in a day and wrap List wrapped = new ArrayList(); - List unwrapped = mmap.get(key); + List unwrapped = entry.getValue(); for(int i=0; i < unwrapped.size(); i++) { if (count++ < length) { wrapped.add(i,WeblogEntryWrapper.wrap(unwrapped.get(i), urlStrategy)); @@ -139,7 +139,7 @@ public class WeblogEntriesDayPager exten // done with that day, put it in the map if (wrapped.size() > 0) { - entries.put(key, wrapped); + entries.put(entry.getKey(), wrapped); } } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java Sat Mar 15 02:52:48 2014 @@ -83,10 +83,10 @@ public class WeblogEntriesLatestPager ex // need to wrap pojos int count = 0; - for (Date key : mmap.keySet()) { + for (Map.Entry> entry : mmap.entrySet()) { // now we need to go through each entry in a day and wrap List wrapped = new ArrayList(); - List unwrapped= mmap.get(key); + List unwrapped = entry.getValue(); for(int i=0; i < unwrapped.size(); i++) { if (count++ < length) { wrapped.add(i,WeblogEntryWrapper.wrap(unwrapped.get(i), urlStrategy)); @@ -97,7 +97,7 @@ public class WeblogEntriesLatestPager ex // done with that day, put it in the map if(wrapped.size() > 0) { - entries.put(key, wrapped); + entries.put(entry.getKey(), wrapped); } } } catch (Exception e) { Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java Sat Mar 15 02:52:48 2014 @@ -121,11 +121,11 @@ public class WeblogEntriesMonthPager ext // need to wrap pojos int count = 0; - for (Date key : mmap.keySet()) { + for (Map.Entry> entry : mmap.entrySet()) { // now we need to go through each entry in a day and wrap List wrapped = new ArrayList(); - List unwrapped = mmap.get(key); - for(int i=0; i < unwrapped.size(); i++) { + List unwrapped = entry.getValue(); + for (int i=0; i < unwrapped.size(); i++) { if (count++ < length) { wrapped.add(i,WeblogEntryWrapper.wrap(unwrapped.get(i), urlStrategy)); } else { @@ -134,8 +134,8 @@ public class WeblogEntriesMonthPager ext } // done with that day, put it in the map - if(wrapped.size() > 0) { - entries.put(key, wrapped); + if (wrapped.size() > 0) { + entries.put(entry.getKey(), wrapped); } } } catch (Exception e) { Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java Sat Mar 15 02:52:48 2014 @@ -422,18 +422,15 @@ public class SiteWideCache implements Ca private String paramsToString(Map map) { - if(map == null) { + if (map == null) { return null; } StringBuilder string = new StringBuilder(); - String[] value; - for (String key : map.keySet()) { - value = map.get(key); - - if(value != null) { - string.append(",").append(key).append("=").append(value[0]); + for (Map.Entry entry : map.entrySet()) { + if(entry.getValue() != null) { + string.append(",").append(entry.getKey()).append("=").append(entry.getValue()[0]); } } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java Sat Mar 15 02:52:48 2014 @@ -243,18 +243,15 @@ public final class WeblogPageCache { private String paramsToString(Map map) { - if(map == null) { + if (map == null) { return null; } StringBuilder string = new StringBuilder(); - String[] value; - for (String key : map.keySet()) { - value = map.get(key); - - if(value != null) { - string.append(",").append(key).append("=").append(value[0]); + for (Map.Entry entry : map.entrySet()) { + if(entry.getKey() != null) { + string.append(",").append(entry.getKey()).append("=").append(entry.getValue()[0]); } } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Sat Mar 15 02:52:48 2014 @@ -214,14 +214,14 @@ public class GlobalConfig extends UIActi } - public void setParameters(Map parameters) { + public void setParameters(Map parameters) { this.params = parameters; if (log.isDebugEnabled()) { log.debug("Parameter map:"); - Set keys = parameters.keySet(); - for(String key : keys) { - log.debug(key+" = "+parameters.get(key)); + + for(Map.Entry entry : parameters.entrySet()) { + log.debug(entry.getKey() + " = " + entry.getValue()); } } } @@ -229,7 +229,7 @@ public class GlobalConfig extends UIActi // convenience method for getting a single parameter as a String private String getParameter(String key) { - String[] p = (String[]) this.params.get(key); + String[] p = this.params.get(key); if(p != null && p.length > 0) { return p[0]; } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java?rev=1577774&r1=1577773&r2=1577774&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java Sat Mar 15 02:52:48 2014 @@ -45,8 +45,7 @@ public final class URLUtilities { } StringBuilder queryString = new StringBuilder(); - for (String key : params.keySet()) { - String value = params.get(key); + for (Map.Entry entry : params.entrySet()) { if (queryString.length() == 0) { queryString.append("?"); @@ -54,9 +53,9 @@ public final class URLUtilities { queryString.append("&"); } - queryString.append(key); + queryString.append(entry.getKey()); queryString.append("="); - queryString.append(value); + queryString.append(entry.getValue()); } return queryString.toString();