.subscribe( -> .filter(Objects::nonNull).collectList().block().forEach(

Author: pvlasov

cli/src/main/java/org/nasdanika/models/app/cli/HelpSiteCommand.java

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.Objects;
 
 import org.eclipse.emf.common.util.DiagnosticException;
 import org.eclipse.emf.common.util.URI;
@@ -111,7 +112,7 @@ protected int generate(Context context, ProgressMonitor progressMonitor) throws
 			Requirement<Object, DocumentationFactory> requirement = ServiceCapabilityFactory.createRequirement(DocumentationFactory.class, null, new DocumentationFactory.Requirement(true));
 			Iterable<CapabilityProvider<Object>> cpi = capabilityLoader.load(requirement, progressMonitor);
 			for (CapabilityProvider<Object> cp: cpi) {				
-				cp.getPublisher().subscribe(df -> documentationFactories.add((DocumentationFactory) df));
+				cp.getPublisher().filter(Objects::nonNull).collectList().block().forEach(df -> documentationFactories.add((DocumentationFactory) df));
 			}
 		}		
 

graph/src/main/java/org/nasdanika/models/app/graph/drawio/DrawioProcessorFactory.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
@@ -50,7 +51,7 @@ public Collection<DocumentationFactory> getDocumentationFactories(ProgressMonito
 				Requirement<Object, DocumentationFactory> requirement = ServiceCapabilityFactory.createRequirement(DocumentationFactory.class, null, new DocumentationFactory.Requirement(true));
 				Iterable<CapabilityProvider<Object>> cpi = capabilityLoader.load(requirement, progressMonitor);
 				for (CapabilityProvider<Object> cp: cpi) {				
-					cp.getPublisher().subscribe(df -> documentationFactories.add((DocumentationFactory) df));
+					cp.getPublisher().filter(Objects::nonNull).collectList().block().forEach(df -> documentationFactories.add((DocumentationFactory) df));
 				}
 			}
 		}

graph/src/main/java/org/nasdanika/models/app/graph/emf/HtmlAppGenerator.java

@@ -10,6 +10,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -173,7 +174,7 @@ public static <T extends HtmlAppGenerator> T load(
 
 		Map<EPackage, URI> references = new IdentityHashMap<EPackage, URI>();
 		for (CapabilityProvider<Object> resourceSetContributorProvider: capabilityLoader.load(contributorRequirement, progressMonitor)) {
-			resourceSetContributorProvider.getPublisher().subscribe(contributor -> {
+			resourceSetContributorProvider.getPublisher().filter(Objects::nonNull).collectList().block().forEach(contributor -> {
 				if (contributor instanceof EPackageResourceSetContributor) {
 					EPackageResourceSetContributor ePackageResourceSetContributor = (EPackageResourceSetContributor) contributor;
 					URI docURI = ePackageResourceSetContributor.getDocumentationURI();
@@ -209,7 +210,7 @@ public static <T extends HtmlAppGenerator> T load(
 				prototypeProvider, 
 				diagnosticConsumer);
 		for (CapabilityProvider<Object> nodeProcessorProvider: capabilityLoader.load(requirement, progressMonitor)) {
-			nodeProcessorProvider.getPublisher().subscribe(nodeProcessorFactories::add);
+			nodeProcessorProvider.getPublisher().filter(Objects::nonNull).collectList().block().forEach(nodeProcessorFactories::add);
 		}
 
 		return factory.create(