- Fix a regression, in which the BulkImportReport was not returning the events in a time-ordered state.

- Update dependencies.

build.gradle

@@ -43,7 +43,7 @@ dependencies {
     //implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.0.2'
 
     // https://mvnrepository.com/artifact/com.google.guava/guava
-    implementation group: 'com.google.guava', name: 'guava', version: '33.2.0-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '33.2.1-jre'
 
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

installAndRun.sh

@@ -26,7 +26,7 @@ if [[ justRun -eq 1 && shouldRunInDocker -eq 1 ]]; then
   justRun=0
 fi
 
-gradleVersion="8.7"
+gradleVersion="8.8"
 
 if [[ justRun -eq 0 ]]; then
 

src/main/java/eu/openaire/urls_controller/models/BulkImportReport.java

@@ -11,7 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -63,8 +63,8 @@ public class BulkImportReport {
         String reportToReturn = null;
         reportLock.lock();
         try {
-            //Convert the LinkedHashMultiMap<String, String> to Map<String, Collection<String>>, since Gson cannot serialize Multimaps.
+            //Convert the SetMultimap<String, String> to Map<String, Collection<String>>, since Gson cannot serialize Multimaps.
-            eventsMap = new HashMap<>(eventsMultimap.asMap());  // Make sure we use a clone of the original data, in order to avoid any exception in the "gson.toJson()" method, when at the same time another thread modifies the "eventsMultimap".
+            eventsMap = new LinkedHashMap<>(eventsMultimap.asMap());  // Make sure we use a clone of the original data, in order to avoid any exception in the "gson.toJson()" method, when at the same time another thread modifies the "eventsMultimap".
             reportToReturn = gson.toJson(this, BulkImportReport.class);
         } catch (Exception e) {
             logger.error("Problem when producing the JSON-string with the BulkImportReport! | reportID: '" + reportID + "'", e);