Skip to content

[JBMETA-463] support jakarta ee11 concurrency elements #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bstansberry merged 1 commit into from
Jun 23, 2025
Merged

[JBMETA-463] support jakarta ee11 concurrency elements #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions common/src/main/java/org/jboss/metadata/javaee/spec/ContextServiceMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;

import java.util.List;
import java.util.Set;

/**
Expand All @@ -30,6 +31,10 @@ public class ContextServiceMetaData extends NamedMetaDataWithDescriptions {
*
*/
private PropertiesMetaData properties;
/**
*
*/
private List<String> qualifier;
/**
*
*/
Expand Down Expand Up @@ -90,6 +95,22 @@ public void setProperties(PropertiesMetaData properties) {
this.properties = properties;
}

/**
*
* @return the value of qualifier
*/
public List<String> getQualifier() {
return qualifier;
}

/**
*
* @param qualifier the qualifier to set
*/
public void setQualifier(List<String> qualifier) {
this.qualifier = qualifier;
}

/**
*
* @return unchanged, may be null
Expand Down
43 changes: 43 additions & 0 deletions common/src/main/java/org/jboss/metadata/javaee/spec/ManagedExecutorMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;

import java.util.List;

/**
*
* @author emmartins
Expand Down Expand Up @@ -36,6 +38,16 @@ public class ManagedExecutorMetaData extends NamedMetaDataWithDescriptions {
*/
private PropertiesMetaData properties;

/**
*
*/
private List<String> qualifier;

/**
*
*/
private Boolean virtual;

/**
*
*/
Expand Down Expand Up @@ -107,4 +119,35 @@ public void setProperties(PropertiesMetaData properties) {
this.properties = properties;
}

/**
*
* @return the value of qualifier
*/
public List<String> getQualifier() {
return qualifier;
}

/**
*
* @param qualifier the qualifier to set
*/
public void setQualifier(List<String> qualifier) {
this.qualifier = qualifier;
}

