You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/11/16 21:49:09 UTC
[aries-rsa] branch master updated: ARIES-1780 - Fix cycle between
packages
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new c245463 ARIES-1780 - Fix cycle between packages
c245463 is described below
commit c2454633ac9aff751efe6ba5b3791b8747388e52
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Sat Nov 16 22:38:47 2019 +0100
ARIES-1780 - Fix cycle between packages
---
.../rsa/discovery/zookeeper/InterestManager.java | 8 +++++---
.../zookeeper/client/ZookeeperEndpointListener.java | 19 +++++++++----------
.../zookeeper/client/ZookeeperEndpointRepository.java | 4 ++--
.../rsa/discovery/zookeeper/InterestManagerTest.java | 3 +++
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
index 3d4f59e..0d22a47 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
@@ -56,7 +56,7 @@ public class InterestManager {
// Using ARepository name to make sure it is injected first
@Reference
public void bindARepository(ZookeeperEndpointRepository repository) {
- this.listener = repository.createListener(this::onEndpointChanged);
+ this.listener = repository.createListener(this::onEndpointEvent);
}
@Deactivate
@@ -65,7 +65,7 @@ public class InterestManager {
interests.clear();
}
- private void onEndpointChanged(EndpointEvent event, String filter) {
+ private void onEndpointEvent(EndpointEvent event) {
interests.forEach(interest -> interest.notifyListener(event));
}
@@ -103,7 +103,9 @@ public class InterestManager {
Interest interest = new Interest(sref, epListener);
update(interest);
if (listener != null) {
- listener.sendExistingEndpoints(interest);
+ listener.getEndpoints().stream()
+ .map(endpoint -> new EndpointEvent(EndpointEvent.ADDED, endpoint))
+ .forEach(interest::notifyListener);
}
}
diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
index fbacfe4..ba82e3a 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
@@ -20,11 +20,13 @@ package org.apache.aries.rsa.discovery.zookeeper.client;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
-import org.apache.aries.rsa.discovery.zookeeper.Interest;
import org.apache.aries.rsa.spi.EndpointDescriptionParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.ConnectionLossException;
@@ -35,7 +37,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.EndpointEvent;
-import org.osgi.service.remoteserviceadmin.EndpointEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,19 +52,17 @@ public class ZookeeperEndpointListener implements Closeable {
private EndpointDescriptionParser parser;
- private EndpointEventListener listener;
+ private Consumer<EndpointEvent> listener;
- ZookeeperEndpointListener(ZooKeeper zk, EndpointDescriptionParser parser, EndpointEventListener listener) {
+ ZookeeperEndpointListener(ZooKeeper zk, EndpointDescriptionParser parser, Consumer<EndpointEvent> listener) {
this.zk = zk;
this.parser = parser;
this.listener = listener;
watchRecursive(ZookeeperEndpointRepository.PATH_PREFIX);
}
- public void sendExistingEndpoints(Interest interest) {
- endpoints.values().stream()
- .map(endpoint -> new EndpointEvent(EndpointEvent.ADDED, endpoint))
- .forEach(interest::notifyListener);
+ public Collection<EndpointDescription> getEndpoints() {
+ return endpoints.values();
}
@Override
@@ -116,14 +115,14 @@ public class ZookeeperEndpointListener implements Closeable {
EndpointDescription old = endpoints.put(path, endpoint);
int type = old == null ? EndpointEvent.ADDED : EndpointEvent.MODIFIED;
EndpointEvent event = new EndpointEvent(type, endpoint);
- listener.endpointChanged(event, null);
+ listener.accept(event);
}
private void onRemoved(String path) {
EndpointDescription endpoint = endpoints.remove(path);
if (endpoint != null) {
EndpointEvent event = new EndpointEvent(EndpointEvent.REMOVED, endpoint);
- listener.endpointChanged(event, null);
+ listener.accept(event);
}
}
diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java
index 9f52b6e..a447246 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Consumer;
import org.apache.aries.rsa.spi.EndpointDescriptionParser;
import org.apache.zookeeper.CreateMode;
@@ -38,7 +39,6 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.EndpointEvent;
-import org.osgi.service.remoteserviceadmin.EndpointEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +79,7 @@ public class ZookeeperEndpointRepository {
}
}
- public ZookeeperEndpointListener createListener(EndpointEventListener listener) {
+ public ZookeeperEndpointListener createListener(Consumer<EndpointEvent> listener) {
return new ZookeeperEndpointListener(zk, parser, listener);
}
diff --git a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/InterestManagerTest.java b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/InterestManagerTest.java
index 15b2327..f771685 100644
--- a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/InterestManagerTest.java
+++ b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/InterestManagerTest.java
@@ -21,6 +21,8 @@ package org.apache.aries.rsa.discovery.zookeeper;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.util.Collections;
+
import org.apache.aries.rsa.discovery.zookeeper.client.ZookeeperEndpointListener;
import org.apache.aries.rsa.discovery.zookeeper.client.ZookeeperEndpointRepository;
import org.junit.Test;
@@ -51,6 +53,7 @@ public class InterestManagerTest {
@Test
public void testEndpointListenerTrackerCustomizer() {
when(repository.createListener(Mockito.any())).thenReturn(listener);
+ when(listener.getEndpoints()).thenReturn(Collections.emptyList());
im = new InterestManager();
im.bindARepository(repository);
ServiceReference<EndpointEventListener> sref = createService("(objectClass=mine)");