SamRegistrationInstaller is now a cdi Extension

pizzi80 · Mar 3, 2022 · 12e37bd · 12e37bd
1 parent 718e35b
commit 12e37bd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 37 deletions.
diff --git a/...ria/servlet/SamRegistrationInstaller.java → ...soteria/cdi/SamRegistrationInstaller.java b/...ria/servlet/SamRegistrationInstaller.java → ...soteria/cdi/SamRegistrationInstaller.java
@@ -14,16 +14,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.soteria.servlet;
+package org.glassfish.soteria.cdi;
 
-import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.BeforeDestroyed;
 import jakarta.enterprise.context.Initialized;
 import jakarta.enterprise.event.Observes;
 import jakarta.enterprise.inject.spi.CDI;
-import jakarta.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
 import jakarta.servlet.ServletContext;
-import org.glassfish.soteria.cdi.CdiExtension;
 import org.glassfish.soteria.cdi.spi.CDIPerRequestInitializer;
 import org.glassfish.soteria.cdi.spi.impl.LibertyCDIPerRequestInitializer;
 import org.glassfish.soteria.mechanisms.jaspic.HttpBridgeServerAuthModule;
@@ -49,27 +48,19 @@
  * @author Arjan Tijms
  *
  */
-//@WebListener
-@ApplicationScoped
-public class SamRegistrationInstaller { // implements ServletContainerInitializer, ServletContextListener {
+public class SamRegistrationInstaller implements Extension { // implements ServletContainerInitializer, ServletContextListener {
 
     private static final Logger logger =  Logger.getLogger(SamRegistrationInstaller.class.getName());
 
-    private ServletContext context;
-
-    // CDI 1.1+
+    // CDI 3 @Initialized(ApplicationScoped.class)
+    // when on CDI 4 replace with @Startup
     public void onCdiStartup(@Observes @Initialized(ApplicationScoped.class) ServletContext context) {
 
-        this.context = context;
-
-        // CDI Ready
-        logger.info("CDI is ready for Soteria @ ServletContext injected "+context);
-
-        // Obtain a reference to the CdiExtension that was used to see if
-        // there's an enabled bean
+        // double check for CDI
         try {
             CDI.current(); //CdiUtils.getBeanManager();
 
+            // CDI is Ready
             if (logger.isLoggable(INFO)) {
                 String version = getClass().getPackage().getImplementationVersion();
                 logger.log(INFO, "Initializing Soteria {0} for context ''{1}''", new Object[]{version, context.getContextPath()});
@@ -110,18 +101,13 @@ public void onCdiStartup(@Observes @Initialized(ApplicationScoped.class) Servlet
         }
     }
 
-    @PreDestroy
-    public void onCdiShutdown() {
-        logger.fine("CDI is shutting down for context " + context );
+    // CDI 3 @BeforeDestroyed(ApplicationScoped.class)
+    // when on CDI 4 replace with @Shutdown
+    public void onCdiShutdown(@Observes @BeforeDestroyed(ApplicationScoped.class) ServletContext context) {
+        logger.info("CDI is shutting down for context " + context + " > " + context.getVirtualServerName() + " " + context.getContextPath() );
         deregisterServerAuthModule(context);
     }
 
-    /** never invoked
-    public void onCdiShutdown(@Observes @Destroyed(ApplicationScoped.class) ServletContext context) {
-        logger.fine("CDI is shutting down for context " + context );
-        deregisterServerAuthModule(context);
-    }*/
-
     // --- ServletContainerInitializer ----------------------------------------------------------------------------
 
 //    @Override
@@ -134,9 +120,8 @@ public void onCdiShutdown(@Observes @Destroyed(ApplicationScoped.class) ServletC
 //    @Override
 //    public void contextInitialized(ServletContextEvent event) {
 //        // noop
-//        logger.fine("contextInitialized");
 //    }
-//
+
 //    @Override
 //    public void contextDestroyed(ServletContextEvent event) {
 //        logger.fine("contextDestroyed");

diff --git a/impl/src/main/resources/META-INF/beans.xml b/impl/src/main/resources/META-INF/beans.xml
diff --git a/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -1 +1,2 @@
 org.glassfish.soteria.cdi.CdiExtension
+org.glassfish.soteria.cdi.SamRegistrationInstaller
diff --git a/impl/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer b/impl/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		org.glassfish.soteria.cdi.CdiExtension
		org.glassfish.soteria.cdi.SamRegistrationInstaller