Concurrency for GlassFish 8

appserver/common/container-common/pom.xml

@@ -2,6 +2,7 @@
 <!--
 
     Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2024 Payara Foundation and/or its affiliates
     Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -114,7 +115,11 @@
             <groupId>org.glassfish.ha</groupId>
             <artifactId>ha-api</artifactId>
         </dependency>
-   </dependencies>
+        <dependency>
+            <groupId>org.glassfish.concurro</groupId>
+            <artifactId>concurro</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <resources>

appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024 Payara Foundation and/or its affiliates
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,6 +26,7 @@
 import com.sun.enterprise.deployment.Application;
 import com.sun.enterprise.deployment.ApplicationClientDescriptor;
 import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor;
+import com.sun.enterprise.deployment.ContextServiceDefinitionDescriptor;
 import com.sun.enterprise.deployment.DataSourceDefinitionDescriptor;
 import com.sun.enterprise.deployment.EjbReferenceDescriptor;
 import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor;
@@ -34,11 +36,15 @@
 import com.sun.enterprise.deployment.JndiNameEnvironment;
 import com.sun.enterprise.deployment.MailSessionDescriptor;
 import com.sun.enterprise.deployment.ManagedBeanDescriptor;
+import com.sun.enterprise.deployment.ManagedExecutorDefinitionDescriptor;
+import com.sun.enterprise.deployment.ManagedScheduledExecutorDefinitionDescriptor;
+import com.sun.enterprise.deployment.ManagedThreadFactoryDefinitionDescriptor;
 import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor;
 import com.sun.enterprise.deployment.ResourceDescriptor;
 import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor;
 import com.sun.enterprise.deployment.ResourceReferenceDescriptor;
 import com.sun.enterprise.deployment.ServiceReferenceDescriptor;
+import com.sun.enterprise.deployment.annotation.handlers.ConcurrencyResourceDefinition;
 import com.sun.enterprise.deployment.util.DOLUtils;
 import com.sun.enterprise.naming.spi.NamingObjectFactory;
 import com.sun.enterprise.naming.spi.NamingUtils;
@@ -76,12 +82,14 @@
 import org.glassfish.api.naming.JNDIBinding;
 import org.glassfish.api.naming.NamingObjectProxy;
 import org.glassfish.api.naming.SimpleJndiName;
+import org.glassfish.concurro.cdi.ConcurrencyManagedCDIBeans;
 import org.glassfish.deployment.common.Descriptor;
 import org.glassfish.deployment.common.JavaEEResourceType;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.javaee.services.CommonResourceProxy;
 import org.glassfish.javaee.services.JMSCFResourcePMProxy;
 import org.glassfish.resourcebase.resources.api.ResourceDeployer;
+import org.glassfish.resourcebase.resources.naming.ApplicationScopedResourceBinding;
 import org.glassfish.resourcebase.resources.util.ResourceManagerFactory;
 import org.jvnet.hk2.annotations.Service;
 
@@ -95,6 +103,10 @@
 import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA;
 import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_COMPONENT;
 import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_COMPONENT_ENV;
+import static org.glassfish.concurro.cdi.ConcurrencyManagedCDIBeans.Type.CONTEXT_SERVICE;
+import static org.glassfish.concurro.cdi.ConcurrencyManagedCDIBeans.Type.MANAGED_EXECUTOR_SERVICE;
+import static org.glassfish.concurro.cdi.ConcurrencyManagedCDIBeans.Type.MANAGED_SCHEDULED_EXECUTOR_SERVICE;
+import static org.glassfish.concurro.cdi.ConcurrencyManagedCDIBeans.Type.MANAGED_THREAD_FACTORY;
 import static org.glassfish.deployment.common.JavaEEResourceType.AODD;
 import static org.glassfish.deployment.common.JavaEEResourceType.CFD;
 import static org.glassfish.deployment.common.JavaEEResourceType.CSDD;
@@ -372,6 +384,46 @@ private void addAllDescriptorBindings(JndiNameEnvironment jndiEnv, ScopeType sco
                 jndiBindings.add(jmscfEnvBinding);
             }
         }
