Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java Sun Jan 5 15:32:34 2014 @@ -19,7 +19,6 @@ package org.apache.roller.weblogger.ui.rendering.util.cache; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; @@ -91,7 +90,7 @@ public class WeblogCacheWarmupJob implem } - private void warmupFeedCache(List weblogs, String type, String format) { + private void warmupFeedCache(List<String> weblogs, String type, String format) { if(weblogs == null) { return; @@ -99,13 +98,9 @@ public class WeblogCacheWarmupJob implem // we are working on the feed cache WeblogFeedCache feedCache = WeblogFeedCache.getInstance(); - long start = System.currentTimeMillis(); - Iterator allWeblogs = weblogs.iterator(); - String weblogHandle = null; - while(allWeblogs.hasNext()) { - weblogHandle = (String) allWeblogs.next(); + for (String weblogHandle : weblogs) { log.debug("doing weblog "+weblogHandle); try { @@ -117,7 +112,7 @@ public class WeblogCacheWarmupJob implem // populate the rendering model - HashMap model = new HashMap(); + Map model = new HashMap(); Map initData = new HashMap(); initData.put("request", null); initData.put("feedRequest", feedRequest);
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=1555526&r1=1555525&r2=1555526&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 Sun Jan 5 15:32:34 2014 @@ -22,7 +22,6 @@ import java.io.UnsupportedEncodingExcept import java.net.URLEncoder; import java.util.Enumeration; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -242,28 +241,23 @@ public final class WeblogPageCache { return key.toString(); } - - private String paramsToString(Map map) { - - if (map == null) { + private String paramsToString(Map<String, String[]> map) { + + if(map == null) { return null; } - + StringBuilder string = new StringBuilder(); - - String key = null; - String[] value = null; - Iterator keys = map.keySet().iterator(); - while (keys.hasNext()) { - key = (String) keys.next(); - value = (String[]) map.get(key); - + + String[] value; + for (String key : map.keySet()) { + value = map.get(key); + if(value != null) { string.append(",").append(key).append("=").append(value[0]); } } - + return Utilities.toBase64(string.toString().substring(1).getBytes()); } - } 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=1555526&r1=1555525&r2=1555526&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 Sun Jan 5 15:32:34 2014 @@ -20,7 +20,6 @@ package org.apache.roller.weblogger.ui.s import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -56,7 +55,7 @@ public class GlobalConfig extends UIActi private Map params = Collections.EMPTY_MAP; // map of config properties - private Map properties = Collections.EMPTY_MAP; + private Map<String, RuntimeConfigProperty> properties = Collections.EMPTY_MAP; // the runtime config def used to populate the display private ConfigDef globalConfigDef = null; @@ -155,13 +154,10 @@ public class GlobalConfig extends UIActi } // only set values for properties that are already defined - String propName = null; - RuntimeConfigProperty updProp = null; - String incomingProp = null; - Iterator propsIT = getProperties().keySet().iterator(); - while (propsIT.hasNext()) { - propName = (String) propsIT.next(); - updProp = (RuntimeConfigProperty) getProperties().get(propName); + RuntimeConfigProperty updProp; + String incomingProp; + for (String propName : getProperties().keySet()) { + updProp = getProperties().get(propName); incomingProp = this.getParameter(updProp.getName()); log.debug("Checking property ["+propName+"]"); @@ -196,8 +192,7 @@ public class GlobalConfig extends UIActi if(getCommentPlugins().length > 0) { enabledPlugins = StringUtils.join(getCommentPlugins(), ","); } - RuntimeConfigProperty prop = - (RuntimeConfigProperty) getProperties().get("users.comments.plugins"); + RuntimeConfigProperty prop = getProperties().get("users.comments.plugins"); prop.setValue(enabledPlugins); try { @@ -242,11 +237,11 @@ public class GlobalConfig extends UIActi } - public Map getProperties() { + public Map<String, RuntimeConfigProperty> getProperties() { return properties; } - public void setProperties(Map properties) { + public void setProperties(Map<String, RuntimeConfigProperty> properties) { this.properties = properties; } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Sun Jan 5 15:32:34 2014 @@ -101,15 +101,14 @@ public class Register extends UIAction i /* TODO: when Spring Security 2.1 is release comment out this stuff, * which pre-populates the user bean with info from OpenID provider. - * + * Collection attrsCollect = (Collection)WebloggerFactory.getWeblogger() .getUserManager().userAttributes.get(UserAttribute.Attributes.openidUrl.toString()); if (attrsCollect != null) { ArrayList attrs = new ArrayList(attrsCollect); - for (Iterator it = attrs.iterator(); it.hasNext();) { - OpenIDUserAttribute attr = (OpenIDUserAttribute) it.next(); - if (attr.getName().equals(OpenIDUserAttribute.Attributes.country.toString())) { + for (OpenIDUserAttribute attr : attrs) { + if (attr.getName().equals(OpenIDUserAttribute.Attributes.country.toString())) { getBean().setLocale(UIUtils.getLocale(attr.getValue())); } if (attr.getName().equals(OpenIDUserAttribute.Attributes.email.toString())) { Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java Sun Jan 5 15:32:34 2014 @@ -25,7 +25,6 @@ import java.io.StringReader; import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import javax.swing.text.MutableAttributeSet; @@ -167,7 +166,6 @@ public class LinkbackExtractor SyndFeedInput feedInput = new SyndFeedInput(); SyndFeed feed = feedInput.build( new InputStreamReader(new URL(rssLink).openStream())); - Iterator itemIter = feed.getEntries().iterator(); String feedTitle = feed.getTitle(); int count = 0; @@ -177,10 +175,10 @@ public class LinkbackExtractor mLogger.debug("Feed parsed, title: " + feedTitle); } - while (itemIter.hasNext()) + for (Object objItem : feed.getEntries()) { count++; - SyndEntry item = (SyndEntry) itemIter.next(); + SyndEntry item = (SyndEntry) objItem; if (item.getDescription().getValue().contains(requestURL)) { mFound = true; 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=1555526&r1=1555525&r2=1555526&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 Sun Jan 5 15:32:34 2014 @@ -94,7 +94,7 @@ public final class URLUtilities { public static String getEncodedTagsString(List tags) { StringBuilder tagsString = new StringBuilder(); if(tags != null && tags.size() > 0) { - String tag = null; + String tag; Iterator tagsIT = tags.iterator(); // do first tag Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java Sun Jan 5 15:32:34 2014 @@ -34,7 +34,6 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -113,8 +112,8 @@ public class EntryCollection { rollerEntry = mgr.getWeblogEntry(rollerEntry.getId()); Entry newEntry = createAtomEntry(rollerEntry); - for (Iterator it = newEntry.getOtherLinks().iterator(); it.hasNext();) { - Link link = (Link)it.next(); + for (Object objLink : newEntry.getOtherLinks()) { + Link link = (Link) objLink; if ("edit".equals(link.getRel())) { log.debug("Exiting"); return createAtomEntry(rollerEntry); @@ -171,7 +170,7 @@ public class EntryCollection { if (!RollerAtomHandler.canView(user, website)) { throw new AtomNotAuthorizedException("Not authorized to access website: " + handle); } - List entries = roller.getWeblogEntryManager().getWeblogEntries( + List<WeblogEntry> entries = roller.getWeblogEntryManager().getWeblogEntries( website, // website null, // user null, // startDate @@ -196,13 +195,15 @@ public class EntryCollection { link.setType("text/html"); feed.setAlternateLinks(Collections.singletonList(link)); - List atomEntries = new ArrayList(); + List<Entry> atomEntries = new ArrayList<Entry>(); int count = 0; - for (Iterator iter = entries.iterator(); iter.hasNext() && count < MAX_ENTRIES; count++) { - WeblogEntry rollerEntry = (WeblogEntry)iter.next(); + for (WeblogEntry rollerEntry : entries) { + if (count++ >= MAX_ENTRIES) { + break; + } Entry entry = createAtomEntry(rollerEntry); atomEntries.add(entry); - if (count == 0) { + if (count == 1) { // first entry is most recent feed.setUpdated(entry.getUpdated()); } @@ -344,7 +345,7 @@ public class EntryCollection { atomEntry.setAuthors( Collections.singletonList(author)); // Add Atom category for Weblogger category, using category scheme - List categories = new ArrayList(); + List<Category> categories = new ArrayList<Category>(); Category atomCat = new Category(); atomCat.setScheme(RollerAtomService.getWeblogCategoryScheme(entry.getWebsite())); atomCat.setTerm(entry.getCategory().getPath().substring(1)); @@ -353,8 +354,7 @@ public class EntryCollection { // Add Atom categories for each Weblogger tag with null scheme Set<WeblogEntryTag> tmp = new TreeSet<WeblogEntryTag>(new WeblogEntryTagComparator()); tmp.addAll(entry.getTags()); - for (Iterator tagit = tmp.iterator(); tagit.hasNext();) { - WeblogEntryTag tag = (WeblogEntryTag) tagit.next(); + for (WeblogEntryTag tag : tmp) { Category newcat = new Category(); newcat.setTerm(tag.getName()); categories.add(newcat); Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java Sun Jan 5 15:32:34 2014 @@ -38,7 +38,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.SortedSet; @@ -157,8 +156,8 @@ public class MediaCollection { MediaFile stored = fileMgr.getMediaFile(mf.getId()); Entry mediaEntry = createAtomResourceEntry(website, stored); - for (Iterator it = mediaEntry.getOtherLinks().iterator(); it.hasNext();) { - Link link = (Link)it.next(); + for (Object objLink : mediaEntry.getOtherLinks()) { + Link link = (Link) objLink; if ("edit".equals(link.getRel())) { log.debug("Exiting"); return mediaEntry; Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Sun Jan 5 15:32:34 2014 @@ -19,7 +19,6 @@ package org.apache.roller.weblogger.webservices.atomprotocol; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -55,7 +54,7 @@ public class RollerAtomService extends A */ public RollerAtomService(User user, String atomURL) throws WebloggerException, AtomException { Weblogger roller = WebloggerFactory.getWeblogger(); - List perms = null; + List<WeblogPermission> perms; if (!WebloggerRuntimeConfig.getBooleanProperty("webservices.enableAtomPub")) { throw new AtomException("AtomPub not enabled for this Roller installation"); @@ -73,10 +72,9 @@ public class RollerAtomService extends A throw new AtomException("Getting site's accept range", re); } if (perms != null) { - for (Iterator iter = perms.iterator(); iter.hasNext();) { - WeblogPermission perm = (WeblogPermission) iter.next(); + for (WeblogPermission perm : perms) { Weblog weblog = perm.getWeblog(); - Workspace workspace = null; + Workspace workspace; try { // Create workspace to represent weblog @@ -93,9 +91,8 @@ public class RollerAtomService extends A Categories cats = new Categories(); cats.setFixed(true); cats.setScheme(getWeblogCategoryScheme(weblog)); - List rollerCats = roller.getWeblogEntryManager().getWeblogCategories(weblog, false); - for (Iterator it = rollerCats.iterator(); it.hasNext();) { - WeblogCategory rollerCat = (WeblogCategory) it.next(); + List<WeblogCategory> rollerCats = roller.getWeblogEntryManager().getWeblogCategories(weblog, false); + for (WeblogCategory rollerCat : rollerCats) { Category cat = new Category(); cat.setTerm(rollerCat.getPath().substring(1)); cat.setLabel(rollerCat.getName()); Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Sun Jan 5 15:32:34 2014 @@ -19,10 +19,8 @@ package org.apache.roller.weblogger.webservices.xmlrpc; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.StringTokenizer; @@ -121,7 +119,7 @@ public class BloggerAPIHandler extends B * @param blogid Unique identifier of the blog the post will be added to * @param userid Login for a Blogger user who has permission to post to the blog * @param password Password for said username - * @param template The text for the new template (usually mostly HTML). + * @param templateData The text for the new template (usually mostly HTML). * @param templateType Determines which of the blog's templates is to be set. * @return * @throws XmlRpcException @@ -279,11 +277,8 @@ public class BloggerAPIHandler extends B User user = umgr.getUserByUserName(userid); // get list of user's enabled websites - List websites = WebloggerFactory.getWeblogger().getWeblogManager().getUserWeblogs(user, true); - Iterator iter = websites.iterator(); - while (iter.hasNext()) { - Weblog website = (Weblog)iter.next(); - + List<Weblog> websites = WebloggerFactory.getWeblogger().getWeblogManager().getUserWeblogs(user, true); + for (Weblog website : websites) { // only include weblog's that have client API support enabled if (Boolean.TRUE.equals(website.getEnableBloggerApi())) { Hashtable blog = new Hashtable(3); @@ -467,20 +462,16 @@ public class BloggerAPIHandler extends B Weblogger roller = WebloggerFactory.getWeblogger(); WeblogEntryManager weblogMgr = roller.getWeblogEntryManager(); if (website != null) { - Map entries = weblogMgr.getWeblogEntryObjectMap( + Map<Date, List<WeblogEntry>> entries = weblogMgr.getWeblogEntryObjectMap( website, // website null, // startDate new Date(), // endDate null, // catName null, // tags null, null, 0, -1); - - Iterator iter = entries.values().iterator(); - while (iter.hasNext()) { - ArrayList list = (ArrayList) iter.next(); - Iterator i = list.iterator(); - while (i.hasNext()) { - WeblogEntry entry = (WeblogEntry) i.next(); + + for (List<WeblogEntry> weList : entries.values()) { + for (WeblogEntry entry : weList) { Hashtable result = new Hashtable(); if (entry.getPubTime() != null) { result.put("dateCreated", entry.getPubTime()); Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Sun Jan 5 15:32:34 2014 @@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream; import java.sql.Timestamp; import java.util.Date; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -85,9 +84,8 @@ public class MetaWeblogAPIHandler extend try { Hashtable result = new Hashtable(); WeblogEntryManager weblogMgr = roller.getWeblogEntryManager(); - List cats = weblogMgr.getWeblogCategories(website, false); - for (Iterator wbcItr = cats.iterator(); wbcItr.hasNext();) { - WeblogCategory category = (WeblogCategory) wbcItr.next(); + List<WeblogCategory> cats = weblogMgr.getWeblogCategories(website, false); + for (WeblogCategory category : cats) { result.put(category.getPath(), createCategoryStruct(category, userid)); } @@ -437,7 +435,7 @@ public class MetaWeblogAPIHandler extend Weblogger roller = WebloggerFactory.getWeblogger(); WeblogEntryManager weblogMgr = roller.getWeblogEntryManager(); if (website != null) { - List entries = weblogMgr.getWeblogEntries( + List<WeblogEntry> entries = weblogMgr.getWeblogEntries( website, // website null, null, // startDate @@ -451,9 +449,7 @@ public class MetaWeblogAPIHandler extend null, 0, numposts); - Iterator iter = entries.iterator(); - while (iter.hasNext()) { - WeblogEntry entry = (WeblogEntry)iter.next(); + for (WeblogEntry entry : entries) { results.addElement(createPostStruct(entry, userid)); } } Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?rev=1555526&r1=1555525&r2=1555526&view=diff ============================================================================== --- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java (original) +++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java Sun Jan 5 15:32:34 2014 @@ -125,7 +125,7 @@ public class FolderFunctionalityTest ext assertTrue(folders.contains(f2)); // find cat2 - folder = (WeblogBookmarkFolder) folders.iterator().next(); + folder = folders.iterator().next(); // walk third level folders = folder.getFolders(); @@ -133,7 +133,7 @@ public class FolderFunctionalityTest ext assertTrue(folders.contains(f3)); // find cat3 - folder = (WeblogBookmarkFolder) folders.iterator().next(); + folder = folders.iterator().next(); // make sure this is the end of the tree folders = folder.getFolders();
