ResourceSet configurator requirement parameter

Author: pvlasov

capability/src/main/java/org/nasdanika/capability/emf/ResourceSetCapabilityFactory.java

@@ -2,6 +2,7 @@
 
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -45,6 +46,10 @@ protected ResourceSet contribute(
 		for (CapabilityProvider<Object> cp: contributorProviders) {
 			cp.getPublisher().subscribe(contributor -> ((ResourceSetContributor) contributor).contribute(resourceSet, progressMonitor));
 		}
+		Consumer<ResourceSet> configurator = requirement.configurator();
+		if (configurator != null) {
+			configurator.accept(resourceSet);
+		}
 
 		return resourceSet;		
 	}

capability/src/main/java/org/nasdanika/capability/emf/ResourceSetRequirement.java

@@ -1,5 +1,6 @@
 package org.nasdanika.capability.emf;
 
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import org.eclipse.emf.ecore.EPackage;
@@ -8,8 +9,12 @@
 /**
  * Requirement for a {@link ResourceSet}.
  * @param resourceSet an optional instance of {@link ResourceSet} to configure.
+ * @param configurator resource set is passed to the configurator if the configurator is not null.
  * @param contributorPredicate allows to filter contributors, e.g. register only certain {@link EPackage}s.
  */
-public record ResourceSetRequirement(ResourceSet resourceSet, Predicate<ResourceSetContributor> contributorPredicate) {
+public record ResourceSetRequirement(
+		ResourceSet resourceSet,
+		Consumer<ResourceSet> configurator,
+		Predicate<ResourceSetContributor> contributorPredicate) {
 
 }

capability/src/test/java/org/nasdanika/capability/CapabilityTests.java

@@ -31,10 +31,16 @@ public void testResourceSetCapabilityFactory() {
 		CapabilityLoader capabilityLoader = new CapabilityLoader();
 		ProgressMonitor progressMonitor = new PrintStreamProgressMonitor();
 
-		ResourceSetRequirement serviceRequirement = new ResourceSetRequirement(null, contributor -> {
-			System.out.println(contributor);
-			return true;
-		});
+		ResourceSetRequirement serviceRequirement = new ResourceSetRequirement(
+				null, 
+				resourceSet -> {
+					System.out.println(resourceSet);					
+				}, 
+				contributor -> {
+					System.out.println(contributor);
+					return true;
+				}
+		);
 
 		Requirement<ResourceSetRequirement, ResourceSet> requirement = ServiceCapabilityFactory.createRequirement(ResourceSet.class, null, serviceRequirement);		
 		for (CapabilityProvider<?> cp: capabilityLoader.load(requirement, progressMonitor)) {

cli/src/main/java/org/nasdanika/cli/ResourceSetMixIn.java

@@ -41,16 +41,18 @@ public class ResourceSetMixIn {
 
 	public ResourceSet createResourceSet(ProgressMonitor progressMonitor) {
 		CapabilityLoader capabilityLoader = getCapabilityLoader();
-		ResourceSetRequirement serviceRequirement = new ResourceSetRequirement(createRequirementResourceSet(), this::testContributor);		
+		ResourceSetRequirement serviceRequirement = new ResourceSetRequirement(createRequirementResourceSet(), this::configureResourceSet, this::testContributor);		
 		Requirement<ResourceSetRequirement, ResourceSet> requirement = ServiceCapabilityFactory.createRequirement(ResourceSet.class, this::testFactory, serviceRequirement);		
 		for (CapabilityProvider<?> cp: capabilityLoader.load(requirement, progressMonitor)) {
-			return configureResourceSet((ResourceSet) cp.getPublisher().blockFirst());
+			return (ResourceSet) cp.getPublisher().blockFirst();
 		}	
 
-		return configureResourceSet(createDefaultResourceSet()); // Fall-back if there are no capability providers.
+		ResourceSetImpl defaultResourceSet = createDefaultResourceSet();
+		configureResourceSet(defaultResourceSet);
+		return defaultResourceSet; // Fall-back if there are no capability providers.
 	}
 
-	protected ResourceSet configureResourceSet(ResourceSet resourceSet) {
+	protected void configureResourceSet(ResourceSet resourceSet) {
 		if (extensionResourceFactories != null) {
 			Map<String, Object> extensionToFactoryMap = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
 			for (Entry<String, Class<?>> ee: extensionResourceFactories.entrySet()) {
@@ -81,7 +83,6 @@ protected ResourceSet configureResourceSet(ResourceSet resourceSet) {
 				}
 			}
 		}
-		return resourceSet;
 	}
 
 	protected ResourceSetImpl createDefaultResourceSet() {

emf/src/main/java/org/nasdanika/emf/persistence/EObjectCapabilityFactory.java

@@ -36,7 +36,7 @@ protected EObject load(EObjectRequirement requirement, ResourceSet resourceSet,
 	@Override
 	protected ResourceSetRequirement getResourceSetRequirement(EObjectRequirement serviceRequirement) {
 		ResourceSetRequirement resourceSetRequirement = serviceRequirement.resourceSetRequirement();		
-		return resourceSetRequirement == null ? new ResourceSetRequirement(new NcoreResourceSet(), null) : resourceSetRequirement;
+		return resourceSetRequirement == null ? new ResourceSetRequirement(new NcoreResourceSet(), null, null) : resourceSetRequirement;
 	}
 
 }