fix(core): ensure that special resourceUris can also be overridden

Rename `Dependency.mergeDependencies` to `Dependency.override` 🤖
b2ihealthcare · Oct 12, 2023 · 6a2cd0f · 6a2cd0f
1 parent 8be0b68
commit 6a2cd0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/Dependency.java b/core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/Dependency.java
@@ -146,7 +146,7 @@ public String toString() {
 	 */
 	public boolean dependOnSameResource(Dependency other) {
 		if (other == null) return false;
-		return getUri().getResourceUri().withoutPath().equals(other.getUri().getResourceUri().withoutPath()) 
+		return getUri().getResourceUri().withoutPath().withoutSpecialResourceIdPart().equals(other.getUri().getResourceUri().withoutSpecialResourceIdPart().withoutPath()) 
 				&& Objects.equals(getScope(), other.getScope());
 	}
 
@@ -225,7 +225,7 @@ public static Optional<Dependency> find(List<Dependency> dependencies, Dependenc
 	 * @param overrides
 	 * @return
 	 */
-	public static List<Dependency> mergeDependencies(List<Dependency> dependencies, List<Dependency> overrides) {
+	public static List<Dependency> override(List<Dependency> dependencies, List<Dependency> overrides) {
 		if (CompareUtils.isEmpty(overrides)) {
 			return dependencies;
 		}

diff --git a/.../src/com/b2international/snowowl/core/request/resource/BaseMetadataResourceConverter.java b/.../src/com/b2international/snowowl/core/request/resource/BaseMetadataResourceConverter.java
@@ -91,7 +91,7 @@ private void alterDependenciesBasedOnBranchMetadata(List<R> results) {
 					if (branchToOverrideResourceMetadataWith != null && branchToOverrideResourceMetadataWith.metadata() != null) {
 						List<Map<String, Object>> branchScopedDependenciesJson = (List<Map<String, Object>>) branchToOverrideResourceMetadataWith.metadata().get(ResourceDocument.BranchMetadata.DEPENDENCIES);
 						List<Dependency> branchScopedDependencies = context().service(ObjectMapper.class).convertValue(branchScopedDependenciesJson, new TypeReference<List<Dependency>>() {});
-						tres.setDependencies(Dependency.mergeDependencies(tres.getDependencies(), branchScopedDependencies));
+						tres.setDependencies(Dependency.override(tres.getDependencies(), branchScopedDependencies));
 					}
 				}
 			}