Clean event dispatching code

Signed-off-by: Alexander Pinčuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Feb 11, 2024 · c25592c · c25592c
1 parent 1b3d946
commit c25592c
Show file tree

Hide file tree

Showing 33 changed files with 136 additions and 144 deletions.
diff --git a/...ssfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/...ssfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -143,7 +144,7 @@ private void registerIfBatchJobsDirExists(ApplicationInfo applicationInfo) {
     }
 
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         try {
             if (event.is(EventTypes.SERVER_READY)) {
                 for (String appName : applicationRegistry.getAllApplicationNames()) {

diff --git a/...ain/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java b/...ain/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -55,6 +55,7 @@
 
 import org.glassfish.api.admin.ProcessEnvironment;
 import org.glassfish.api.admin.ProcessEnvironment.ProcessType;
+import org.glassfish.api.deployment.DeploymentContext;
 import org.glassfish.api.event.EventListener;
 import org.glassfish.api.event.Events;
 import org.glassfish.api.naming.GlassfishNamingManager;
@@ -117,17 +118,17 @@ public void postConstruct() {
     }
 
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (event.is(APPLICATION_LOADED)) {
-            ApplicationInfo info = APPLICATION_LOADED.getHook(event);
-
+            ApplicationInfo info = (ApplicationInfo) event.hook();
             loadManagedBeans(info);
             registerAppLevelDependencies(info);
-
         } else if (event.is(APPLICATION_UNLOADED)) {
-            doCleanup(APPLICATION_UNLOADED.getHook(event).getMetaData(Application.class));
+            ApplicationInfo info = (ApplicationInfo) event.hook();
+            doCleanup(info.getMetaData(Application.class));
         } else if (event.is(DEPLOYMENT_FAILURE)) {
-            doCleanup(DEPLOYMENT_FAILURE.getHook(event).getModuleMetaData(Application.class));
+            DeploymentContext context = (DeploymentContext) event.hook();
+            doCleanup(context.getModuleMetaData(Application.class));
         }
     }
 

diff --git a/...tors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorApplication.java b/...tors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -263,7 +263,7 @@ public String getApplicationName() {
      * @param event Event
      */
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (Deployment.UNDEPLOYMENT_VALIDATION.equals(event.type())) {
             // this is an application undeploy event
             DeploymentContext dc = (DeploymentContext) event.hook();

diff --git a/...nectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java b/...nectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -594,7 +594,7 @@ private void unregisterBeanValidator(String rarName){
     }
 
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
 
         // added this pre-check so as to validate whether connector-resources referring
         // the application (that has rar or is an standalone rar) are present.

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -418,7 +418,7 @@ protected void generateArtifacts(DeploymentContext dc) throws DeploymentExceptio
     }
 
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (event.is(Deployment.APPLICATION_PREPARED) && isDas()) {
             ExtendedDeploymentContext context = (ExtendedDeploymentContext) event.hook();
             OpsParams opsparams = context.getCommandParameters(OpsParams.class);

diff --git a/...-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java b/...-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -68,14 +69,11 @@ public <K extends Serializable, V extends Serializable> BackingStore<K, V> creat
     public void postConstruct() {
         BackingStoreFactoryRegistry.register("replicated", this);
         Logger.getLogger(ShoalBackingStoreProxy.class.getName()).log(Level.FINE, "Registered SHOAL BackingStore Proxy with persistence-type = replicated");
-        EventListener glassfishEventListener = new EventListener() {
-            @Override
-            public void event(Event event) {
-                if (event.is(EventTypes.SERVER_SHUTDOWN)) {
-                    BackingStoreFactoryRegistry.unregister("replicated");
-                    Logger.getLogger(ShoalBackingStoreProxy.class.getName()).log(Level.FINE, "Unregistered SHOAL BackingStore Proxy with persistence-type = replicated");
-                } // else if (event.is(EventTypes.SERVER_READY)) {  }
-            }
+        EventListener glassfishEventListener = event -> {
+            if (event.is(EventTypes.SERVER_SHUTDOWN)) {
+                BackingStoreFactoryRegistry.unregister("replicated");
+                Logger.getLogger(ShoalBackingStoreProxy.class.getName()).log(Level.FINE, "Unregistered SHOAL BackingStore Proxy with persistence-type = replicated");
+            } // else if (event.is(EventTypes.SERVER_READY)) {  }
         };
         events.register(glassfishEventListener);
     }

diff --git a/...orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java b/...orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -89,15 +90,10 @@ public synchronized void setORB(ORB orb) {
         this.orb = orb;
 
         if (orb != null) {
-            EventListener glassfishEventListener = new EventListener() {
-
-                @Override
-                public void event(EventListener.Event event) {
-                    if (event.is(SERVER_SHUTDOWN)) {
-                        onShutdown();
-                    }
+            EventListener glassfishEventListener = event -> {
+                if (event.is(SERVER_SHUTDOWN)) {
+                    onShutdown();
                 }
-
             };
             eventsProvider.get().register(glassfishEventListener);
         }

diff --git a/...er/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/JPADeployer.java b/...er/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/JPADeployer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -177,7 +177,7 @@ public JPApplicationContainer load(JPAContainer container, DeploymentContext con
     }
 
     @Override
-    public void event(@SuppressWarnings("rawtypes") Event event) {
+    public void event(Event<?> event) {
         if (logger.isLoggable(Level.FINEST)) {
             logger.finest("JpaDeployer.event():" + event.name());
         }

diff --git a/...ces/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java b/...ces/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -770,7 +770,7 @@ private ResourceDeployer getResourceDeployer(Object resource){
      * config for persisting it in domain.xml
      */
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (event.is(Deployment.DEPLOYMENT_BEFORE_CLASSLOADER_CREATION)) {
             DeploymentContext dc = (DeploymentContext) event.hook();
             final DeployCommandParameters deployParams = dc.getCommandParameters(DeployCommandParameters.class);

diff --git a/...erver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java b/...erver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -110,8 +110,8 @@ public class SecurityDeployer extends SimpleDeployer<SecurityContainer, DummyApp
     private class AppDeployEventListener implements EventListener {
 
         @Override
-        public void event(Event event) {
-            Application application = null;
+        public void event(Event<?> event) {
+            Application application;
 
             if (MODULE_LOADED.equals(event.type())) {
                 ModuleInfo moduleInfo = (ModuleInfo) event.hook();

diff --git a/...api/src/main/java/com/sun/enterprise/transaction/startup/TransactionLifecycleService.java b/...api/src/main/java/com/sun/enterprise/transaction/startup/TransactionLifecycleService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -74,16 +74,13 @@ public class TransactionLifecycleService implements PostConstruct, PreDestroy {
 
     @Override
     public void postConstruct() {
-        EventListener glassfishEventListener = new EventListener() {
-            @Override
-            public void event(Event event) {
-                if (event.is(EventTypes.SERVER_READY)) {
-                    LOG.fine("TM LIFECYCLE SERVICE - ON READY");
-                    onReady();
-                } else if (event.is(EventTypes.PREPARE_SHUTDOWN)) {
-                    LOG.fine("TM LIFECYCLE SERVICE - ON SHUTDOWN");
-                    onShutdown();
-                }
+        EventListener glassfishEventListener = event -> {
+            if (event.is(EventTypes.SERVER_READY)) {
+                LOG.fine("TM LIFECYCLE SERVICE - ON READY");
+                onReady();
+            } else if (event.is(EventTypes.PREPARE_SHUTDOWN)) {
+                LOG.fine("TM LIFECYCLE SERVICE - ON SHUTDOWN");
+                onShutdown();
             }
         };
         events.register(glassfishEventListener);

diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Contributors to Eclipse Foundation.
+ * Copyright (c) 2021, 2024 Contributors to Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -551,7 +551,7 @@ public void postConstruct() {
     }
 
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (event.is(Deployment.ALL_APPLICATIONS_PROCESSED)) {
             // configure default web modules for virtual servers after all
             // applications are processed

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -333,7 +333,7 @@ public WeldApplicationContainer load(WeldContainer container, DeploymentContext
      * <code>BeanDeploymentArchive</code>s.
      */
     @Override
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (event.is(APPLICATION_LOADED)) {
             ApplicationInfo appInfo = (ApplicationInfo) event.hook();
             WeldBootstrap bootstrap = appInfo.getTransientAppMetaData(WELD_BOOTSTRAP, WeldBootstrap.class);

diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -193,7 +194,7 @@ public void preDestroy() {
         }
     }
 
-    public void event(Event event) {
+    public void event(Event<?> event) {
         if (event.is(EventTypes.SERVER_READY)) {
             // Process the XMLProviders in lib/monitor dir. Should be the last thing to do in server startup.
             if (logger.isLoggable(Level.FINE))

diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -836,28 +836,27 @@ private void initializeGMS() throws GMSException{
                     registerFailureRecoveryListener("GlassfishFailureRecoveryHandlerTest", this);
                 }
 
-                glassfishEventListener = new org.glassfish.api.event.EventListener() {
-                    public void event(Event event) {
-                        if (gms == null) {
-                            // handle cases where gms is not set and for some reason this handler did not get unregistered.
-                            return;
-                        }
-                        if (event.is(EventTypes.SERVER_SHUTDOWN)) {
-                            GMS_LOGGER.log(LogLevel.INFO, GMS_SERVER_SHUTDOWN_RECEIVED,
-                                       new Object[]{gms.getInstanceName(), gms.getGroupName(), event.name()});
-
-                            // todo: remove these when removing the test register ones above.
-                            removeJoinedAndReadyNotificationListener(GMSAdapterImpl.this);
-                            removeJoinNotificationListener(GMSAdapterImpl.this);
-                            removeFailureNotificationListener(GMSAdapterImpl.this);
-                            removeFailureSuspectedListener(GMSAdapterImpl.this);
-                            gms.shutdown(GMSConstants.shutdownType.INSTANCE_SHUTDOWN);
-                            removePlannedShutdownListener(GMSAdapterImpl.this);
-                            events.unregister(glassfishEventListener);
-                        } else if (event.is(EventTypes.SERVER_READY)) {
-                             // consider putting following, includding call to joinedAndReady into a timertask.
-                              // this time would give instance time to get its heartbeat cache updated by all running
-                              // READY cluster memebrs
+                glassfishEventListener = event -> {
+                    if (gms == null) {
+                        // handle cases where gms is not set and for some reason this handler did not get unregistered.
+                        return;
+                    }
+                    if (event.is(EventTypes.SERVER_SHUTDOWN)) {
+                        GMS_LOGGER.log(LogLevel.INFO, GMS_SERVER_SHUTDOWN_RECEIVED,
+                                   new Object[]{gms.getInstanceName(), gms.getGroupName(), event.name()});
+
+                        // todo: remove these when removing the test register ones above.
+                        removeJoinedAndReadyNotificationListener(GMSAdapterImpl.this);
+                        removeJoinNotificationListener(GMSAdapterImpl.this);
+                        removeFailureNotificationListener(GMSAdapterImpl.this);
+                        removeFailureSuspectedListener(GMSAdapterImpl.this);
+                        gms.shutdown(GMSConstants.shutdownType.INSTANCE_SHUTDOWN);
+                        removePlannedShutdownListener(GMSAdapterImpl.this);
+                        events.unregister(glassfishEventListener);
+                    } else if (event.is(EventTypes.SERVER_READY)) {
+                         // consider putting following, includding call to joinedAndReady into a timertask.
+                          // this time would give instance time to get its heartbeat cache updated by all running
+                          // READY cluster memebrs
 //                            final long MAX_WAIT_DURATION = 4000;
 //
 //                            long elapsedDuration = (joinTime == 0L) ? 0 : System.currentTimeMillis() - joinTime;
@@ -869,8 +868,7 @@ public void event(Event event) {
 //                                } catch(Throwable t) {}
 //                            }
 //                          validateCoreMembers();
-                            gms.reportJoinedAndReadyState();
-                        }
+                        gms.reportJoinedAndReadyState();
                     }
                 };
                 events.register(glassfishEventListener);

diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/AMXStartupService.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/AMXStartupService.java
@@ -91,7 +91,7 @@ public AMXStartupService() {
 
     private final class ShutdownListener implements EventListener {
 
-        public void event(EventListener.Event event) {
+        public void event(Event<?> event) {
             if (event.is(EventTypes.SERVER_SHUTDOWN)) {
                 shutdown();
             }

diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -579,12 +579,12 @@ private DeploymentFailedListener(ReadableArchive archive) {
         }
 
         @Override
-        public void event(@RestrictTo(Deployment.DEPLOYMENT_FAILURE_NAME) Event event) {
+        public void event(@RestrictTo(Deployment.DEPLOYMENT_FAILURE_NAME) Event<?> event) {
             if (!event.is(Deployment.DEPLOYMENT_FAILURE)) {
                 return;
             }
 
-            DeploymentContext dc = Deployment.DEPLOYMENT_FAILURE.getHook(event);
+            DeploymentContext dc = (DeploymentContext) event.hook();
 
             if (!archive.equals(dc.getSource())) {
                 return;