I finally got back to this!
\nStuff to merge for SAK-11544
\nI took a copy of the 2-5-x code and reapplied the mods to that code and tested it. I attach the file that should slide right into 2-5-x.
\nsearch-impl\/impl\/src\/java\/org\/sakaiproject\/search\/component\/adapter\/message\/MessageContentProducer.java
\nActually most of the differences were in formatting – someone had checked out the code – made a small mod but reformatted the code w.r.t. line ends and checked it back in. So it looks like there are lots of differences – it was not a refactor – just a reformat :)
\nThis code should go in and make pretty diffs.<\/p>\n
\n$ svn diff
\nIndex: search-impl\/impl\/src\/java\/org\/sakaiproject\/search\/component\/adapter\/message\/MessageContentProducer.java
\n===================================================================
\n— search-impl\/impl\/src\/java\/org\/sakaiproject\/search\/component\/adapter\/message\/MessageContentProducer.java\t(revision 45952)
\n+++ search-impl\/impl\/src\/java\/org\/sakaiproject\/search\/component\/adapter\/message\/MessageContentProducer.java\t(working copy)
\n@@ -49,6 +49,7 @@
\nimport org.sakaiproject.search.component.Messages;
\nimport org.sakaiproject.search.model.SearchBuilderItem;
\nimport org.sakaiproject.search.util.HTMLParser;
\n+import org.sakaiproject.javax.PagingPosition;
\n\/**
\n* @author ieb
\n@@ -499,17 +500,22 @@
\nfinal Iterator ci = l.iterator();
\nreturn new Iterator()
\n{
\n–\t\t\tIterator mi = null;
\n+\t\t\tMessageChannel mc = null;
\n+\t\t\tint messageCount = -1;
\n+\t\t\tint nextMessage = -1; \/\/ Index overall messages – Starts at 1
\n+\t\t\tList messages = null;
\n+\t\t\tint listPos = 0; \/\/ Index each chunk – Starts at zero
\n+\t\t\tint chunkSize = 100; \/\/ Retrieve 100 at a time
\npublic boolean hasNext()
\n{
\n–\t\t\t\tif (mi == null)
\n+\t\t\t\tif (mc == null)
\n{
\nreturn nextIterator();
\n}
\nelse
\n{
\n–\t\t\t\t\tif (mi.hasNext())
\n+\t\t\t\t\tif (messageCount > 1 && nextMessage <= messageCount)
\n{
\nreturn true;
\n}
\n@@ -528,13 +534,12 @@
\nString chanellId = (String) ci.next();
\ntry
\n{
\n–\t\t\t\t\t\tMessageChannel c = messageService
\n–\t\t\t\t\t\t\t\t.getChannel(messageService.channelReference(
\n–\t\t\t\t\t\t\t\t\t\tcontext, chanellId));
\n–\t\t\t\t\t\tList messages = c.getMessages(null, true);
\n–\t\t\t\t\t\tmi = messages.iterator();
\n–\t\t\t\t\t\tif (mi.hasNext())
\n+\t\t\t\t\t\tmc = messageService.getChannel(messageService
\n+\t\t\t\t\t\t\t\t.channelReference(context, chanellId));
\n+\t\t\t\t\t\tmessageCount = mc.getCount();
\n+\t\t\t\t\t\tif (messageCount > 0 )
\n{
\n+\t\t\t\t\t\t\tnextMessage = 1; \/\/ Pager starts at 1
\nreturn true;
\n}
\n}
\n@@ -542,22 +547,56 @@
\n{
\nex.printStackTrace();
\nlog.warn(“Failed to get channel ” + chanellId); \/\/$NON-NLS-1$
\n–
\n}
\n}
\n+\t\t\t\tmc = null;
\n+\t\t\t\tnextMessage = -1;
\n+\t\t\t\tmessageCount = -1;
\nreturn false;
\n}
\n+\t\t\t\/*
\n+\t\t\t * Loop though the messages in the channel grabbing them
\n+\t\t\t * in chunkSize chunks for efficiency.
\n+\t\t\t *\/
\npublic Object next()
\n{
\n–\t\t\t\tMessage m = (Message) mi.next();
\n–\t\t\t\treturn m.getReference();
\n+\t\t\t\tif ( messages != null && listPos >= 0 && listPos < messages.size() )
\n+\t\t\t\t{
\n+\t\t\t\t\tMessage m = (Message) messages.get(listPos);
\n+\t\t\t\t\tnextMessage = nextMessage + 1;
\n+\t\t\t\t\tlistPos = listPos + 1;
\n+\t\t\t\t\treturn m.getReference();
\n+\t\t\t\t}
\n+
\n+\t\t\t\t\/\/ Retrieve the next “chunk”
\n+\t\t\t\tPagingPosition pages = new PagingPosition(nextMessage, (nextMessage + chunkSize – 1));
\n+\t\t\t\ttry
\n+\t\t\t\t{
\n+\t\t\t\t\tmessages = mc.getMessages(null, true, pages);
\n+\t\t\t\t\tif ( messages != null && messages.size() > 0 )
\n+\t\t\t\t\t{
\n+\t\t\t\t\t\tlistPos = 0;
\n+\t\t\t\t\t\tMessage m = (Message) messages.get(listPos);
\n+\t\t\t\t\t\tnextMessage = nextMessage + 1;
\n+\t\t\t\t\t\tlistPos = listPos + 1;
\n+\t\t\t\t\t\treturn m.getReference();
\n+\t\t\t\t\t}
\n+\t\t\t\t}
\n+\t\t\t\tcatch (Exception ex)
\n+\t\t\t\t{
\n+\t\t\t\t\tex.printStackTrace();
\n+\t\t\t\t\tlog.warn(“Failed to get message ” + nextMessage); \/\/$NON-NLS-1$
\n+
\n+\t\t\t\t}
\n+\t\t\t\t\/\/ We are done looping through this channel
\n+\t\t\t\tnextMessage = messageCount + 1;
\n+\t\t\t\treturn null;
\n}
\npublic void remove()
\n{
\n–\t\t\t\tthrow new UnsupportedOperationException(
\n–\t\t\t\t\t\t“Remove not implemented”); \/\/$NON-NLS-1$
\n+\t\t\t\tthrow new UnsupportedOperationException(“Remove not implemented”); \/\/$NON-NLS-1$
\n}
\n};<\/p>\n","protected":false},"excerpt":{"rendered":"
I finally got back to this! Stuff to merge for SAK-11544 I took a copy of the 2-5-x code and reapplied the mods to that code and tested it. I attach the file that should slide right into 2-5-x. search-impl\/impl\/src\/java\/org\/sakaiproject\/search\/component\/adapter\/message\/MessageContentProducer.java Actually most of the differences were in formatting – someone had checked out the code […]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-468","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts\/468","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/comments?post=468"}],"version-history":[{"count":2,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts\/468\/revisions"}],"predecessor-version":[{"id":2575,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts\/468\/revisions\/2575"}],"wp:attachment":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/media?parent=468"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/categories?post=468"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/tags?post=468"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}