This is an automated email from the ASF dual-hosted git repository. amichair pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 82b7237bfcf7e3563ee384247b95cb9f66fdc03e Author: Amichai Rothman <[email protected]> AuthorDate: Mon Mar 30 00:17:23 2026 +0300 Refactor RemoteServiceAdminCore.getExportedServices/getImportedServices --- .../aries/rsa/core/RemoteServiceAdminCore.java | 34 +++++++++------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java index 1f369bdd..72f056c5 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java @@ -33,6 +33,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -378,36 +379,27 @@ public class RemoteServiceAdminCore implements RemoteServiceAdmin { @Override public Collection<ExportReference> getExportedServices() { synchronized (exportedServices) { - List<ExportReference> ers = new ArrayList<>(); - for (Collection<ExportRegistration> exportRegistrations : exportedServices.values()) { - for (ExportRegistration er : exportRegistrations) { - if (er.getException() == null && er.getExportReference() != null) { - ers.add(er.getExportReference()); - } - } - } - return Collections.unmodifiableCollection(ers); + return exportedServices.values().stream() + .flatMap(Collection::stream) + .filter(reg -> reg.getException() == null) + .map(ExportRegistration::getExportReference) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } } @Override public Collection<ImportReference> getImportedEndpoints() { synchronized (importedServices) { - List<ImportReference> irs = new ArrayList<>(); - for (Collection<ImportRegistration> irl : importedServices.values()) { - for (ImportRegistration impl : irl) { - if (impl.getException() == null && impl.getImportReference() != null) { - irs.add(impl.getImportReference()); - } - } - } - return Collections.unmodifiableCollection(irs); + return importedServices.values().stream() + .flatMap(Collection::stream) + .filter(reg -> reg.getException() == null) + .map(ImportRegistration::getImportReference) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } } - /** - * Importing form here... - */ @Override public ImportRegistration importService(EndpointDescription endpoint) { LOG.debug("importService() Endpoint: {}", endpoint.getProperties());
