You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by am...@apache.org on 2026/05/01 07:19:38 UTC
(aries-rsa) 02/07: Refactor EventAdminSender to decouple methods
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 3477bdf7ef355c827613dc8faed40f2066dd93e9
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu Apr 30 01:31:53 2026 +0300
Refactor EventAdminSender to decouple methods
---
.../aries/rsa/core/event/EventAdminSender.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java b/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
index e8618e97..724362e1 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
@@ -51,8 +51,7 @@ public class EventAdminSender {
typeToTopic.put(RemoteServiceAdminEvent.IMPORT_WARNING, "IMPORT_WARNING");
}
- public void send(RemoteServiceAdminEvent rsaEvent) {
- final Event event = toEvent(rsaEvent);
+ private void notifyEventAdmins(Event event) {
ServiceReference<EventAdmin> sref = this.context.getServiceReference(EventAdmin.class);
if (sref != null) {
final EventAdmin eventAdmin = this.context.getService(sref);
@@ -66,8 +65,15 @@ public class EventAdminSender {
}
}
- private Event toEvent(RemoteServiceAdminEvent rsaEvent) {
- String topic = getTopic(rsaEvent);
+ public void send(RemoteServiceAdminEvent rsae) {
+ String type = typeToTopic.get(rsae.getType());
+ String topic = "org/osgi/service/remoteserviceadmin/" + type;
+ Map<String, Object> props = createProps(rsae);
+ Event event = new Event(topic, props);
+ notifyEventAdmins(event);
+ }
+
+ private Map<String, Object> createProps(RemoteServiceAdminEvent rsaEvent) {
Map<String, Object> props = new HashMap<>();
Bundle bundle = rsaEvent.getSource();
props.put("bundle", bundle);
@@ -93,10 +99,6 @@ public class EventAdminSender {
}
props.put("timestamp", System.currentTimeMillis());
props.put("event", rsaEvent);
- return new Event(topic, props);
- }
-
- private String getTopic(RemoteServiceAdminEvent rsaEvent) {
- return "org/osgi/service/remoteserviceadmin/" + typeToTopic.get(rsaEvent.getType());
+ return props;
}
}