Merge pull request #9 from timothyjward/fix/clientbuilder

Avoid errors with the ClientBuilder service
osgi · Jul 3, 2023 · e45bfd5 · e45bfd5
2 parents 77a4a3f + fd33706
commit e45bfd5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 48 deletions.
diff --git a/...h.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderComponent.java b/...h.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderComponent.java
@@ -15,11 +15,13 @@
 
 import static org.osgi.namespace.service.ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE;
 import static org.osgi.namespace.service.ServiceNamespace.SERVICE_NAMESPACE;
+import static org.osgi.service.serviceloader.ServiceLoaderNamespace.SERVICELOADER_NAMESPACE;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.eclipse.osgitech.rest.provider.JerseyConstants;
+import org.glassfish.jersey.client.JerseyClientBuilder;
 import org.osgi.annotation.bundle.Capability;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -36,7 +38,6 @@
 import org.osgi.service.jakartars.client.SseEventSourceFactory;
 
 import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.RxInvokerProvider;
 
 /**
  * 
@@ -64,14 +65,18 @@
 				"service.scope=bundle"
 		}
 )
+@Capability(
+		namespace = SERVICELOADER_NAMESPACE,
+		name = "jakarta.ws.rs.client.ClientBuilder",
+		attribute = "register:=\"\"",
+		uses = ClientBuilder.class
+)
 public class ClientBuilderComponent {
 
 	/** ECLIPSE_OS_GI_TECHNOLOGY */
 	private static final String SERVICE_VENDOR = "Eclipse OSGi Technology";
 	private ServiceRegistration<ClientBuilder> registerClientBuilderService;
 	private ServiceRegistration<SseEventSourceFactory> registerSseService;
-	@Reference
-	private RxInvokerProvider<PromiseRxInvoker> rxInvokerProvider;
 
 	@Activate
 	public void activate(BundleContext ctx) {
@@ -88,7 +93,7 @@ public void activate(BundleContext ctx) {
 			 */
 			@Override
 			public ClientBuilder getService(Bundle bundle, ServiceRegistration<ClientBuilder> registration) {
-				ClientBuilderService clientBuilder = new ClientBuilderService(rxInvokerProvider);
+				ClientBuilder clientBuilder = new JerseyClientBuilder().register(RxInvokerProviderImpl.class);
 				return clientBuilder;
 			}
 

diff --git a/...ech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderService.java b/...ech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderService.java
diff --git a/...ch.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/RxInvokerProviderImpl.java b/...ch.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/RxInvokerProviderImpl.java
@@ -15,18 +15,16 @@
 
 import java.util.concurrent.ExecutorService;
 
+import org.osgi.service.jakartars.client.PromiseRxInvoker;
+
 import jakarta.ws.rs.client.RxInvokerProvider;
 import jakarta.ws.rs.client.SyncInvoker;
 
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jakartars.client.PromiseRxInvoker;
-
 /**
  * 
  * @author ilenia
  * @since Jun 12, 2020
  */
-@Component(service = RxInvokerProvider.class)
 public class RxInvokerProviderImpl implements RxInvokerProvider<PromiseRxInvoker> {
 
 	/*