MAINT-2609 Fix test failures

IHTSDO · Jul 22, 2024 · 70f905c · 70f905c
1 parent a895c21
commit 70f905c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/snomed/snowstorm/mrcm/MRCMDomainTemplatesAndRuleGenerator.java b/src/main/java/org/snomed/snowstorm/mrcm/MRCMDomainTemplatesAndRuleGenerator.java
@@ -635,7 +635,7 @@ public String sortExpressionConstraintByConceptId(String rangeConstraint, String
 		if (constraint instanceof CompoundExpressionConstraint compound) {
 			StringBuilder expressionBuilder = new StringBuilder();
 			if (compound.getConjunctionExpressionConstraints() != null) {
-				List<SubExpressionConstraint> conJunctions = compound.getConjunctionExpressionConstraints();
+				List<SubExpressionConstraint> conJunctions = new ArrayList<>(compound.getConjunctionExpressionConstraints());
 				conJunctions.sort(EXPRESSION_CONSTRAINT_COMPARATOR_BY_CONCEPT_ID);
 				for (int i = 0; i < conJunctions.size(); i++) {
 					if (i > 0) {
@@ -645,7 +645,7 @@ public String sortExpressionConstraintByConceptId(String rangeConstraint, String
 				}
 			}
 			if (compound.getDisjunctionExpressionConstraints() != null) {
-				List<SubExpressionConstraint> disJunctions = compound.getDisjunctionExpressionConstraints();
+				List<SubExpressionConstraint> disJunctions = new ArrayList<>(compound.getDisjunctionExpressionConstraints());
 				disJunctions.sort(EXPRESSION_CONSTRAINT_COMPARATOR_BY_CONCEPT_ID);
 				for (int i = 0; i < disJunctions.size(); i++) {
 					if (i > 0) {

diff --git a/src/test/java/org/snomed/snowstorm/util/ExpressionUtil.java b/src/test/java/org/snomed/snowstorm/util/ExpressionUtil.java
@@ -42,7 +42,7 @@ public static String sortExpressionConstraintByConceptId(String expressionConstr
 	private static String constructExpression(CompoundExpressionConstraint compound) {
 		StringBuilder expressionBuilder = new StringBuilder();
 		if (compound.getConjunctionExpressionConstraints() != null) {
-			List<SubExpressionConstraint> conJunctions = compound.getConjunctionExpressionConstraints();
+			List<SubExpressionConstraint> conJunctions = new ArrayList<>(compound.getConjunctionExpressionConstraints());
 			conJunctions.sort(EXPRESSION_CONSTRAINT_COMPARATOR_BY_CONCEPT_ID);
 			for (SubExpressionConstraint subExpressionConstraint : conJunctions) {
 				if (subExpressionConstraint.getConceptId() == null && subExpressionConstraint.getNestedExpressionConstraint() != null) {
@@ -60,7 +60,7 @@ private static String constructExpression(CompoundExpressionConstraint compound)
 			}
 		}
 		if (compound.getDisjunctionExpressionConstraints() != null) {
-			List<SubExpressionConstraint> disJunctions = compound.getDisjunctionExpressionConstraints();
+			List<SubExpressionConstraint> disJunctions = new ArrayList<>(compound.getDisjunctionExpressionConstraints());
 			List<RefinedExpressionConstraint> refinedExpressionConstraints = getNestedExpressionConstraint(disJunctions);
 			if (!refinedExpressionConstraints.isEmpty()) {
 				expressionBuilder.append(constructExpression(refinedExpressionConstraints, false));