This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit ba2a6ce3d3d908822231db7cfede4153395a0e33 Author: Michael Bien <[email protected]> AuthorDate: Thu Jul 8 09:19:32 2021 +0200 Pagers: type compiler warning fixes and collection improvements. --- .../ui/rendering/pagers/AbstractPager.java | 14 ++---- .../pagers/AbstractWeblogEntriesPager.java | 51 ++++++++++------------ .../ui/rendering/pagers/CommentsPager.java | 4 +- .../ui/rendering/pagers/MediaFilesPager.java | 4 +- .../weblogger/ui/rendering/pagers/Pager.java | 4 +- .../ui/rendering/pagers/PlanetEntriesPager.java | 4 +- .../rendering/pagers/SearchResultsFeedPager.java | 23 +++++----- .../ui/rendering/pagers/SearchResultsPager.java | 28 ++++++------ .../weblogger/ui/rendering/pagers/UsersPager.java | 17 +++----- .../ui/rendering/pagers/WeblogEntriesDayPager.java | 4 +- .../rendering/pagers/WeblogEntriesLatestPager.java | 4 +- .../rendering/pagers/WeblogEntriesListPager.java | 4 +- .../rendering/pagers/WeblogEntriesMonthPager.java | 4 +- .../ui/rendering/pagers/WeblogEntriesPager.java | 5 ++- .../pagers/WeblogEntriesPermalinkPager.java | 15 +++---- .../pagers/WeblogEntriesPreviewPager.java | 12 +++-- .../ui/rendering/pagers/WeblogsPager.java | 13 ++---- 17 files changed, 90 insertions(+), 120 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractPager.java index 6129dda..16b9000 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractPager.java @@ -18,7 +18,6 @@ package org.apache.roller.weblogger.ui.rendering.pagers; -import java.util.HashMap; import java.util.Map; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.util.URLUtilities; @@ -27,7 +26,7 @@ import org.apache.roller.weblogger.util.URLUtilities; /** * Abstract base for simple pagers. */ -public abstract class AbstractPager implements Pager { +public abstract class AbstractPager<T> implements Pager<T> { final URLStrategy urlStrategy; private String url = null; @@ -60,9 +59,7 @@ public abstract class AbstractPager implements Pager { public String getNextLink() { if(hasMoreItems()) { int nextPage = page + 1; - Map params = new HashMap(); - params.put("page", ""+nextPage); - return createURL(url, params); + return createURL(url, Map.of("page", ""+nextPage)); } return null; } @@ -81,9 +78,7 @@ public abstract class AbstractPager implements Pager { public String getPrevLink() { if (page > 0) { int prevPage = page - 1; - Map params = new HashMap(); - params.put("page", ""+prevPage); - return createURL(url, params); + return createURL(url, Map.of("page", ""+prevPage)); } return null; } @@ -103,8 +98,7 @@ public abstract class AbstractPager implements Pager { } - protected String createURL(String url, Map params) { - + protected String createURL(String url, Map<String, String> params) { return url + URLUtilities.getQueryString(params); } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java index e350506..7c37659 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java @@ -20,8 +20,8 @@ package org.apache.roller.weblogger.ui.rendering.pagers; import java.text.ParsePosition; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; @@ -42,21 +42,23 @@ import org.apache.roller.weblogger.util.I18nMessages; public abstract class AbstractWeblogEntriesPager implements WeblogEntriesPager { // message utils for doing i18n messages - I18nMessages messageUtils = null; + final I18nMessages messageUtils; // url strategy for building urls - URLStrategy urlStrategy = null; + final URLStrategy urlStrategy; - Weblog weblog = null; - String locale = null; - String pageLink = null; - String entryAnchor = null; - String dateString = null; - String catName = null; - List tags = new ArrayList(); - int offset = 0; - int page = 0; - int length = 0; + final Weblog weblog; + final String locale; + final String pageLink; + final String entryAnchor; + final String dateString; + final String catName; + + final int offset; + final int page; + final int length; + + final List<String> tags; public AbstractWeblogEntriesPager( @@ -67,7 +69,7 @@ public abstract class AbstractWeblogEntriesPager implements WeblogEntriesPager { String entryAnchor, String dateString, String catName, - List tags, + List<String> tags, int page) { this.urlStrategy = strat; @@ -79,20 +81,13 @@ public abstract class AbstractWeblogEntriesPager implements WeblogEntriesPager { this.dateString = dateString; this.catName = catName; - if (tags != null) { - this.tags = tags; - } + this.tags = tags != null ? tags : Collections.emptyList(); // make sure offset, length, and page are valid int maxLength = WebloggerRuntimeConfig.getIntProperty("site.pages.maxEntries"); - length = weblog.getEntryDisplayCount(); - if(length > maxLength) { - length = maxLength; - } + this.length = Math.min(weblog.getEntryDisplayCount(), maxLength); - if(page > 0) { - this.page = page; - } + this.page = Math.max(0, page); this.offset = length * page; // get a message utils instance to handle i18n of messages @@ -231,9 +226,7 @@ public abstract class AbstractWeblogEntriesPager implements WeblogEntriesPager { * Return today based on current blog's timezone/locale. */ protected Date getToday() { - Calendar todayCal = Calendar.getInstance(); - todayCal = Calendar.getInstance( - weblog.getTimeZoneInstance(), weblog.getLocaleInstance()); + Calendar todayCal = Calendar.getInstance(weblog.getTimeZoneInstance(), weblog.getLocaleInstance()); todayCal.setTime(new Date()); return todayCal.getTime(); } @@ -246,13 +239,13 @@ public abstract class AbstractWeblogEntriesPager implements WeblogEntriesPager { protected String createURL( int page, int pageAdd, - Weblog website, + Weblog website, String locale, String pageLink, String entryAnchor, String dateString, String catName, - List tags) { + List<String> tags) { int pageNum = page + pageAdd; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java index eff70c9..3c4793a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java @@ -39,9 +39,9 @@ import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper; /** * Paging through a collection of comments. */ -public class CommentsPager extends AbstractPager { +public class CommentsPager extends AbstractPager<WeblogEntryCommentWrapper> { - private static Log log = LogFactory.getLog(CommentsPager.class); + private static final Log log = LogFactory.getLog(CommentsPager.class); private Weblog weblog = null; private int sinceDays = -1; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java index b16a27d..06f124d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java @@ -34,9 +34,9 @@ import org.apache.roller.weblogger.pojos.MediaFile; /** * Paging through a collection of media files. */ -public class MediaFilesPager extends AbstractPager { +public class MediaFilesPager extends AbstractPager<MediaFile> { - private static Log log = LogFactory.getLog(MediaFilesPager.class); + private static final Log log = LogFactory.getLog(MediaFilesPager.class); private int length = 0; // the collection for the pager diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/Pager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/Pager.java index 7977de1..21c954c 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/Pager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/Pager.java @@ -23,7 +23,7 @@ import java.util.List; /** * Common pager interface. */ -public interface Pager { +public interface Pager <T> { /** * Link value for returning to pager home */ @@ -57,6 +57,6 @@ public interface Pager { /** * Get current list of items available from the pager. */ - List getItems(); + List<T> getItems(); } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java index 61e50ed..dda26fc 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java @@ -36,9 +36,9 @@ import org.apache.roller.weblogger.business.WebloggerFactory; /** * Paging through a collection of planet entries. */ -public class PlanetEntriesPager extends AbstractPager { +public class PlanetEntriesPager extends AbstractPager<SubscriptionEntry> { - private static Log log = LogFactory.getLog(PlanetEntriesPager.class); + private static final Log log = LogFactory.getLog(PlanetEntriesPager.class); private String feedURL = null; private String groupHandle = null; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java index 0ec2c7e..c2ff969 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java @@ -24,6 +24,7 @@ import java.util.Locale; import java.util.Map; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.pojos.Weblog; +import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper; import org.apache.roller.weblogger.ui.rendering.util.WeblogFeedRequest; import org.apache.roller.weblogger.util.I18nMessages; import org.apache.roller.weblogger.util.URLUtilities; @@ -32,23 +33,23 @@ import org.apache.roller.weblogger.util.URLUtilities; /** * Pager for navigating through search results feeds. */ -public class SearchResultsFeedPager extends AbstractPager { +public class SearchResultsFeedPager extends AbstractPager<WeblogEntryWrapper> { // message utils for doing i18n messages I18nMessages messageUtils = null; - private List entries = null; + private final List<WeblogEntryWrapper> entries; - private Weblog weblog = null; - private boolean moreResults = false; + private final Weblog weblog; + private final boolean moreResults; - private WeblogFeedRequest feedRequest = null; + private final WeblogFeedRequest feedRequest; - private String url = null; + private final String url; public SearchResultsFeedPager(URLStrategy strat, String baseUrl, int pageNum, - WeblogFeedRequest feedRequest, List entries, boolean more) { + WeblogFeedRequest feedRequest, List<WeblogEntryWrapper> entries, boolean more) { super(strat, baseUrl, pageNum); @@ -81,7 +82,7 @@ public class SearchResultsFeedPager extends AbstractPager { } @Override - public List getItems() { + public List<WeblogEntryWrapper> getItems() { return this.entries; } @@ -101,7 +102,7 @@ public class SearchResultsFeedPager extends AbstractPager { } @Override - protected String createURL(String url, Map params) { + protected String createURL(String url, Map<String, String> params) { String category = feedRequest.getWeblogCategoryName(); if(category != null && !category.isBlank()) { params.put("cat", URLUtilities.encode(category)); @@ -110,7 +111,7 @@ public class SearchResultsFeedPager extends AbstractPager { if(term != null && !term.isBlank()) { params.put("q", URLUtilities.encode(term.trim())); } - List tags = feedRequest.getTags(); + List<String> tags = feedRequest.getTags(); if(tags != null && !tags.isEmpty()) { params.put("tags", URLUtilities.getEncodedTagsString(tags)); } @@ -122,6 +123,6 @@ public class SearchResultsFeedPager extends AbstractPager { @Override public String getUrl() { - return createURL(url, new HashMap()); + return createURL(url, new HashMap<>()); } } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java index 0321988..c063c56 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java @@ -18,10 +18,13 @@ package org.apache.roller.weblogger.ui.rendering.pagers; +import java.util.Date; import java.util.Locale; import java.util.Map; +import java.util.Set; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.pojos.Weblog; +import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper; import org.apache.roller.weblogger.ui.rendering.util.WeblogSearchRequest; import org.apache.roller.weblogger.util.I18nMessages; @@ -31,24 +34,21 @@ import org.apache.roller.weblogger.util.I18nMessages; public class SearchResultsPager implements WeblogEntriesPager { // message utils for doing i18n messages - I18nMessages messageUtils = null; + final I18nMessages messageUtils; // url strategy - URLStrategy urlStrategy = null; + final URLStrategy urlStrategy; - private Map entries = null; + private final Map<Date, Set<WeblogEntryWrapper>> entries; - private Weblog weblog = null; - private String locale = null; - private String query = null; - private String category = null; - private int page = 0; - private boolean moreResults = false; + private final Weblog weblog; + private final String locale; + private final String query; + private final String category; + private final int page; + private final boolean moreResults; - - public SearchResultsPager() {} - - public SearchResultsPager(URLStrategy strat, WeblogSearchRequest searchRequest, Map entries, boolean more) { + public SearchResultsPager(URLStrategy strat, WeblogSearchRequest searchRequest, Map<Date, Set<WeblogEntryWrapper>> entries, boolean more) { // url strategy for building urls this.urlStrategy = strat; @@ -83,7 +83,7 @@ public class SearchResultsPager implements WeblogEntriesPager { @Override - public Map getEntries() { + public Map<Date, Set<WeblogEntryWrapper>> getEntries() { return entries; } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java index 335f175..ffb1c0f 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java @@ -19,7 +19,6 @@ package org.apache.roller.weblogger.ui.rendering.pagers; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; @@ -35,12 +34,12 @@ import org.apache.roller.weblogger.pojos.wrapper.UserWrapper; /** * Paging through a collection of users. */ -public class UsersPager extends AbstractPager { +public class UsersPager extends AbstractPager<UserWrapper> { - private static Log log = LogFactory.getLog(UsersPager.class); + private final static Log log = LogFactory.getLog(UsersPager.class); private String letter = null; - private int length = 0; + private final int length; // collection for the pager private List<UserWrapper> users; @@ -91,10 +90,7 @@ public class UsersPager extends AbstractPager { if(letter != null) { int page = getPage() + 1; if(hasMoreItems()) { - Map params = new HashMap(); - params.put("page", ""+page); - params.put("letter", letter); - return createURL(getUrl(), params); + return createURL(getUrl(), Map.of("page", ""+page, "letter", letter)); } return null; } else { @@ -109,10 +105,7 @@ public class UsersPager extends AbstractPager { if(letter != null) { int page = getPage() - 1; if (page >= 0) { - Map params = new HashMap(); - params.put("page", ""+page); - params.put("letter", letter); - return createURL(getUrl(), params); + return createURL(getUrl(), Map.of("page", ""+page, "letter", letter)); } return null; } else { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java index c841a68..a423be0 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java @@ -43,7 +43,7 @@ import org.apache.roller.weblogger.business.URLStrategy; */ public class WeblogEntriesDayPager extends AbstractWeblogEntriesPager { - private static Log log = LogFactory.getLog(WeblogEntriesDayPager.class); + private static final Log log = LogFactory.getLog(WeblogEntriesDayPager.class); private SimpleDateFormat dayFormat = new SimpleDateFormat(); @@ -66,7 +66,7 @@ public class WeblogEntriesDayPager extends AbstractWeblogEntriesPager { String entryAnchor, String dateString, String catName, - List tags, + List<String> tags, int page) { super(strat, weblog, locale, pageLink, entryAnchor, dateString, catName, tags, page); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java index 8bfb6bb..fce4f5e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java @@ -39,7 +39,7 @@ import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper; */ public class WeblogEntriesLatestPager extends AbstractWeblogEntriesPager { - private static Log log = LogFactory.getLog(WeblogEntriesLatestPager.class); + private static final Log log = LogFactory.getLog(WeblogEntriesLatestPager.class); // collection for the pager private Map<Date, List<WeblogEntryWrapper>> entries = null; @@ -56,7 +56,7 @@ public class WeblogEntriesLatestPager extends AbstractWeblogEntriesPager { String entryAnchor, String dateString, String catName, - List tags, + List<String> tags, int page) { super(strat, weblog, locale, pageLink, entryAnchor, dateString, catName, tags, page); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java index 807129a..8359e69 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java @@ -37,9 +37,9 @@ import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper; /** * Simple pager for list of weblog entries. */ -public class WeblogEntriesListPager extends AbstractPager { +public class WeblogEntriesListPager extends AbstractPager<WeblogEntryWrapper> { - private static Log log = LogFactory.getLog(WeblogEntriesListPager.class); + private static final Log log = LogFactory.getLog(WeblogEntriesListPager.class); private String locale = null; private int sinceDays = -1; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java index da48c99..1606c98 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java @@ -37,7 +37,7 @@ import org.apache.roller.weblogger.business.URLStrategy; */ public class WeblogEntriesMonthPager extends AbstractWeblogEntriesPager { - private static Log log = LogFactory.getLog(WeblogEntriesMonthPager.class); + private static final Log log = LogFactory.getLog(WeblogEntriesMonthPager.class); private SimpleDateFormat monthFormat = new SimpleDateFormat(); @@ -60,7 +60,7 @@ public class WeblogEntriesMonthPager extends AbstractWeblogEntriesPager { String entryAnchor, String dateString, String catName, - List tags, + List<String> tags, int page) { super(strat, weblog, locale, pageLink, entryAnchor, dateString, catName, tags, page); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java index 15eb8b9..b203b4e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java @@ -18,7 +18,10 @@ package org.apache.roller.weblogger.ui.rendering.pagers; +import java.util.Collection; +import java.util.Date; import java.util.Map; +import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper; /** * Pager for weblog entries, handles latest, single-entry, month and day views. @@ -33,7 +36,7 @@ public interface WeblogEntriesPager { * The collection is grouped by days of entries. Each value is a list of * entry objects keyed by the date they were published. */ - Map getEntries(); + Map<Date, ? extends Collection<WeblogEntryWrapper>> getEntries(); /** * Link value for returning to pager home diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java index afdc650..b92e3a4 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java @@ -18,11 +18,9 @@ package org.apache.roller.weblogger.ui.rendering.pagers; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; @@ -42,14 +40,14 @@ import org.apache.roller.weblogger.util.Utilities; */ public class WeblogEntriesPermalinkPager extends AbstractWeblogEntriesPager { - private static Log log = LogFactory.getLog(WeblogEntriesPermalinkPager.class); + private static final Log log = LogFactory.getLog(WeblogEntriesPermalinkPager.class); WeblogEntry currEntry = null; WeblogEntry nextEntry = null; WeblogEntry prevEntry = null; // collection for the pager - Map entries = null; + Map<Date, List<WeblogEntryWrapper>> entries = null; public WeblogEntriesPermalinkPager( @@ -60,7 +58,7 @@ public class WeblogEntriesPermalinkPager extends AbstractWeblogEntriesPager { String entryAnchor, String dateString, String catName, - List tags, + List<String> tags, int page) { super(strat, weblog, locale, pageLink, entryAnchor, dateString, catName, tags, page); @@ -70,22 +68,19 @@ public class WeblogEntriesPermalinkPager extends AbstractWeblogEntriesPager { @Override - public Map getEntries() { + public Map<Date, List<WeblogEntryWrapper>> getEntries() { if (entries == null) { try { Weblogger roller = WebloggerFactory.getWeblogger(); WeblogEntryManager wmgr = roller.getWeblogEntryManager(); currEntry = wmgr.getWeblogEntryByAnchor(weblog, entryAnchor); if (currEntry != null && currEntry.getStatus().equals(PubStatus.PUBLISHED)) { - entries = new TreeMap(); - entries.put(new Date(currEntry.getPubTime().getTime()),Collections.singletonList(WeblogEntryWrapper.wrap(currEntry, urlStrategy))); + entries = Map.of(new Date(currEntry.getPubTime().getTime()), List.of(WeblogEntryWrapper.wrap(currEntry, urlStrategy))); } } catch (Exception e) { log.error("ERROR: fetching entry"); } } - - return entries; } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java index 118430d..d887fb7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java @@ -19,10 +19,9 @@ package org.apache.roller.weblogger.ui.rendering.pagers; import java.sql.Timestamp; -import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; -import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.business.URLStrategy; @@ -43,7 +42,7 @@ import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper; */ public class WeblogEntriesPreviewPager extends WeblogEntriesPermalinkPager { - private static Log log = LogFactory.getLog(WeblogEntriesPreviewPager.class); + private static final Log log = LogFactory.getLog(WeblogEntriesPreviewPager.class); public WeblogEntriesPreviewPager( @@ -54,7 +53,7 @@ public class WeblogEntriesPreviewPager extends WeblogEntriesPermalinkPager { String entryAnchor, String dateString, String catName, - List tags, + List<String> tags, int page) { super(strat, weblog, locale, pageLink, entryAnchor, dateString, catName, tags, page); @@ -62,7 +61,7 @@ public class WeblogEntriesPreviewPager extends WeblogEntriesPermalinkPager { @Override - public Map getEntries() { + public Map<Date, List<WeblogEntryWrapper>> getEntries() { if (entries == null) { try { Weblogger roller = WebloggerFactory.getWeblogger(); @@ -80,8 +79,7 @@ public class WeblogEntriesPreviewPager extends WeblogEntriesPermalinkPager { } // store the entry in the collection - entries = new TreeMap(); - entries.put(tmpEntry.getPubTime(),Collections.singletonList(WeblogEntryWrapper.wrap(tmpEntry, urlStrategy))); + entries = Map.of(tmpEntry.getPubTime(), List.of(WeblogEntryWrapper.wrap(tmpEntry, urlStrategy))); } } catch (Exception e) { log.error("ERROR: fetching entry", e); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java index cb5423d..3c1b7a8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java @@ -21,7 +21,6 @@ package org.apache.roller.weblogger.ui.rendering.pagers; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; @@ -37,7 +36,7 @@ import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper; /** * Paging through a collection of weblogs. */ -public class WeblogsPager extends AbstractPager { +public class WeblogsPager extends AbstractPager<WeblogWrapper> { private static Log log = LogFactory.getLog(WeblogsPager.class); @@ -96,10 +95,7 @@ public class WeblogsPager extends AbstractPager { if(letter != null) { int page = getPage() + 1; if(hasMoreItems()) { - Map<String, String> params = new HashMap<>(); - params.put("page", ""+page); - params.put("letter", letter); - return createURL(getUrl(), params); + return createURL(getUrl(), Map.of("page", ""+page, "letter", letter)); } return null; } else { @@ -114,10 +110,7 @@ public class WeblogsPager extends AbstractPager { if(letter != null) { int page = getPage() - 1; if (page >= 0) { - Map<String, String> params = new HashMap<>(); - params.put("page", ""+page); - params.put("letter", letter); - return createURL(getUrl(), params); + return createURL(getUrl(), Map.of("page", ""+page, "letter", letter)); } return null; } else {
