diff --git a/.mvn/maven.config b/.mvn/maven.config index 92340370..5067d921 100644 --- 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 index a4330a30..0c99c77e 100644 --- a/maestro-domain/pom.xml +++ b/maestro-domain/pom.xml @@ -45,6 +45,11 @@ io.projectreactor reactor-core + + org.apache.commons + commons-collections4 + 4.4 + 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()); } }