From 2d2d774d67fc543fd0526de6a9ef63165f57544e Mon Sep 17 00:00:00 2001
From: Nuno Vieira <nvieira@keep.pt>
Date: Thu, 9 Aug 2018 17:12:12 +0100
Subject: [PATCH] fixed aip corruption risk assessment plugin issue responsible
 to not mitigate past similar unmitigated incidences #1281

---
 .../java/org/roda/core/index/utils/IterableIndexResult.java | 6 +-----
 .../plugins/base/AIPCorruptionRiskAssessmentPlugin.java     | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/roda-core/roda-core/src/main/java/org/roda/core/index/utils/IterableIndexResult.java b/roda-core/roda-core/src/main/java/org/roda/core/index/utils/IterableIndexResult.java
index 2eaf857c54..a3c1dfd6de 100644
--- a/roda-core/roda-core/src/main/java/org/roda/core/index/utils/IterableIndexResult.java
+++ b/roda-core/roda-core/src/main/java/org/roda/core/index/utils/IterableIndexResult.java
@@ -29,7 +29,6 @@
  */
 
 public class IterableIndexResult<T extends IsIndexed> implements CloseableIterable<T> {
-
   private static int PAGE_SIZE = -1;
   private static int RETRIES = -1;
   private static int SLEEP_BETWEEN_RETRIES = -1;
@@ -39,9 +38,7 @@ public class IterableIndexResult<T extends IsIndexed> implements CloseableIterab
   private final IndexResultIterator<T> iterator;
 
   public IterableIndexResult(final SolrClient solrClient, final Class<T> returnClass, final Filter filter,
-    final User user, final boolean justActive, final List<String> fieldsToReturn)
-    throws GenericException, RequestNotValidException {
-
+    final User user, final boolean justActive, final List<String> fieldsToReturn) {
     iterator = new IndexResultIterator<>(solrClient, returnClass, filter, user, justActive, fieldsToReturn);
 
     if (PAGE_SIZE > 0) {
@@ -59,7 +56,6 @@ public IterableIndexResult(final SolrClient solrClient, final Class<T> returnCla
     if (HISTOGRAM != null) {
       iterator.setHistogram(HISTOGRAM);
     }
-
   }
 
   @Override
diff --git a/roda-core/roda-core/src/main/java/org/roda/core/plugins/plugins/base/AIPCorruptionRiskAssessmentPlugin.java b/roda-core/roda-core/src/main/java/org/roda/core/plugins/plugins/base/AIPCorruptionRiskAssessmentPlugin.java
index 95b27d09df..3de4dd46c0 100644
--- a/roda-core/roda-core/src/main/java/org/roda/core/plugins/plugins/base/AIPCorruptionRiskAssessmentPlugin.java
+++ b/roda-core/roda-core/src/main/java/org/roda/core/plugins/plugins/base/AIPCorruptionRiskAssessmentPlugin.java
@@ -32,6 +32,7 @@
 import org.roda.core.data.v2.LiteOptionalWithCause;
 import org.roda.core.data.v2.common.OptionalWithCause;
 import org.roda.core.data.v2.index.IndexResult;
+import org.roda.core.data.v2.index.filter.EmptyKeyFilterParameter;
 import org.roda.core.data.v2.index.filter.Filter;
 import org.roda.core.data.v2.index.filter.SimpleFilterParameter;
 import org.roda.core.data.v2.index.sort.Sorter;
@@ -303,9 +304,11 @@ private List<RiskIncidence> getUnmitigatedIncidences(IndexService index, String
       filter.add(new SimpleFilterParameter(RodaConstants.RISK_INCIDENCE_REPRESENTATION_ID, representationId));
     }
 
-    if (filePath != null) {
+    if (filePath != null && !filePath.isEmpty()) {
       filter.add(new SimpleFilterParameter(RodaConstants.RISK_INCIDENCE_FILE_PATH_COMPUTED,
         StringUtils.join(filePath, RodaConstants.RISK_INCIDENCE_FILE_PATH_COMPUTED_SEPARATOR)));
+    } else {
+      filter.add(new EmptyKeyFilterParameter(RodaConstants.RISK_INCIDENCE_FILE_PATH_COMPUTED));
     }
 
     if (fileId != null) {