+
+        if (scope == ScopeType.APP) {
+            Set<ResourceDescriptor> concurrencyDescs = new HashSet<>();
+            concurrencyDescs.addAll(managedExecutorDefinitions);
+            concurrencyDescs.addAll(managedThreadfactoryDefintions);
+            concurrencyDescs.addAll(managedScheduledDefinitions);
+            concurrencyDescs.addAll(contextServiceDefinitions);
+            if (!concurrencyDescs.isEmpty()) {
+                registerConcurrencyCDIQualifiers(jndiBindings, concurrencyDescs);
+            }
+        }
+    }
+
+    private void registerConcurrencyCDIQualifiers(Collection<JNDIBinding> jndiBindings, Set<ResourceDescriptor> concurrencyDescs) {
+        ConcurrencyManagedCDIBeans setup = new ConcurrencyManagedCDIBeans();
+        for (ResourceDescriptor desc : concurrencyDescs) {
+            LOG.log(FINE, () -> "Registering concurrency CDI qualifiers for descriptor: " + desc);
+            String jndiName = toLogicalJndiName(desc).toString();
+            ConcurrencyResourceDefinition descriptor = (ConcurrencyResourceDefinition) desc;
+            Set<String> qualifiers = new HashSet<>(descriptor.getQualifiers());
+            // A special value which might occur in XML
+            // We don't need it any more.
+            qualifiers.remove("");
+            if (descriptor instanceof ContextServiceDefinitionDescriptor) {
+                setup.addDefinition(CONTEXT_SERVICE, qualifiers, jndiName);
+            } else if (descriptor instanceof ManagedExecutorDefinitionDescriptor) {
+                setup.addDefinition(MANAGED_EXECUTOR_SERVICE, qualifiers, jndiName);
+            } else if (descriptor instanceof ManagedScheduledExecutorDefinitionDescriptor) {
+                setup.addDefinition(MANAGED_SCHEDULED_EXECUTOR_SERVICE, qualifiers, jndiName);
+            } else if (descriptor instanceof ManagedThreadFactoryDefinitionDescriptor) {
+                setup.addDefinition(MANAGED_THREAD_FACTORY, qualifiers, jndiName);
+            } else {
+                throw new IllegalArgumentException("Unexpected Concurrency type!"
+                    + " Expected ContextServiceDefinitionDescriptor, ManagedExecutorDefinitionDescriptor,"
+                    + " ManagedScheduledExecutorDefinitionDescriptor, or ManagedThreadFactoryDefinitionDescriptor,"
+                    + " got " + descriptor);
+            }
+        }
+        SimpleJndiName jndiName = new SimpleJndiName(ConcurrencyManagedCDIBeans.JDNI_NAME);
+        jndiBindings.add(new ApplicationScopedResourceBinding(jndiName, setup));
     }
 
     private ResourceDeployer getResourceDeployer(Object resource) {

appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2024 Payara Foundation and/or its affiliates
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -355,6 +356,19 @@ private JavaNamespace getAppNamespace(String appName) throws NamingException {
     }
 
 
+    private JavaNamespace getNamespace(SimpleJndiName logicalJndiName) throws NamingException {
+        LOG.log(TRACE, "getNamespace(info, logicalJndiName={0})", logicalJndiName);
+        final ComponentInvocation invocation = getComponentInvocation();
+        if (logicalJndiName.isJavaModule()) {
+            return getModuleNamespace(new AppModuleKey(invocation.getAppName(), invocation.getModuleName()));
+        } else if (logicalJndiName.isJavaApp()) {
+            return getAppNamespace(invocation.getAppName());
+        } else {
+            return getComponentNamespace(invocation.getComponentId());
+        }
+    }
+
+
     private JavaNamespace getNamespace(ComponentIdInfo info, SimpleJndiName logicalJndiName) throws NamingException {
         LOG.log(TRACE, "getNamespace(info, logicalJndiName={0})", logicalJndiName);
         if (logicalJndiName.isJavaModule()) {
@@ -583,20 +597,24 @@ public <T> T lookup(String componentId, SimpleJndiName name) throws NamingExcept
 
     private <T> T lookup(String componentId, SimpleJndiName name, Context ctx) throws NamingException {
         LOG.log(DEBUG, "lookup(componentId={0}, name={1}, ctx={2})", componentId, name, ctx);
-// FIXME: added and commented out dmatej
-//        if (!name.hasJavaPrefix() && name.contains(":")) {
-//            // generic jndi names
-//            return (T) initialContext.lookup(name.toName());
-//        }
         final ComponentIdInfo info = componentIdInfo.get(componentId);
         LOG.log(TRACE, "Found componentIdInfo={0}", info);
-        final boolean replaceName = info != null && info.treatComponentAsModule && name.isJavaComponent();
-        final SimpleJndiName replacedName = replaceName ? name.changePrefix(JNDI_CTX_JAVA_MODULE) : name;
-        JavaNamespace namespace = info == null ? getComponentNamespace(componentId) : getNamespace(info, replacedName);
-        Object obj = namespace.get(replacedName);
-        LOG.log(TRACE, "For {0} found object={1} in namespace.name={2}", replacedName, obj, namespace.name);
+        final boolean replaceName;
+        final SimpleJndiName lookupName;
+        final JavaNamespace namespace;
+        if (info == null) {
+            replaceName = false;
+            lookupName = name;
+            namespace = getNamespace(lookupName);
+        } else {
+            replaceName = info.treatComponentAsModule && name.isJavaComponent();
+            lookupName = replaceName ? name.changePrefix(JNDI_CTX_JAVA_MODULE) : name;
+            namespace = getNamespace(info, lookupName);
+        }
+        Object obj = namespace.get(lookupName);
+        LOG.log(TRACE, "For {0} found object={1} in namespace.name={2}", lookupName, obj, namespace.name);
         if (obj == null) {
-            throw new NameNotFoundException("No object bound to name " + replacedName + " in namespace " + namespace);
+            throw new NameNotFoundException("No object bound to name " + lookupName + " in namespace " + namespace);
         }
         if (obj instanceof NamingObjectProxy) {
             NamingObjectProxy namingProxy = (NamingObjectProxy) obj;
@@ -682,6 +700,16 @@ private ArrayList<SimpleJndiName> listNames(SimpleJndiName name) throws NamingEx
      * @return the component id as a string.
      */
     private String getComponentId() throws NamingException {
+        final ComponentInvocation invocation = getComponentInvocation();
+        final String id = invocation.getComponentId();
+        if (id == null) {
+            throw new NamingException("Invocation exception: ComponentId is null");
+        }
+        return id;
+    }
+
+
+    private ComponentInvocation getComponentInvocation() throws NamingException {
         final ComponentInvocation invocation;
         if (invMgr == null) {
             invocation = serviceLocator.<InvocationManager> getService(InvocationManager.class).getCurrentInvocation();
@@ -692,12 +720,7 @@ private String getComponentId() throws NamingException {
         if (invocation == null) {
             throw new NamingException("Invocation exception: Got null ComponentInvocation!");
         }
-
-        String id = invocation.getComponentId();
-        if (id == null) {
-            throw new NamingException("Invocation exception: Got null ComponentId!");
-        }
-        return id;
+        return invocation;
     }
 
 
@@ -727,18 +750,18 @@ private static class AppModuleKey implements Serializable {
         private final String app;
         private final String module;
 
-        public AppModuleKey(String appName, String moduleName) {
+        private AppModuleKey(String appName, String moduleName) {
             app = appName;
             module = moduleName;
         }
 
 
-        public String getAppName() {
+        private String getAppName() {
             return app;
         }
 
 
-        public String getModuleName() {
+        private String getModuleName() {
             return module;
         }
 

appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/cfg/ContextServiceCfg.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Eclipse Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Eclipse Foundation and/or its affiliates.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,7 +38,7 @@ public class ContextServiceCfg implements Serializable {
     private final Set<ConcurrencyContextType> unchangedContexts;
 
     public ContextServiceCfg(ContextServiceDefinitionData data) {
-        this.serviceConfig = new ConcurrentServiceCfg(data.getName());
+        this.serviceConfig = new ConcurrentServiceCfg(data.getJndiName());
         this.propagatedContexts = CfgParser.standardize(data.getPropagated());
         this.clearedContexts = CfgParser.standardize(data.getCleared());
         this.unchangedContexts = CfgParser.standardize(data.getUnchanged());

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ContextServiceDefinitionDescriptor.java

@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2022, 2023 Eclipse Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Eclipse Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024 Payara Foundation and/or its affiliates
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,20 +17,21 @@
 
 package com.sun.enterprise.deployment;
 
+import com.sun.enterprise.deployment.annotation.handlers.ConcurrencyResourceDefinition;
 import com.sun.enterprise.deployment.annotation.handlers.ContextServiceDefinitionData;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
-import org.glassfish.api.naming.SimpleJndiName;
 import org.glassfish.deployment.common.JavaEEResourceType;
 
 
 /**
  * @author David Matejcek
  */
-public class ContextServiceDefinitionDescriptor extends ResourceDescriptor {
+public class ContextServiceDefinitionDescriptor extends ResourceDescriptor implements ConcurrencyResourceDefinition {
 
     private static final long serialVersionUID = 2537143519647534821L;
 
@@ -49,13 +51,31 @@ public ContextServiceDefinitionDescriptor(ContextServiceDefinitionData data, Met
 
     @Override
     public String getName() {
-        return this.data.getName().toString();
+        return this.data.getName();
     }
 
 
     @Override
     public void setName(String name) {
-        this.data.setName(new SimpleJndiName(name));
+        this.data.setName(name);
+    }
+
+
+    @Override
+    public List<String> getQualifiers() {
+        return data.getQualifiers();
+    }
+
+
+    @Override
+    public void addQualifier(String qualifier) {
+        data.addQualifier(qualifier);
+    }
+
+
+    @Override
+    public void setQualifiers(List<String> qualifiers) {
+        data.setQualifiers(qualifiers);
     }
 
 

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ManagedExecutorDefinitionDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Eclipse Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Eclipse Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,9 +16,10 @@
 
 package com.sun.enterprise.deployment;
 
-import com.sun.enterprise.deployment.annotation.factory.ManagedExecutorDefinitionData;
 import com.sun.enterprise.deployment.annotation.handlers.ContextualResourceDefinition;
+import com.sun.enterprise.deployment.annotation.handlers.ManagedExecutorDefinitionData;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 
@@ -70,6 +71,36 @@ public void setContext(String context) {
     }
 
 
+    @Override
+    public List<String> getQualifiers() {
+        return data.getQualifiers();
+    }
+
+
+    @Override
+    public void addQualifier(String qualifier) {
+        data.addQualifier(qualifier);
+    }
+
+
+    @Override
+    public void setQualifiers(List<String> qualifiers) {
+        data.setQualifiers(qualifiers);
+    }
+
+
+    @Override
+    public boolean isVirtual() {
+        return data.isVirtual();
+    }
+
+
+    @Override
+    public void setVirtual(boolean virtual) {
+        data.setVirtual(virtual);
+    }
+
+
     public int getMaximumPoolSize() {
         return data.getMaximumPoolSize();
     }