Merge branch 'main' into deps

Author: guusdk

changelog.html

@@ -51,6 +51,7 @@ <h1>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/122'>#122</a>] - Update mockito to 4.6.1</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/121'>#121</a>] - Update Swagger to 2.2.1</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/120'>#120</a>] - Update Jersey to 2.36</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/118'>#118</a>] - Cannot retrieve full list of rooms following #113</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/113'>#113</a>] - MUC search including naturalName</li>
 </ul>
 

src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java

@@ -175,12 +175,10 @@ public MUCRoomEntities getChatRooms(String serviceName, String channelType, Stri
         List<MUCRoomEntity> mucRoomEntities = new ArrayList<>();
 
         for (MUCRoomSearchInfo roomInfo : roomsInfo) {
-            String roomName = "";
+            String roomName = roomInfo.getName();
             if (roomSearch != null) {
-                if (StringUtils.containsIgnoringCase(roomInfo.getName(), roomSearch) ||
-                    StringUtils.containsIgnoringCase(roomInfo.getNaturalLanguageName(), roomSearch)) {
-                    roomName = roomInfo.getName();
-                } else {
+                if (!StringUtils.containsIgnoringCase(roomInfo.getName(), roomSearch) &&
+                    !StringUtils.containsIgnoringCase(roomInfo.getNaturalLanguageName(), roomSearch)) {
                     continue;
                 }
             }