You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/11/13 13:40:39 UTC
[karaf-winegrower] branch master updated: ensure getAllServices
works well and type filtering is no too restricted
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-winegrower.git
The following commit(s) were added to refs/heads/master by this push:
new 867a973 ensure getAllServices works well and type filtering is no too restricted
new c497bdf Merge pull request #3 from rmannibucau/better-services-type-filtering
867a973 is described below
commit 867a973858f443d08287c3983d904cf85135c3fd
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Wed Nov 13 14:16:34 2019 +0100
ensure getAllServices works well and type filtering is no too restricted
---
.../winegrower/deployer/BundleContextImpl.java | 25 ++++++++-
.../winegrower/service/ServiceListenerTest.java | 35 +++++++++++++
.../apache/winegrower/test/hook/RegisterHooks.java | 2 +-
.../winegrower/test/hook/ServiceReplacer.java | 6 ---
.../test/listener/filter/Registrator.java | 60 ++++++++++++++++++++++
5 files changed, 120 insertions(+), 8 deletions(-)
diff --git a/winegrower-core/src/main/java/org/apache/winegrower/deployer/BundleContextImpl.java b/winegrower-core/src/main/java/org/apache/winegrower/deployer/BundleContextImpl.java
index 9d823a0..ffcc271 100644
--- a/winegrower-core/src/main/java/org/apache/winegrower/deployer/BundleContextImpl.java
+++ b/winegrower-core/src/main/java/org/apache/winegrower/deployer/BundleContextImpl.java
@@ -269,14 +269,37 @@ public class BundleContextImpl implements BundleContext {
final Filter predicate = filter == null ? null : createFilter(filter);
final List<ServiceReference> references = services.getServices().stream()
.map(ServiceRegistrationImpl.class::cast)
- .filter(it -> it.getClasses() != null && asList(it.getClasses()).contains(clazz))
.filter(it -> predicate == null || predicate.match(it.getReference()))
+ .filter(it -> clazz == null || Object.class.getName().equals(clazz) ||
+ (it.getClasses() != null && matches(clazz, it)))
.map(ServiceRegistration::getReference)
.collect(toList());
invokeServiceFindHooks(clazz, filter, checkAssignable, references);
return references.toArray(EMPTY_REFS);
}
+ private boolean matches(final String clazz, final ServiceRegistrationImpl reg) {
+ return asList(reg.getClasses()).contains(clazz) || deepMatches(clazz, reg);
+ }
+
+ private boolean deepMatches(final String clazz, final ServiceRegistrationImpl reg) {
+ final Class<?> expected;
+ try {
+ expected = Thread.currentThread().getContextClassLoader().loadClass(clazz);
+ } catch (final ClassNotFoundException e) {
+ return false;
+ }
+ return Stream.of(reg.getClasses())
+ .flatMap(it -> {
+ try {
+ return Stream.of(reg.getReference().getBundle().loadClass(it));
+ } catch (final ClassNotFoundException e) {
+ return Stream.empty();
+ }
+ })
+ .anyMatch(expected::isAssignableFrom);
+ }
+
private void invokeServiceFindHooks(final String clazz, final String filter,
final boolean checkAssignable, final List<ServiceReference> references) {
final Collection<ServiceReference<FindHook>> findHooks = services.getHooks().getServiceFindHooks();
diff --git a/winegrower-core/src/test/java/org/apache/winegrower/service/ServiceListenerTest.java b/winegrower-core/src/test/java/org/apache/winegrower/service/ServiceListenerTest.java
new file mode 100644
index 0000000..4cf1688
--- /dev/null
+++ b/winegrower-core/src/test/java/org/apache/winegrower/service/ServiceListenerTest.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2006-2019 Talend Inc. - www.talend.com
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.winegrower.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.winegrower.Ripener;
+import org.apache.winegrower.test.WithRipener;
+import org.junit.jupiter.api.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+class ServiceListenerTest {
+ @Test
+ @WithRipener(includeResources = @WithRipener.Entry(path = "org.apache.winegrower.test.listener.filter"))
+ void withFilter(@WithRipener.Service final Ripener ripener) throws InvalidSyntaxException {
+ final BundleContext context = ripener.getRegistry().getBundles().get(0L).getBundle().getBundleContext();
+ final ServiceReference<?>[] references = context.getAllServiceReferences(null, "(org.apache.winegrower.test.listener.filter.Registrator=true)");
+ assertEquals(1, references.length);
+ }
+}
diff --git a/winegrower-core/src/test/java/org/apache/winegrower/test/hook/RegisterHooks.java b/winegrower-core/src/test/java/org/apache/winegrower/test/hook/RegisterHooks.java
index c23e957..ae88b40 100644
--- a/winegrower-core/src/test/java/org/apache/winegrower/test/hook/RegisterHooks.java
+++ b/winegrower-core/src/test/java/org/apache/winegrower/test/hook/RegisterHooks.java
@@ -29,7 +29,7 @@ public class RegisterHooks implements BundleActivator {
public void start(final BundleContext context) {
// in practise we would get all services to replace existing one too,
// here we control what we want to replace (replaced=true) so let's keep it simple for tests
- final ServiceReplacer replacer = new ServiceReplacer(context.getBundle().getBundleId());
+ final ServiceReplacer replacer = new ServiceReplacer();
context.addServiceListener(replacer);
context.registerService(
new String[] { FindHook.class.getName(), EventListenerHook.class.getName() },
diff --git a/winegrower-core/src/test/java/org/apache/winegrower/test/hook/ServiceReplacer.java b/winegrower-core/src/test/java/org/apache/winegrower/test/hook/ServiceReplacer.java
index abb8bf8..db9ebe1 100644
--- a/winegrower-core/src/test/java/org/apache/winegrower/test/hook/ServiceReplacer.java
+++ b/winegrower-core/src/test/java/org/apache/winegrower/test/hook/ServiceReplacer.java
@@ -27,12 +27,6 @@ import org.osgi.framework.hooks.service.FindHook;
import org.osgi.framework.hooks.service.ListenerHook;
public class ServiceReplacer implements FindHook, EventListenerHook, ServiceListener {
- private final long bundleId;
-
- public ServiceReplacer(final long bundleId) {
- this.bundleId = bundleId;
- }
-
@Override // replaced services are not forward to listeners except the bundle owning the replacer and #0 (optional for the test)
public void event(final ServiceEvent event, final Map<BundleContext, Collection<ListenerHook.ListenerInfo>> listeners) {
if (event.getServiceReference().getProperty("replaced") != null) {
diff --git a/winegrower-core/src/test/java/org/apache/winegrower/test/listener/filter/Registrator.java b/winegrower-core/src/test/java/org/apache/winegrower/test/listener/filter/Registrator.java
new file mode 100644
index 0000000..346a04d
--- /dev/null
+++ b/winegrower-core/src/test/java/org/apache/winegrower/test/listener/filter/Registrator.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (C) 2006-2019 Talend Inc. - www.talend.com
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.winegrower.test.listener.filter;
+
+import static org.osgi.framework.Constants.BUNDLE_ACTIVATOR;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+
+import org.osgi.annotation.bundle.Header;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+
+@Header(name = BUNDLE_ACTIVATOR, value = "${@class}")
+public class Registrator implements ServiceListener, BundleActivator {
+ private final Collection<ServiceEvent> events = new ArrayList<>();
+
+ public Collection<ServiceEvent> getEvents() {
+ return events;
+ }
+
+ @Override
+ public void serviceChanged(final ServiceEvent event) {
+ synchronized (events) {
+ events.add(event);
+ }
+ }
+
+ @Override
+ public void start(final BundleContext context) throws Exception {
+ context.addServiceListener(this, "(org.apache.winegrower.test.listener.filter.Registrator=true)");
+
+ final Hashtable<String, Object> properties = new Hashtable<>();
+ properties.put("org.apache.winegrower.test.listener.filter.Registrator", "true");
+ context.registerService(Registrator.class, this, properties);
+ }
+
+ @Override
+ public void stop(final BundleContext context) {
+ context.removeServiceListener(this);
+ }
+
+ public static class SimpleService {}
+}