This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 32ac095e09f1b2fbe472aaa3cdbce26be5855a71 Author: Amichai Rothman <[email protected]> AuthorDate: Mon Mar 16 03:02:20 2026 +0200 Move and cleanup EndpointEventListenerTracker --- .../aries/rsa/topologymanager/Activator.java | 7 +++-- .../EndpointEventListenerTracker.java | 35 ++++++++++------------ .../exporter/TopologyManagerExport.java | 4 +-- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java index c80be7a2..bb07f761 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import org.apache.aries.rsa.spi.ExportPolicy; import org.apache.aries.rsa.topologymanager.exporter.DefaultExportPolicy; +import org.apache.aries.rsa.topologymanager.exporter.EndpointEventListenerTracker; import org.apache.aries.rsa.topologymanager.exporter.EndpointListenerNotifier; import org.apache.aries.rsa.topologymanager.exporter.TopologyManagerExport; import org.apache.aries.rsa.topologymanager.importer.NamedThreadFactory; @@ -79,7 +80,7 @@ public class Activator implements BundleActivator { private ServiceTracker<ExportPolicy, ExportPolicy> policyTracker; private EndpointListenerManager endpointListenerManager; - private EndpointEventListenerTracker epeListenerTracker; + private EndpointEventListenerTracker endpointEventListenerTracker; public void start(final BundleContext bc) throws Exception { Dictionary<String, String> props = new Hashtable<>(); @@ -122,14 +123,14 @@ public class Activator implements BundleActivator { notifier = new EndpointListenerNotifier(); exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory(TopologyManagerExport.class)); exportManager = new TopologyManagerExport(notifier, exportExecutor, policy); - epeListenerTracker = new EndpointEventListenerTracker(bc, exportManager); + endpointEventListenerTracker = new EndpointEventListenerTracker(bc, exportManager); importManager = new TopologyManagerImport(bc); endpointListenerManager = new EndpointListenerManager(bc, importManager); endpointListenerManager.start(); rsaTracker = new RSATracker(bc, RemoteServiceAdmin.class, null); bc.addServiceListener(exportManager); rsaTracker.open(); - epeListenerTracker.open(); + endpointEventListenerTracker.open(); exportExistingServices(bc); importManager.start(); } diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/EndpointEventListenerTracker.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/EndpointEventListenerTracker.java similarity index 53% rename from topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/EndpointEventListenerTracker.java rename to topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/EndpointEventListenerTracker.java index d0d8b8ed..40f744db 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/EndpointEventListenerTracker.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/EndpointEventListenerTracker.java @@ -16,10 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.aries.rsa.topologymanager; +package org.apache.aries.rsa.topologymanager.exporter; -import org.apache.aries.rsa.topologymanager.exporter.EndpointListenerNotifier; -import org.apache.aries.rsa.topologymanager.exporter.TopologyManagerExport; import org.osgi.framework.BundleContext; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkUtil; @@ -28,41 +26,40 @@ import org.osgi.framework.ServiceReference; import org.osgi.service.remoteserviceadmin.EndpointEventListener; import org.osgi.util.tracker.ServiceTracker; -@SuppressWarnings({ "deprecation", "rawtypes", "unchecked" }) -final class EndpointEventListenerTracker extends ServiceTracker<EndpointEventListener, EndpointEventListener> { - private TopologyManagerExport tmExport; +public final class EndpointEventListenerTracker extends ServiceTracker<EndpointEventListener, EndpointEventListener> { + private final TopologyManagerExport tme; - EndpointEventListenerTracker(BundleContext context, TopologyManagerExport tmExport) { + public EndpointEventListenerTracker(BundleContext context, TopologyManagerExport tme) { super(context, getFilter(), null); - this.tmExport = tmExport; + this.tme = tme; } private static Filter getFilter() { - String filterSt = String.format("(objectClass=%s)", EndpointEventListener.class.getName()); + String filter = String.format("(objectClass=%s)", EndpointEventListener.class.getName()); try { - return FrameworkUtil.createFilter(filterSt); + return FrameworkUtil.createFilter(filter); } catch (InvalidSyntaxException e) { throw new IllegalArgumentException(e.getMessage(), e); } } @Override - public EndpointEventListener addingService(ServiceReference reference) { - EndpointEventListener listener = super.addingService(reference); - this.tmExport.addEPListener(listener, EndpointListenerNotifier.filtersFromEEL(reference)); + public EndpointEventListener addingService(ServiceReference sref) { + EndpointEventListener listener = super.addingService(sref); + tme.addEndpointEventListener(listener, EndpointListenerNotifier.filtersFromEEL(sref)); return listener; } @Override - public void modifiedService(ServiceReference reference, EndpointEventListener listener) { - this.tmExport.addEPListener(listener, EndpointListenerNotifier.filtersFromEEL(reference)); - super.modifiedService(reference, listener); + public void modifiedService(ServiceReference sref, EndpointEventListener listener) { + tme.addEndpointEventListener(listener, EndpointListenerNotifier.filtersFromEEL(sref)); + super.modifiedService(sref, listener); } @Override - public void removedService(ServiceReference reference, EndpointEventListener listener) { - this.tmExport.removeEPListener(listener); - super.removedService(reference, listener); + public void removedService(ServiceReference sref, EndpointEventListener listener) { + tme.removeEndpointEventListener(listener); + super.removedService(sref, listener); } } diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java index 5423ce87..4e3b16e5 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java @@ -186,7 +186,7 @@ public class TopologyManagerExport implements ServiceListener { return exported != null && !exported.isEmpty() || addExported != null && !addExported.isEmpty(); } - public void addEPListener(EndpointEventListener listener, Set<Filter> filters) { + public void addEndpointEventListener(EndpointEventListener listener, Set<Filter> filters) { Collection<EndpointDescription> endpoints = new ArrayList<>(); for (ServiceExportsRepository repo : endpointRepo.values()) { endpoints.addAll(repo.getAllEndpoints()); @@ -194,7 +194,7 @@ public class TopologyManagerExport implements ServiceListener { notifier.add(listener, filters, endpoints); } - public void removeEPListener(EndpointEventListener listener) { + public void removeEndpointEventListener(EndpointEventListener listener) { notifier.remove(listener); } }