/**
*
* @return the value of virtual
*/
public Boolean getVirtual() {
Copy link
Contributor

@bstansberry bstansberry Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: get instead of is seems commonly used in this repo, so ok with me:

$ git grep "oolean get"
common/src/main/java/org/jboss/metadata/javaee/spec/DataSourceMetaData.java:    public boolean getTransactional() {
common/src/main/java/org/jboss/metadata/javaee/spec/JMSConnectionFactoryMetaData.java:    public boolean getTransactional() {
common/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java:    public boolean getSecureWSDLAccess() {
common/src/main/java/org/jboss/metadata/parser/util/XMLResourceResolver.java:        public boolean getCertifiedText() {
ear/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java:    public boolean getInitializeInOrder() {
ejb/src/main/java/org/jboss/metadata/ejb/spec/RemoveMethodMetaData.java:    public Boolean getRetainIfException() {
web/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java:    public Boolean getJaccAllStoreRole() {
web/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java:    public Boolean getDenyUncoveredHttpMethods() {
web/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java:    public Boolean getProactiveAuthentication() {
web/src/main/java/org/jboss/metadata/web/spec/CookieConfigMetaData.java:    public boolean getHttpOnly() {
web/src/main/java/org/jboss/metadata/web/spec/CookieConfigMetaData.java:    public boolean getSecure() {
web/src/main/java/org/jboss/metadata/web/spec/CookieConfigMetaData.java:    public boolean getHttpOnlySet() {
web/src/main/java/org/jboss/metadata/web/spec/CookieConfigMetaData.java:    public boolean getSecureSet() {
web/src/main/java/org/jboss/metadata/web/spec/CookieConfigMetaData.java:    public boolean getMaxAgeSet() {
web/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java:    public boolean getAsyncSupportedSet() {
web/src/main/java/org/jboss/metadata/web/spec/MultipartConfigMetaData.java:    public boolean getMaxFileSizeSet() {
web/src/main/java/org/jboss/metadata/web/spec/MultipartConfigMetaData.java:    public boolean getMaxRequestSizeSet() {
web/src/main/java/org/jboss/metadata/web/spec/MultipartConfigMetaData.java:    public boolean getFileSizeThresholdSet() {
web/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java:    public boolean getLoadOnStartupSet() {
web/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java:    public boolean getAsyncSupportedDefault() {
web/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java:    public boolean getAsyncSupportedSet() {
web/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java:    public boolean getEnabledDefault() {
web/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java:    public boolean getEnabledSet() {
web/src/main/java/org/jboss/metadata/web/spec/SessionConfigMetaData.java:    public boolean getSessionTimeoutSet() {
web/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java:    public Boolean getDenyUncoveredHttpMethods() {

return virtual;
}

/**
*
* @param virtual the virtual to set
*/
public void setVirtual(Boolean virtual) {
this.virtual = virtual;
}
}
43 changes: 43 additions & 0 deletions common/src/main/java/org/jboss/metadata/javaee/spec/ManagedThreadFactoryMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;

import java.util.List;

/**
*
* @author emmartins
Expand All @@ -31,6 +33,16 @@ public class ManagedThreadFactoryMetaData extends NamedMetaDataWithDescriptions
*/
private PropertiesMetaData properties;

/**
*
*/
private List<String> qualifier;

/**
*
*/
private Boolean virtual;

/**
*
*/
Expand Down Expand Up @@ -89,4 +101,35 @@ public void setProperties(PropertiesMetaData properties) {
this.properties = properties;
}

/**
*
* @return the value of qualifier
*/
public List<String> getQualifier() {
return qualifier;
}

/**
*
* @param qualifier the qualifier to set
*/
public void setQualifier(List<String> qualifier) {
this.qualifier = qualifier;
}

/**
*
* @return the value of virtual
*/
public Boolean getVirtual() {
return virtual;
}

/**
*
* @param virtual the virtual to set
*/
public void setVirtual(Boolean virtual) {
this.virtual = virtual;
}
}
5 changes: 5 additions & 0 deletions common/src/main/java/org/jboss/metadata/merge/javaee/spec/ContextServiceMetaDataMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,10 @@ else if (original != null && original.getUnchanged() != null)
dest.setProperties(override.getProperties());
else if (original != null && original.getProperties() != null)
dest.setProperties(original.getProperties());

if (override != null && override.getQualifier() != null)
dest.setQualifier(override.getQualifier());
else if (original != null && original.getQualifier() != null)
dest.setQualifier(original.getQualifier());
}
}
1 change: 1 addition & 0 deletions common/src/main/java/org/jboss/metadata/merge/javaee/spec/JavaEEVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ public enum JavaEEVersion {

V10,

V11,
}
10 changes: 10 additions & 0 deletions common/src/main/java/org/jboss/metadata/merge/javaee/spec/ManagedExecutorMetaDataMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ else if (original != null && original.getMaxAsync() != null)
dest.setProperties(override.getProperties());
else if (original != null && original.getProperties() != null)
dest.setProperties(original.getProperties());

if (override != null && override.getQualifier() != null)
dest.setQualifier(override.getQualifier());
else if (original != null && original.getQualifier() != null)
dest.setQualifier(original.getQualifier());

if (override != null && override.getVirtual() != null)
dest.setVirtual(override.getVirtual());
else if (original != null && original.getVirtual() != null)
dest.setVirtual(original.getVirtual());
}

}
10 changes: 10 additions & 0 deletions ...rc/main/java/org/jboss/metadata/merge/javaee/spec/ManagedThreadFactoryMetaDataMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ else if (original != null)
dest.setProperties(override.getProperties());
else if (original != null && original.getProperties() != null)
dest.setProperties(original.getProperties());

if (override != null && override.getQualifier() != null)
dest.setQualifier(override.getQualifier());
else if (original != null && original.getQualifier() != null)
dest.setQualifier(original.getQualifier());

if (override != null && override.getVirtual() != null)
dest.setVirtual(override.getVirtual());
else if (original != null && original.getVirtual() != null)
dest.setVirtual(original.getVirtual());
}

}
10 changes: 10 additions & 0 deletions common/src/main/java/org/jboss/metadata/parser/ee/ContextServiceMetaDataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;

/**
* @author emmartins
Expand Down Expand Up @@ -68,6 +70,14 @@ public static ContextServiceMetaData parse(XMLStreamReader reader, PropertyRepla
}
properties.add(PropertyMetaDataParser.parse(reader, propertyReplacer));
break;
case QUALIFIER:
List<String> qualifier = metaData.getQualifier();
if (qualifier == null) {
qualifier = new ArrayList<>();
metaData.setQualifier(qualifier);
}
qualifier.add(getElementText(reader, propertyReplacer));
break;
default:
throw unexpectedElement(reader);
}
Expand Down
3 changes: 3 additions & 0 deletions common/src/main/java/org/jboss/metadata/parser/ee/Element.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ public enum Element {
PROPERTY("property"),
PROTOCOL_BINDINGS("protocol-bindings"),

QUALIFIER("qualifier"),

REMOTE("remote"),
REQUIRED("required"),
RES_AUTH("res-auth"),
Expand Down Expand Up @@ -177,6 +179,7 @@ public enum Element {
USER("user"),

VALUE("value"),
VIRTUAL("virtual"),

WSDL_FILE("wsdl-file"),
WSDL_OVERRIDE("wsdl-override"),;
Expand Down
13 changes: 13 additions & 0 deletions common/src/main/java/org/jboss/metadata/parser/ee/ManagedExecutorMetaDataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.util.ArrayList;
import java.util.List;

/**
* @author emmartins
Expand Down Expand Up @@ -60,6 +62,17 @@ public static void parse(XMLStreamReader reader, PropertyReplacer propertyReplac
}
properties.add(PropertyMetaDataParser.parse(reader, propertyReplacer));
break;
case QUALIFIER:
List<String> qualifier = metaData.getQualifier();
if (qualifier == null) {
qualifier = new ArrayList<>();
metaData.setQualifier(qualifier);
}
qualifier.add(getElementText(reader, propertyReplacer));
break;
case VIRTUAL:
metaData.setVirtual(Boolean.valueOf(getElementText(reader, propertyReplacer)));
break;
default:
throw unexpectedElement(reader);
}
Expand Down
13 changes: 13 additions & 0 deletions common/src/main/java/org/jboss/metadata/parser/ee/ManagedThreadFactoryMetaDataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.util.ArrayList;
import java.util.List;

/**
* @author emmartins
Expand Down Expand Up @@ -52,6 +54,17 @@ public static ManagedThreadFactoryMetaData parse(XMLStreamReader reader, Propert
}
properties.add(PropertyMetaDataParser.parse(reader, propertyReplacer));
break;
case QUALIFIER:
List<String> qualifier = metaData.getQualifier();
if (qualifier == null) {
qualifier = new ArrayList<>();
metaData.setQualifier(qualifier);
}
qualifier.add(getElementText(reader, propertyReplacer));
break;
case VIRTUAL:
metaData.setVirtual(Boolean.valueOf(getElementText(reader, propertyReplacer)));
break;
default:
throw unexpectedElement(reader);
}
Expand Down
Loading