[jspwiki] branch master updated: fix compilation errors introduced by #240

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b1d9eaaa fix compilation errors introduced by #240
7b1d9eaaa is described below

commit 7b1d9eaaacd747d78482a2bd7d94784cc7443cb0
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Apr 28 23:02:07 2023 +0200

    fix compilation errors introduced by #240
---
 .../src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java | 2 +-
 .../src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
index 026237427..62fad8eb5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
@@ -518,7 +518,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
      * @return the text nodes that are immediate children of the base element, concatenated together
      */
     private String extractText( final Element element ) {
-        final String text = "";
+        String text = "";
         if( element.getChildNodes().getLength() > 0 ) {
             final NodeList children = element.getChildNodes();
             text = IntStream.range(0, children.getLength()).mapToObj(children::item).filter(child -> child.getNodeType() == Node.TEXT_NODE).map(child -> ((Text) child).getData()).collect(Collectors.joining());
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
index 28dbfbff4..ec7f88c05 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
@@ -33,7 +33,6 @@ import java.util.Date;
 import java.util.Hashtable;
 import java.util.Set;
 import java.util.Vector;
-import java.util.stream.Collectors;
 
 /**
  *  Provides definitions for RPC handler routines.
@@ -73,7 +72,7 @@ public abstract class AbstractRPCHandler implements WikiRPCHandler {
     public Vector getRecentChanges( final Date since ) {
         checkPermission( PagePermission.VIEW );
         final Set< Page > pages = m_engine.getManager( PageManager.class ).getRecentChanges();
-        final Vector< Hashtable< ?, ? > > result;
+        final Vector< Hashtable< ?, ? > > result = new Vector<>();
 
         // Transform UTC into local time.
         final Calendar cal = Calendar.getInstance();
@@ -81,7 +80,11 @@ public abstract class AbstractRPCHandler implements WikiRPCHandler {
         cal.add( Calendar.MILLISECOND, cal.get( Calendar.ZONE_OFFSET ) +
                   (cal.getTimeZone().inDaylightTime( since ) ? cal.get( Calendar.DST_OFFSET ) : 0 ) );
 
-        result = pages.stream().filter(page -> page.getLastModified().after(cal.getTime())).map(this::encodeWikiPage).collect(Collectors.toCollection(Vector::new));
+        for( final Page page : pages ) {
+            if( page.getLastModified().after( cal.getTime() ) ) {
+                result.add( encodeWikiPage( page ) );
+            }
+        }
 
         return result;
     }