Merge pull request #228 from overture-stack/rc/3.12.0

Release Candidate 3.12.0
overture-stack · Feb 7, 2022 · 6d18621 · 6d18621
2 parents af62bc7 + d5477fd
commit 6d18621
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1,3 +1,3 @@
--Drevision=3.11.0
+-Drevision=3.12.0
 -Dsha1=
--Dchangelist=-SNAPSHOT
+-Dchangelist=
diff --git a/maestro-domain/pom.xml b/maestro-domain/pom.xml
@@ -45,6 +45,11 @@
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
 
         <!-- Testing -->
         <dependency>

diff --git a/.../java/bio/overture/maestro/domain/entities/indexing/analysis/AnalysisCentricDocument.java b/.../java/bio/overture/maestro/domain/entities/indexing/analysis/AnalysisCentricDocument.java
@@ -10,6 +10,7 @@
 import java.util.TreeMap;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
+import org.apache.commons.collections4.CollectionUtils;
 
 @Builder
 @Getter
@@ -71,7 +72,7 @@ public boolean isValidReplica(AnalysisCentricDocument analysisCentricDocument) {
         // && this.analysisState.equals(analysisCentricDocument.getAnalysisState())
         // && this.analysisVersion.equals(analysisCentricDocument.getAnalysisVersion())
         && this.studyId.equals(analysisCentricDocument.getStudyId())
-        && this.donors.equals(analysisCentricDocument.getDonors())
-        && this.files.equals(analysisCentricDocument.getFiles());
+        && CollectionUtils.isEqualCollection(this.donors, analysisCentricDocument.getDonors())
+        && CollectionUtils.isEqualCollection(this.files, analysisCentricDocument.getFiles());
   }
 }