[bugfix] Fixes sonar issues

Author: reinhapa

exist-core/pom.xml

@@ -514,6 +514,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>

exist-core/src/main/java/org/exist/xmlrpc/QueryResultCache.java

@@ -51,9 +51,9 @@ public QueryResultCache() {
                 .expireAfterAccess(TIMEOUT, TimeUnit.MILLISECONDS)
                 .removalListener((key, value, cause) -> {
                     final AbstractCachedResult qr = (AbstractCachedResult)value;
-                    qr.free();  // must free associated resources
+                    qr.close();  // must close associated resources
                     if(LOG.isDebugEnabled()) {
-                        LOG.debug("Removing cached result set: {}", new Date(qr.getTimestamp()).toString());
+                        LOG.debug("Removing cached result set: {}", new Date(qr.getTimestamp()));
                     }
                 }).build();
     }

exist-core/src/main/java/org/exist/xmlrpc/RpcConnection.java

@@ -3049,7 +3049,7 @@ private List<List<Object>> getIndexedElements(final XmldbURI collUri,
         return this.<List<List<Object>>>readCollection(collUri).apply((collection, broker, transaction) -> {
             final ElementIndex elementIndex = broker.getElementIndex();
             if (elementIndex != null) {
-                final Occurrences occurrences[] = elementIndex.scanIndexedElements(collection, inclusive);
+                final Occurrences[] occurrences = elementIndex.scanIndexedElements(collection, inclusive);
                 final List<List<Object>> result = new ArrayList<>(occurrences.length);
                 for (final Occurrences occurrence : occurrences) {
                     final QName qname = (QName) occurrence.getTerm();

exist-core/src/test/java/org/exist/xmlrpc/QueryResultCacheTest.java

@@ -24,7 +24,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.*;
+import static org.awaitility.Awaitility.await;
 
 /**
  * @author <a href="mailto:[email protected]">Patrick Reinhart</a>
@@ -71,8 +73,8 @@ void testGetCachedContentFile() {
     void testRemove() throws InterruptedException {
         assertThatNoException().isThrownBy(() ->  cache.remove(-1));
         assertThatNoException().isThrownBy(() ->  cache.remove(0));
-        Thread.sleep(400);
-        assertThat(cachedResult.getResult()).isOne();
+
+        await().atMost(1, SECONDS).untilAsserted(() -> assertThat(cachedResult.getResult()).isOne());
         assertThatNoException().isThrownBy(() ->  cache.remove(1));
     }
 
@@ -82,8 +84,8 @@ void testRemoveWithHashCode() throws InterruptedException {
         assertThatNoException().isThrownBy(() ->  cache.remove(0, 0));
         assertThat(cachedResult.getResult()).isZero();
         assertThatNoException().isThrownBy(() ->  cache.remove(0, 42));
-        Thread.sleep(400);
-        assertThat(cachedResult.getResult()).isOne();
+
+        await().atMost(1, SECONDS).untilAsserted(() -> assertThat(cachedResult.getResult()).isOne());
         assertThatNoException().isThrownBy(() ->  cache.remove(1, 0));
     }
 

exist-core/src/test/java/org/exist/xmlrpc/XmlRpcTest.java

@@ -612,9 +612,7 @@ public void testExecuteQuery() throws XmlRpcException, MalformedURLException {
         params.clear();
         params.add(handle);
         Integer hits = (Integer) xmlrpc.execute("getHits", params);
-        assertThat(hits).isNotNull();
-
-        assertThat(hits).isEqualTo(2);
+        assertThat(hits).isNotNull().isEqualTo(2);
 
         params.add(0);
         params.add(new HashMap());
@@ -910,7 +908,7 @@ public void testGetSubCollectionCreationTime() throws XmlRpcException, Malformed
         List<Object> params = new ArrayList<>();
         params.add("/db");
         params.add("xmlrpc");
-        assertThat((Long)xmlrpc.execute("getSubCollectionCreationTime", params)).isGreaterThan(0);
+        assertThat((Long)xmlrpc.execute("getSubCollectionCreationTime", params)).isPositive();
     }
 
     @Test

exist-parent/pom.xml

@@ -125,6 +125,7 @@
         <easymock.version>5.2.0</easymock.version>
         <objenesis.version>3.3</objenesis.version>
         <assertj.version>3.25.3</assertj.version>
+        <awaitility.version>4.2.0</awaitility.version>
         <junit.toolbox.version>2.4</junit.toolbox.version>
         <hamcrest.version>2.2</hamcrest.version>
 
@@ -531,6 +532,12 @@
                 <version>${assertj.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>${awaitility.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymock</artifactId>