Refactor - move method handling registrations

The WhiteboardServletContainer was responsible for adding the components which supplied Promise handling and SSE handling to the container. This is better located in the JerseyApplication so that all containers gain the benefit. Signed-off-by: Tim Ward <timothyjward@apache.org>
osgi · Jul 13, 2023 · 56e5c73 · 56e5c73
1 parent 3a021a5
commit 56e5c73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/...tech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/WhiteboardServletContainer.java b/...tech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/WhiteboardServletContainer.java
@@ -20,17 +20,10 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.eclipse.osgitech.rest.annotations.RequireJerseyServlet;
-import org.eclipse.osgitech.rest.binder.PromiseResponseHandlerBinder;
 import org.eclipse.osgitech.rest.provider.jakartars.RuntimeDelegateService;
-import org.glassfish.hk2.api.ServiceLocator;
-import org.glassfish.hk2.api.ServiceLocatorFactory;
-import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
-import org.glassfish.jersey.servlet.ServletProperties;
-import org.glassfish.jersey.servlet.async.AsyncContextDelegateProviderImpl;
-import org.glassfish.jersey.servlet.init.FilterUrlMappingsProviderImpl;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -45,9 +38,6 @@
 @RequireJerseyServlet
 public class WhiteboardServletContainer extends ServletContainer {
 
-	/** SERVICE_LOCATOR_PREFIX */
-	private static final String SERVICE_LOCATOR_PREFIX = "JakartaRESTJerseyWhiteboard-";
-
 	/**
 	 * 
 	 */
@@ -58,16 +48,8 @@ public class WhiteboardServletContainer extends ServletContainer {
 	private final AtomicBoolean initialized = new AtomicBoolean();
 	private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
-	private final ServiceLocator locator;
-
 	public WhiteboardServletContainer(ResourceConfig config) {
 		initialConfig = config;
-
-		// Ensure that promise types can be returned by resource methods
-		locator = ServiceLocatorFactory.getInstance()
-			.create(SERVICE_LOCATOR_PREFIX + System.identityHashCode(this));
-		ServiceLocatorUtilities.bind(locator, new PromiseResponseHandlerBinder());
-		ServiceLocatorUtilities.addClasses(locator, AsyncContextDelegateProviderImpl.class, FilterUrlMappingsProviderImpl.class);
 	}
 
 	/* (non-Javadoc)
@@ -83,7 +65,6 @@ public void init() throws ServletException {
 			try {
 				Thread.currentThread().setContextClassLoader(RuntimeDelegateService.class.getClassLoader());
 
-				getServletContext().setAttribute(ServletProperties.SERVICE_LOCATOR, locator);
 				super.init();
 				// we have to wait until the injection manager is available on first start
 				Future<?> future = Executors.newSingleThreadExecutor().submit(()->{
@@ -189,6 +170,5 @@ public ResourceConfig getConfiguration() {
 	}
 
 	public void dispose() {
-		locator.shutdown();
 	}
 }
diff --git a/...h.rest/src/main/java/org/eclipse/osgitech/rest/runtime/application/JerseyApplication.java b/...h.rest/src/main/java/org/eclipse/osgitech/rest/runtime/application/JerseyApplication.java
@@ -13,22 +13,30 @@
  */
 package org.eclipse.osgitech.rest.runtime.application;
 
+import static java.util.stream.Collectors.toUnmodifiableSet;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import org.eclipse.osgitech.rest.binder.PromiseResponseHandlerBinder;
 import org.eclipse.osgitech.rest.binder.PrototypeServiceBinder;
 import org.eclipse.osgitech.rest.factories.InjectableFactory;
 import org.eclipse.osgitech.rest.factories.JerseyResourceInstanceFactory;
 import org.eclipse.osgitech.rest.runtime.application.feature.WhiteboardFeature;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.server.spi.AbstractContainerLifecycleListener;
 import org.glassfish.jersey.server.spi.Container;
+import org.glassfish.jersey.servlet.async.AsyncContextDelegateProviderImpl;
+import org.glassfish.jersey.servlet.init.FilterUrlMappingsProviderImpl;
 import org.osgi.framework.ServiceObjects;
 import org.osgi.service.jakartars.whiteboard.JakartarsWhiteboardConstants;
 
@@ -94,10 +102,10 @@ public Map<String, Object> getProperties() {
 	 */
 	@Override
 	public Set<Class<?>> getClasses() {
-		Set<Class<?>> resutlClasses = new HashSet<>();
-		resutlClasses.addAll(classes.values());
-		resutlClasses.addAll(sourceApplication.getClasses());
-		return Collections.unmodifiableSet(resutlClasses);
+		return Stream.of(classes.values().stream(), sourceApplication.getClasses().stream(),
+				Stream.of(PromiseResponseHandlerBinder.class, AsyncContextDelegateProviderImpl.class, FilterUrlMappingsProviderImpl.class))
+				.flatMap(Function.identity())
+				.collect(toUnmodifiableSet());
 	}
 
 	/*