Merge pull request #25020 from OndroMih/ondromih-hk2-events

Use the standard HK2 topic service
eclipse-ee4j · Jul 5, 2024 · a121197 · a121197
2 parents 123c605 + fcfd6f3
commit a121197
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 117 deletions.
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
@@ -551,6 +551,11 @@
             <artifactId>hk2-utils</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-extras</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>

diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
@@ -115,6 +115,11 @@
             <artifactId>hk2-utils</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-extras</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>

diff --git a/...service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java b/...service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java
@@ -43,9 +43,9 @@
 import org.glassfish.hk2.api.PostConstruct;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.api.TypeLiteral;
+import org.glassfish.hk2.extras.ExtrasUtilities;
 import org.glassfish.hk2.utilities.Binder;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.hk2util.SimpleTopicDistributionService;
 import org.glassfish.internal.api.InternalSystemAdministrator;
 import org.glassfish.internal.api.ServerContext;
 import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpContainer;
@@ -142,12 +142,7 @@ private JerseyContainer getJerseyContainer(ResourceConfig config) {
                 () -> this + ": Creating Jersey container for " + HttpHandler.class + " and " + config);
             final GrizzlyHttpContainer httpHandler = ContainerFactory.createContainer(GrizzlyHttpContainer.class, config);
             final ServiceLocator jerseyLocator = httpHandler.getApplicationHandler().getInjectionManager().getInstance(ServiceLocator.class);
-        /*
-            We enable a temporary distribution service until the HK2 Extras package is fixed so that we can enable
-            the topic distribution service provided by HK2.
-        */
-        //ExtrasUtilities.enableTopicDistribution(jerseyLocator);
-        SimpleTopicDistributionService.enable(jerseyLocator);
+            ExtrasUtilities.enableTopicDistribution(jerseyLocator);
         return new JerseyContainer() {
                 @Override
                 public void service(Request request, Response response) throws Exception {

diff --git a/...s/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java b/...s/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java
@@ -59,9 +59,9 @@
 import org.glassfish.hk2.api.PostConstruct;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.api.TypeLiteral;
+import org.glassfish.hk2.extras.ExtrasUtilities;
 import org.glassfish.hk2.utilities.Binder;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.hk2util.SimpleTopicDistributionService;
 import org.glassfish.internal.api.AdminAccessController;
 import org.glassfish.internal.api.RemoteAdminAccessException;
 import org.glassfish.internal.api.ServerContext;
@@ -282,12 +282,7 @@ private JerseyContainer getJerseyContainer(ResourceConfig config) {
             () -> this + ": Creating Jersey container for " + HttpHandler.class + " and " + config);
         final GrizzlyHttpContainer httpHandler = ContainerFactory.createContainer(GrizzlyHttpContainer.class, config);
         final ServiceLocator jerseyLocator = httpHandler.getApplicationHandler().getInjectionManager().getInstance(ServiceLocator.class);
-                /*
-            We enable a temporary distribution service until the HK2 Extras package is fixed so that we can enable
-            the topic distribution service provided by HK2.
-        */
-        //ExtrasUtilities.enableTopicDistribution(jerseyLocator);
-        SimpleTopicDistributionService.enable(jerseyLocator);
+        ExtrasUtilities.enableTopicDistribution(jerseyLocator);
         return new JerseyContainer() {
             @Override
             public void service(Request request, Response response) throws Exception {

diff --git a/...ommon/common-util/src/main/java/org/glassfish/hk2util/SimpleTopicDistributionService.java b/...ommon/common-util/src/main/java/org/glassfish/hk2util/SimpleTopicDistributionService.java
diff --git a/...us/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/GlassFishImpl.java b/...us/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/GlassFishImpl.java
@@ -24,7 +24,7 @@
 import org.glassfish.hk2.api.ServiceLocator;
 
 import java.util.Properties;
-import org.glassfish.hk2util.SimpleTopicDistributionService;
+import org.glassfish.hk2.extras.ExtrasUtilities;
 
 /**
  * @author [email protected]
@@ -43,8 +43,7 @@ public GlassFishImpl(ModuleStartup gfKernel, ServiceLocator habitat, Properties
             We enable a temporary distribution service until the HK2 Extras package is fixed so that we can enable
             the topic distribution service provided by HK2.
         */
-        //ExtrasUtilities.enableTopicDistribution(habitat);
-        SimpleTopicDistributionService.enable(habitat);
+        ExtrasUtilities.enableTopicDistribution(habitat);
 
         configure(gfProps);
     }