SO-5834: generic dependency model

core/com.b2international.snowowl.core.rest.tests/src/com/b2international/snowowl/core/rest/codesystem/CodeSystemApiTest.java

@@ -40,6 +40,7 @@
 import com.b2international.commons.exceptions.NotFoundException;
 import com.b2international.commons.http.AcceptLanguageHeader;
 import com.b2international.commons.json.Json;
+import com.b2international.snowowl.core.Dependency;
 import com.b2international.snowowl.core.Resource;
 import com.b2international.snowowl.core.ResourceURI;
 import com.b2international.snowowl.core.branch.Branch;
@@ -264,7 +265,7 @@ public void codesystem15_CreateWithDedicatedBranchPath() {
 	}
 
 	@Test
-	public void codesystem16_CreateWithExtensionOf() {
+	public void codesystem16_CreateWithExtensionOfOldModel() {
 		final String parentCodeSystemId = "cs11";
 		final Json parentRequestBody = prepareCodeSystemCreateRequestBody(parentCodeSystemId);
 		assertCodeSystemCreated(parentRequestBody);
@@ -277,11 +278,11 @@ public void codesystem16_CreateWithExtensionOf() {
 
 		final Json requestBody = prepareCodeSystemCreateRequestBody(codeSystemId)
 				.without("branchPath")
-				.with("extensionOf", CodeSystem.uri("cs11/v1"));
+				.with("extensionOf", CodeSystem.uri(parentCodeSystemId, "v1"));
 
 		assertCodeSystemCreated(requestBody);
 
-		final String expectedBranchPath = Branch.get(Branch.MAIN_PATH, "cs11", "v1", codeSystemId);
+		final String expectedBranchPath = Branch.get(Branch.MAIN_PATH, parentCodeSystemId, "v1", codeSystemId);
 
 		try {
 
@@ -292,6 +293,9 @@ public void codesystem16_CreateWithExtensionOf() {
 				.execute(Services.bus())
 				.getSync();
 
+			assertCodeSystemGet(codeSystemId)
+				.body("extensionOf", equalTo("codesystems/cs11/v1"));
+
 		} catch (NotFoundException e) {
 			fail("Branch " + expectedBranchPath + " did not get created as part of code system creation");
 		}
@@ -367,7 +371,7 @@ public void codesystem20_UpdateInvalidBranchPath() {
 	}
 
 	@Test
-	public void codesystem21_UpdateExtensionOf() {
+	public void codesystem21_UpdateExtensionOfOldModel() {
 		final String parentCodeSystemId = "cs13";
 		final Json parentRequestBody = prepareCodeSystemCreateRequestBody(parentCodeSystemId);
 		assertCodeSystemCreated(parentRequestBody);
@@ -652,6 +656,75 @@ public void codesystem33_AllowDraftResourcesToBeQueriedWithLATEST() throws Excep
 			.getSync();
 	}
 
+	@Test
+	public void codesystem34_CreateWithExtensionOfNewModel() {
+		final String parentCodeSystemId = "cs34";
+		final Json parentRequestBody = prepareCodeSystemCreateRequestBody(parentCodeSystemId);
+		assertCodeSystemCreated(parentRequestBody);
+		assertCodeSystemGet(parentCodeSystemId).statusCode(200);
+
+		final Json versionRequestBody = prepareVersionCreateRequestBody(CodeSystem.uri(parentCodeSystemId), "v1", "2023-07-14");
+		assertVersionCreated(versionRequestBody).statusCode(201);
+
+		final String codeSystemId = "cs35";
+
+		final Json requestBody = prepareCodeSystemCreateRequestBody(codeSystemId)
+				.without("branchPath")
+				.with("dependencies", List.of(Dependency.of(CodeSystem.uri(parentCodeSystemId, "v1"), "extensionOf")));
+
+		assertCodeSystemCreated(requestBody);
+
+		final String expectedBranchPath = Branch.get(Branch.MAIN_PATH, parentCodeSystemId, "v1", codeSystemId);
+
+		try {
+
+			// Check if the branch has been created
+			RepositoryRequests.branching()
+				.prepareGet(expectedBranchPath)
+				.build(TOOLING_ID)
+				.execute(Services.bus())
+				.getSync();
+
+			// check extensionOf value comes back as part of both dependencies and extensionOf
+			assertCodeSystemGet(codeSystemId)
+				.statusCode(200)
+				.body("extensionOf", equalTo("codesystems/cs34/v1"))
+				.body("dependencies", hasItem(Map.of("resourceUri", "codesystems/cs34/v1", "scope", "extensionOf")));
+
+		} catch (NotFoundException e) {
+			fail("Branch " + expectedBranchPath + " did not get created as part of code system creation");
+		}
+	}
+
+	@Test
+	public void codesystem35_UpdateExtensionOfNewModel() {
+		final String parentCodeSystemId = "cs35";
+		final Json parentRequestBody = prepareCodeSystemCreateRequestBody(parentCodeSystemId);
+		assertCodeSystemCreated(parentRequestBody);
+		assertCodeSystemGet(parentCodeSystemId).statusCode(200);
+
+		final Json v3RequestBody = prepareVersionCreateRequestBody(CodeSystem.uri(parentCodeSystemId), "v3", "2020-04-16");
+		assertVersionCreated(v3RequestBody).statusCode(201);
+		final Json v4RequestBody = prepareVersionCreateRequestBody(CodeSystem.uri(parentCodeSystemId), "v4", "2020-04-17");
+		assertVersionCreated(v4RequestBody).statusCode(201);
+
+		final String codeSystemId = "cs36";
+		final Json requestBody = prepareCodeSystemCreateRequestBody(codeSystemId)
+				.without("branchPath")
+				.with("dependencies", List.of(Dependency.of(CodeSystem.uri("cs35/v3"), "extensionOf")));
+
+		assertCodeSystemCreated(requestBody);
+		assertCodeSystemUpdated(codeSystemId, Json.object("dependencies", List.of(Dependency.of(CodeSystem.uri("cs35/v4"), "extensionOf"))));
+
+		final String expectedBranchPath = Branch.get(Branch.MAIN_PATH, "cs35", "v4", codeSystemId);
+
+		assertCodeSystemGet(codeSystemId)
+			.statusCode(200)
+			.body("extensionOf", equalTo("codesystems/cs35/v4"))
+			.body("dependencies", hasItem(Map.of("resourceUri", "codesystems/cs35/v4", "scope", "extensionOf")))
+			.body("branchPath", equalTo(expectedBranchPath));
+	}
+
 	private long getCodeSystemCreatedAt(final String id) {
 		return assertCodeSystemGet(id)
 			.statusCode(200)

core/com.b2international.snowowl.core.rest/src/com/b2international/snowowl/core/rest/BaseResourceRestInput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2021-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,11 +138,11 @@ public final String getPurpose() {
 		return purpose;
 	}
 
-	public void setSettings(Map<String, Object> settings) {
+	public final void setSettings(Map<String, Object> settings) {
 		this.settings = settings;
 	}
 
-	public Map<String, Object> getSettings() {
+	public final Map<String, Object> getSettings() {
 		return settings;
 	}
 }

core/com.b2international.snowowl.core.rest/src/com/b2international/snowowl/core/rest/BaseResourceUpdateRestInput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2021-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,11 +124,11 @@ public final String getPurpose() {
 		return purpose;
 	}
 
-	public void setSettings(Map<String, Object> settings) {
+	public final void setSettings(Map<String, Object> settings) {
 		this.settings = settings;
 	}
 
-	public Map<String, Object> getSettings() {
+	public final Map<String, Object> getSettings() {
 		return settings;
 	}
 }

core/com.b2international.snowowl.core.rest/src/com/b2international/snowowl/core/rest/BaseTerminologyResourceRestInput.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 B2i Healthcare Pte Ltd, http://b2i.sg
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.b2international.snowowl.core.rest;
+
+import java.util.List;
+
+import com.b2international.snowowl.core.Dependency;
+
+/**
+ * @since 8.12
+ */
+public abstract class BaseTerminologyResourceRestInput extends BaseResourceRestInput {
+
+	private List<Dependency> dependencies;
+
+	public List<Dependency> getDependencies() {
+		return dependencies;
+	}
+
+	public void setDependencies(List<Dependency> dependencies) {
+		this.dependencies = dependencies;
+	}
+
+}

core/com.b2international.snowowl.core.rest/src/com/b2international/snowowl/core/rest/BaseTerminologyResourceUpdateRestInput.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 B2i Healthcare Pte Ltd, http://b2i.sg
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.b2international.snowowl.core.rest;
+
+import java.util.List;
+
+import com.b2international.snowowl.core.Dependency;
+
+/**
+ * @since 8.12
+ */
+public abstract class BaseTerminologyResourceUpdateRestInput extends BaseResourceUpdateRestInput {
+
+	private List<Dependency> dependencies;
+
+	public List<Dependency> getDependencies() {
+		return dependencies;
+	}
+
+	public void setDependencies(List<Dependency> dependencies) {
+		this.dependencies = dependencies;
+	}
+
+}

core/com.b2international.snowowl.core.rest/src/com/b2international/snowowl/core/rest/codesystem/CodeSystemCreateRestInput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2021-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 import com.b2international.snowowl.core.ResourceURI;
 import com.b2international.snowowl.core.codesystem.CodeSystemCreateRequestBuilder;
 import com.b2international.snowowl.core.codesystem.CodeSystemRequests;
-import com.b2international.snowowl.core.rest.BaseResourceRestInput;
+import com.b2international.snowowl.core.rest.BaseTerminologyResourceRestInput;
 
 /**
  * @since 8.0
  */
-public final class CodeSystemCreateRestInput extends BaseResourceRestInput {
+public final class CodeSystemCreateRestInput extends BaseTerminologyResourceRestInput {
 
 	private String oid;
 	private String branchPath;
@@ -54,10 +54,18 @@ public String getToolingId() {
 		return toolingId;
 	}
 
+	/**
+	 * @param extensionOf
+	 * @deprecated - replaced by {@link #setDependencies(java.util.List)}, will be removed in 9.0
+	 */
 	public void setExtensionOf(ResourceURI extensionOf) {
 		this.extensionOf = extensionOf;
 	}
 
+	/**
+	 * @return
+	 * @deprecated - replaced by {@link #getDependencies()}, will be removed in 9.0
+	 */
 	public ResourceURI getExtensionOf() {
 		return extensionOf;
 	}
@@ -79,7 +87,9 @@ public CodeSystemCreateRequestBuilder toCodeSystemCreateRequest() {
 				.setOid(getOid())
 				.setBranchPath(getBranchPath())
 				.setToolingId(getToolingId())
-				.setExtensionOf(getExtensionOf())
-				.setSettings(getSettings());
+				.setSettings(getSettings())
+				.setDependencies(getDependencies())
+				// XXX support old model input until 9.0
+				.setExtensionOf(getExtensionOf());
 	}
 }

core/com.b2international.snowowl.core.rest/src/com/b2international/snowowl/core/rest/codesystem/CodeSystemUpdateRestInput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2021-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 import com.b2international.snowowl.core.ResourceURI;
 import com.b2international.snowowl.core.codesystem.CodeSystemRequests;
 import com.b2international.snowowl.core.codesystem.CodeSystemUpdateRequestBuilder;
-import com.b2international.snowowl.core.rest.BaseResourceUpdateRestInput;
+import com.b2international.snowowl.core.rest.BaseTerminologyResourceUpdateRestInput;
 
 /**
  * @since 8.0
  */
-public final class CodeSystemUpdateRestInput extends BaseResourceUpdateRestInput {
+public final class CodeSystemUpdateRestInput extends BaseTerminologyResourceUpdateRestInput {
 
 	private String oid;
 	private String branchPath;
@@ -45,10 +45,18 @@ public String getBranchPath() {
 		return branchPath;
 	}
 
+	/**
+	 * @param extensionOf
+	 * @deprecated - replaced by {@link #setDependencies(java.util.List)}, will be removed in 9.0
+	 */
 	public void setExtensionOf(ResourceURI extensionOf) {
 		this.extensionOf = extensionOf;
 	}
 
+	/**
+	 * @return
+	 * @deprecated - replaced by {@link #getDependencies()}, will be removed in 9.0
+	 */
 	public ResourceURI getExtensionOf() {
 		return extensionOf;
 	}
@@ -68,7 +76,10 @@ public CodeSystemUpdateRequestBuilder toCodeSystemUpdateRequest(String codeSyste
 			.setBundleId(getBundleId())
 			.setOid(getOid())
 			.setBranchPath(getBranchPath())
+			.setSettings(getSettings())
+			.setDependencies(getDependencies())
+			// XXX maintain old model field options until 9.0
 			.setExtensionOf(getExtensionOf())
-			.setSettings(getSettings());
+			;
 	}
 }