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/09/11 13:15:50 UTC
[aries-jax-rs-whiteboard] 09/10: [ARIES-1928] No need to register
the registrators in OSGi registry
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 719850452f78833fc86ca8ddd3b8a49547963cec
Author: Carlos Sierra <cs...@apache.org>
AuthorDate: Wed Sep 11 12:29:18 2019 +0200
[ARIES-1928] No need to register the registrators in OSGi registry
---
jax-rs.itests/src/main/java/test/JaxrsTest.java | 108 ++++++++++-----------
.../jax/rs/whiteboard/internal/Whiteboard.java | 5 +-
2 files changed, 50 insertions(+), 63 deletions(-)
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index 65cfb9b..094364a 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -1402,39 +1402,33 @@ public class JaxrsTest extends TestHelper {
properties.put("default.web", "false");
- CountDownLatch countDownLatch = new CountDownLatch(3);
+ CountDownLatch countDownLatch = new CountDownLatch(6);
- ServiceTracker<Object, Object> tracker =
+ ServiceTracker<?, ?> tracker =
new ServiceTracker<>(
bundleContext,
- bundleContext.createFilter(
- "(&(osgi.jaxrs.name=.default)" +
- "(objectClass=org.apache.aries.jax.rs.whiteboard." +
- "internal.cxf.CxfJaxrsServiceRegistrator))"),
- new ServiceTrackerCustomizer<Object, Object>() {
-
+ JaxrsServiceRuntime.class,
+ new ServiceTrackerCustomizer<JaxrsServiceRuntime, Object>() {
@Override
public Object addingService(
- ServiceReference<Object> serviceReference) {
-
- countDownLatch.countDown();
+ ServiceReference<JaxrsServiceRuntime> reference) {
- return serviceReference;
+ return reference;
}
@Override
public void modifiedService(
- ServiceReference<Object> serviceReference,
- Object o) {
+ ServiceReference<JaxrsServiceRuntime> reference,
+ Object service) {
+ countDownLatch.countDown();
}
@Override
public void removedService(
- ServiceReference<Object> serviceReference,
- Object o) {
+ ServiceReference<JaxrsServiceRuntime> reference,
+ Object service) {
- countDownLatch.countDown();
}
});
@@ -1444,44 +1438,40 @@ public class JaxrsTest extends TestHelper {
countDownLatch.await(1, TimeUnit.MINUTES);
+ tracker.close();
+
assertTrue(
defaultTarget.request().get(String.class).
contains("No services have been found"));
}
finally {
- CountDownLatch countDownLatch = new CountDownLatch(3);
+ CountDownLatch countDownLatch = new CountDownLatch(6);
- ServiceTracker<Object, Object> tracker =
+ ServiceTracker<?, ?> tracker =
new ServiceTracker<>(
bundleContext,
- bundleContext.createFilter(
- "(&(osgi.jaxrs.name=.default)" +
- "(objectClass=org.apache.aries.jax.rs.whiteboard." +
- "internal.cxf.CxfJaxrsServiceRegistrator))"),
- new ServiceTrackerCustomizer<Object, Object>() {
-
+ JaxrsServiceRuntime.class,
+ new ServiceTrackerCustomizer<JaxrsServiceRuntime, Object>() {
@Override
public Object addingService(
- ServiceReference<Object> serviceReference) {
+ ServiceReference<JaxrsServiceRuntime> reference) {
- countDownLatch.countDown();
-
- return serviceReference;
+ return reference;
}
@Override
public void modifiedService(
- ServiceReference<Object> serviceReference,
- Object o) {
+ ServiceReference<JaxrsServiceRuntime> reference,
+ Object service) {
+ countDownLatch.countDown();
}
@Override
public void removedService(
- ServiceReference<Object> serviceReference,
- Object o) {
+ ServiceReference<JaxrsServiceRuntime> reference,
+ Object service) {
- countDownLatch.countDown();
}
});
@@ -1490,6 +1480,8 @@ public class JaxrsTest extends TestHelper {
configuration.delete();
countDownLatch.await(1, TimeUnit.MINUTES);
+
+ tracker.close();
}
assertFalse(
@@ -1524,39 +1516,38 @@ public class JaxrsTest extends TestHelper {
properties.put("default.application.base", "defaultpath");
- CountDownLatch countDownLatch = new CountDownLatch(3);
+ CountDownLatch countDownLatch = new CountDownLatch(6);
- ServiceTracker<Object, Object> tracker =
+ ServiceTracker<?, ?> tracker =
new ServiceTracker<>(
bundleContext,
- bundleContext.createFilter(
- "(&(osgi.jaxrs.name=.default)" +
- "(objectClass=org.apache.aries.jax.rs.whiteboard." +
- "internal.cxf.CxfJaxrsServiceRegistrator))"),
- new ServiceTrackerCustomizer<Object, Object>() {
+ JaxrsServiceRuntime.class,
+ new ServiceTrackerCustomizer<
+ JaxrsServiceRuntime, Object>() {
@Override
public Object addingService(
- ServiceReference<Object> serviceReference) {
-
- countDownLatch.countDown();
+ ServiceReference<JaxrsServiceRuntime>
+ serviceReference) {
return serviceReference;
}
@Override
public void modifiedService(
- ServiceReference<Object> serviceReference,
+ ServiceReference<JaxrsServiceRuntime>
+ serviceReference,
Object o) {
+ countDownLatch.countDown();
}
@Override
public void removedService(
- ServiceReference<Object> serviceReference,
+ ServiceReference<JaxrsServiceRuntime>
+ serviceReference,
Object o) {
- countDownLatch.countDown();
}
});
@@ -1577,37 +1568,36 @@ public class JaxrsTest extends TestHelper {
finally {
CountDownLatch countDownLatch = new CountDownLatch(3);
- ServiceTracker<Object, Object> tracker =
+ ServiceTracker<?, ?> tracker =
new ServiceTracker<>(
bundleContext,
- bundleContext.createFilter(
- "(&(osgi.jaxrs.name=.default)" +
- "(objectClass=org.apache.aries.jax.rs.whiteboard." +
- "internal.cxf.CxfJaxrsServiceRegistrator))"),
- new ServiceTrackerCustomizer<Object, Object>() {
+ JaxrsServiceRuntime.class,
+ new ServiceTrackerCustomizer<
+ JaxrsServiceRuntime, Object>() {
@Override
public Object addingService(
- ServiceReference<Object> serviceReference) {
-
- countDownLatch.countDown();
+ ServiceReference<JaxrsServiceRuntime>
+ serviceReference) {
return serviceReference;
}
@Override
public void modifiedService(
- ServiceReference<Object> serviceReference,
+ ServiceReference<JaxrsServiceRuntime>
+ serviceReference,
Object o) {
+ countDownLatch.countDown();
}
@Override
public void removedService(
- ServiceReference<Object> serviceReference,
+ ServiceReference<JaxrsServiceRuntime>
+ serviceReference,
Object o) {
- countDownLatch.countDown();
}
});
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index 188513e..733adec 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -628,11 +628,8 @@ public class Whiteboard {
registerCXFServletService(
registrator.getBus(), properties, contextReference).
then(
- register(
- CxfJaxrsServiceRegistrator.class, registrator, properties).
- then(
just(registrator)
- )))));
+ ))));
}
public OSGi<Map<String, ServiceTuple<Object>>> getCxfExtensions(