Merge pull request #1327 from b2ihealthcare/feature/SO-6287-version-derived-resources

Support versioning derived resources

Author: cmark

core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/TerminologyResource.java

@@ -48,16 +48,25 @@ public abstract class TerminologyResource extends Resource {
 	public static class DependencyScope {
 
 		/**
-		 * Constant denoting a dependency as the base resource of this resource. Points to the resource (or versioned resource) that this resource is
-		 * the extension of.
+		 * Constant denoting a dependency as the base resource of this resource. Points
+		 * to the resource (or versioned resource) that this resource is the extension
+		 * of.
 		 */
 		public static final String EXTENSION_OF = "extensionOf";
 
 		/**
-		 * Constant denoting a dependency as the development version of this upgrade resource. Points to the resource that this resource is the
-		 * upgrade of.
+		 * Constant denoting a dependency as the development version of this upgrade
+		 * resource. Points to the resource that this resource is the upgrade of.
 		 */
 		public static final String UPGRADE_OF = "upgradeOf";
+		
+		/**
+		 * Constant denoting a dependency as a derivative of this resource (where eg.
+		 * content is generated based on the components of this resource). Derivatives
+		 * should be versioned together with their sources if the URI in the dependency
+		 * is not versioned.
+		 */
+		public static final String SOURCE_OF = "sourceOf";
 	}
 
 	/**

core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/request/version/VersionCreateRequest.java

@@ -250,9 +250,9 @@ private Map<ResourceURI, TerminologyResource> fetchResources(ServiceProvider con
 			.map(TerminologyResource.class::cast)
 			.findFirst();
 
-		// if the resource to version is a collection URI then version all child resources as well
 		optionalResource.ifPresent(terminologyResource -> {
 			if (terminologyResource instanceof TerminologyResourceCollection resourceCollection) {
+				// if the resource to version is a collection URI then version all child resources as well
 				final var registry = context.service(TerminologyResourceCollectionToolingSupport.Registry.class);
 				final Set<String> childResourceTypes = registry.getAllByToolingId(resourceCollection.getToolingId())
 					.stream()
@@ -273,6 +273,34 @@ private Map<ResourceURI, TerminologyResource> fetchResources(ServiceProvider con
 							resourcesToVersion.put(resource.getResourceURI(), resource);
 						}
 					});
+			} else {
+				// otherwise look for derived resources (direct dependencies only)
+				Set<String> derivativeIds = terminologyResource.getDependencies()
+					.stream()
+					.filter(d -> TerminologyResource.DependencyScope.SOURCE_OF.equals(d.getScope()))
+					.map(d -> d.getUri())
+					.filter(uriWithQuery -> !uriWithQuery.hasQueryPart())
+					.map(uriWithQuery -> uriWithQuery.getResourceUri())
+					.filter(uri -> uri.isHead())
+					.map(uri -> uri.getResourceId())
+					.collect(Collectors.toSet());
+				
+				if (!derivativeIds.isEmpty()) {
+					ResourceRequests.prepareSearch()
+						.filterByIds(derivativeIds)
+						.setLimit(derivativeIds.size())
+						.buildAsync()
+						.execute(context)
+						.stream()
+						.filter(TerminologyResource.class::isInstance)
+						.map(TerminologyResource.class::cast)
+						.forEach(resource -> {
+							// skip child resources that are in deprecated state and should not be versioned anymore
+							if (!TerminologyResourceCommitRequestBuilder.READ_ONLY_STATUSES.contains(resource.getStatus())) {
+								resourcesToVersion.put(resource.getResourceURI(), resource);
+							}
+						});
+				}
 			}
 
 			// add the "main" resource to the end of the map (preserving iteration order)