Merge pull request #1299 from b2ihealthcare/issue/eq-merger-resourceu…

…ri-support refactor(classify): use `resourceUri` instead of obsolete repository and branch arguments
b2ihealthcare · Jun 10, 2024 · d2680c4 · d2680c4
2 parents d5c04d6 + d46a3eb
commit d2680c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/...ner/src/com/b2international/snowowl/snomed/reasoner/classification/ClassifyOperation.java b/...ner/src/com/b2international/snowowl/snomed/reasoner/classification/ClassifyOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 B2i Healthcare, https://b2ihealthcare.com
+ * Copyright 2011-2024 B2i Healthcare, https://b2ihealthcare.com
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.eclipse.core.runtime.OperationCanceledException;
 
 import com.b2international.snowowl.core.ApplicationContext;
+import com.b2international.snowowl.core.ResourceURI;
 import com.b2international.snowowl.core.api.SnowowlRuntimeException;
 import com.b2international.snowowl.core.events.Notifications;
 import com.b2international.snowowl.core.id.IDs;
@@ -58,36 +59,31 @@ public abstract class ClassifyOperation<T> {
 	protected final String reasonerId;
 	protected final String userId;
 	protected final List<SnomedConcept> additionalConcepts;
-	protected final String repositoryId;
-	protected final String branch;
+	protected final ResourceURI resourceUri;
 	protected final String parentLockContext;
 
 	public ClassifyOperation(final String reasonerId, 
 			final String userId, 
 			final List<SnomedConcept> additionalConcepts,
-			final String repositoryId, 
-			final String branch) {
+			final ResourceURI resourceUri) {
 
 		this(reasonerId, 
 				userId, 
 				additionalConcepts, 
-				repositoryId, 
-				branch, 
+				resourceUri,
 				DatastoreLockContextDescriptions.CLASSIFY_WITH_REVIEW);
 	}
 
 	public ClassifyOperation(final String reasonerId, 
 			final String userId, 
 			final List<SnomedConcept> additionalConcepts,
-			final String repositoryId, 
-			final String branch,
+			final ResourceURI resourceUri,
 			final String parentLockContext) {	
 
 		this.reasonerId = reasonerId;
 		this.userId = userId;
 		this.additionalConcepts = additionalConcepts;
-		this.repositoryId = repositoryId;
-		this.branch = branch;
+		this.resourceUri = resourceUri;
 		this.parentLockContext = parentLockContext;
 	}
 
@@ -145,7 +141,7 @@ public void onNext(final RemoteJobEntry job) {
 				.setUserId(userId)
 				.addAllConcepts(additionalConcepts)
 				.setParentLockContext(parentLockContext)
-				.build(branch)
+				.build(resourceUri)
 				.get(ApplicationContext.getServiceForClass(Environment.class));
 
 			while (true) {

diff --git a/...soner/src/com/b2international/snowowl/snomed/reasoner/equivalence/EquivalencyChecker.java b/...soner/src/com/b2international/snowowl/snomed/reasoner/equivalence/EquivalencyChecker.java
@@ -21,6 +21,8 @@
 
 import com.b2international.collections.PrimitiveMaps;
 import com.b2international.collections.longs.LongKeyLongMap;
+import com.b2international.snowowl.core.ResourceURI;
+import com.b2international.snowowl.snomed.common.SnomedTerminologyComponentConstants;
 import com.b2international.snowowl.snomed.core.domain.SnomedConcept;
 import com.b2international.snowowl.snomed.reasoner.classification.ClassifyOperation;
 import com.b2international.snowowl.snomed.reasoner.domain.ClassificationStatus;
@@ -42,11 +44,10 @@ public final class EquivalencyChecker extends ClassifyOperation<LongKeyLongMap>
 	public EquivalencyChecker(final String reasonerId, 
 			final String userId, 
 			final List<SnomedConcept> additionalConcepts,
-			final String repositoryId, 
-			final String branch,
+			final ResourceURI resourceUri,
 			final String parentLockContext) {
 
-		super(reasonerId, userId, additionalConcepts, repositoryId, branch, parentLockContext);
+		super(reasonerId, userId, additionalConcepts, resourceUri, parentLockContext);
 	}
 
 	@Override
@@ -60,7 +61,7 @@ protected LongKeyLongMap processResults(final String classificationId) {
 
 		final ClassificationTask classificationTask = ClassificationRequests.prepareGetClassification(classificationId)
 				.setExpand("equivalentConceptSets()")
-				.build(repositoryId)
+				.build(SnomedTerminologyComponentConstants.TOOLING_ID)
 				.execute(getEventBus())
 				.getSync();