From 7fb129b0543c4ac32931ed66f9ad85e58eeeff5c Mon Sep 17 00:00:00 2001
From: Alexis Li <alexis.li@oicr.on.ca>
Date: Thu, 3 Feb 2022 11:52:40 -0500
Subject: [PATCH 1/3] when comparing list of files, should ignore order

---
 maestro-domain/pom.xml                                       | 5 +++++
 .../entities/indexing/analysis/AnalysisCentricDocument.java  | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/maestro-domain/pom.xml b/maestro-domain/pom.xml
index a4330a30..0c99c77e 100644
--- 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/maestro-domain/src/main/java/bio/overture/maestro/domain/entities/indexing/analysis/AnalysisCentricDocument.java b/maestro-domain/src/main/java/bio/overture/maestro/domain/entities/indexing/analysis/AnalysisCentricDocument.java
index e2aa5711..b4f9b730 100644
--- a/maestro-domain/src/main/java/bio/overture/maestro/domain/entities/indexing/analysis/AnalysisCentricDocument.java
+++ b/maestro-domain/src/main/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());
   }
 }

From 2a73bd7f11d665c243e4823db00b95d9c7db2752 Mon Sep 17 00:00:00 2001
From: Alexis Li <alexis.li@oicr.on.ca>
Date: Fri, 4 Feb 2022 10:24:42 -0500
Subject: [PATCH 2/3] Merge Back 3.12.0-SNAPSHOT

---
 .mvn/maven.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/maven.config b/.mvn/maven.config
index 92340370..2453e910 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,3 +1,3 @@
--Drevision=3.11.0
+-Drevision=3.12.0
 -Dsha1=
 -Dchangelist=-SNAPSHOT

From d5477fd60f78bd3fa476ce4e8debb6ebcd9c4b12 Mon Sep 17 00:00:00 2001
From: Alexis Li <alexis.li@oicr.on.ca>
Date: Fri, 4 Feb 2022 14:32:53 -0500
Subject: [PATCH 3/3] Release Candidate 3.12.0

---
 .mvn/maven.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/maven.config b/.mvn/maven.config
index 2453e910..5067d921 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,3 +1,3 @@
 -Drevision=3.12.0
 -Dsha1=
--Dchangelist=-SNAPSHOT
+-Dchangelist=