This is an automated email from the ASF dual-hosted git repository. mraible pushed a commit to branch roller-6.1.x in repository https://gitbox.apache.org/repos/asf/roller.git
commit 62a6d2aa4a1bd72710234166055c92d4a16c7e8b Merge: a76d47bfb d6cd5cf3e Author: Matt Raible <[email protected]> AuthorDate: Thu Nov 19 17:52:39 2026 -0700 Merge pull request #325 from apache/feed-cache-page-key-6.1.x Include the page number in feed cache keys and limit page numbers .../ui/rendering/pagers/AbstractPager.java | 27 +++- .../pagers/AbstractWeblogEntriesPager.java | 14 +- .../ui/rendering/pagers/SearchResultsPager.java | 3 +- .../weblogger/ui/rendering/pagers/UsersPager.java | 2 +- .../ui/rendering/pagers/WeblogEntriesDayPager.java | 2 +- .../rendering/pagers/WeblogEntriesMonthPager.java | 2 +- .../ui/rendering/pagers/WeblogsPager.java | 2 +- .../ui/rendering/servlets/PageServlet.java | 6 +- .../ui/rendering/util/WeblogFeedRequest.java | 8 +- .../ui/rendering/util/WeblogPageRequest.java | 12 +- .../weblogger/ui/rendering/util/WeblogRequest.java | 28 +++- .../ui/rendering/util/WeblogSearchRequest.java | 9 +- .../ui/rendering/util/cache/SiteWideCache.java | 16 ++- .../ui/rendering/util/cache/WeblogFeedCache.java | 17 ++- .../webservices/tagdata/TagDataServlet.java | 25 ++-- app/src/main/webapp/WEB-INF/velocity/feeds.vm | 2 +- .../rendering/pagers/FeedPagerLinkParamsTest.java | 141 ++++++++++++++++++++ .../rendering/pagers/PagerNextLinkLimitTest.java | 127 ++++++++++++++++++ .../rendering/servlets/PageServletCacheTest.java | 127 ++++++++++++++++++ .../ui/rendering/util/PageParameterTest.java | 112 ++++++++++++++++ .../util/cache/WeblogFeedCacheKeyTest.java | 111 ++++++++++++++++ .../tagdata/TagDataServletPageTest.java | 147 +++++++++++++++++++++ 22 files changed, 879 insertions(+), 61 deletions(-) diff --cc app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java index 05055fce8,87f8a102e..d43cca444 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java @@@ -146,13 -157,12 +157,12 @@@ public class TagDataServlet extends Htt response.setContentType("application/json; charset=utf-8"); PrintWriter pw = response.getWriter(); pw.println("{ \"prefix\": \"" + (prefix == null ? "" : StringEscapeUtils.escapeJson(prefix)) + "\","); - pw.println(" \"weblog\": \"" + (!siteWide ? weblog.getHandle() : "") + "\","); + pw.println(" \"weblog\": \"" + (!siteWide ? StringEscapeUtils.escapeJson(weblog.getHandle()) : "") + "\","); pw.println(" \"tagcounts\": [" ); - int count = 0; - for (Iterator<TagStat> it = tags.iterator(); it.hasNext();) { + for (Iterator<TagStat> it = pageTags.iterator(); it.hasNext();) { TagStat stat = it.next(); pw.print(" { \"tag\" : \""); - pw.print(stat.getName()); + pw.print(StringEscapeUtils.escapeJson(stat.getName())); pw.print("\", "); pw.print("\"count\" : "); pw.print(stat.getCount()); @@@ -185,14 -191,10 +191,11 @@@ Collections.singletonList(stat.getName()), 0, true); int frequency = stat.getCount(); - pw.print("<atom:category term=\"" + term + "\" tagdata:frequency=\"" + frequency + "\" "); + pw.print("<atom:category term=\"" + StringEscapeUtils.escapeXml10(term) + + "\" tagdata:frequency=\"" + frequency + "\" "); pw.println("tagdata:href=\"" + StringEscapeUtils.escapeXml10(viewURI) + "\" />"); - if (count++ > MAX) { - break; - } } - if (tags.size() > MAX) { + if (tags.size() > MAX && page < WeblogRequest.MAX_PAGE_NUM) { // get next URI, if site-wide then don't specify weblog String nextURI = urlstrat.getWeblogTagsJsonURL(weblog, true, page + 1); pw.println("<atom:link rel=\"next\" href=\"" + StringEscapeUtils.escapeXml10(nextURI) + "\" />");
