Skip to content

Commit ef6a5bc

Browse files
emmartinsemmartins
committed
[JBMETA-463] support jakarta ee11 concurrency elements
1 parent d596955 commit ef6a5bc

File tree

21 files changed

+10424
-0
lines changed

21 files changed

+10424
-0
lines changed

‎common/src/main/java/org/jboss/metadata/javaee/spec/ContextServiceMetaData.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

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

9+
import java.util.List;
910
import java.util.Set;
1011

1112
/**
@@ -30,6 +31,10 @@ public class ContextServiceMetaData extends NamedMetaDataWithDescriptions {
3031
*
3132
*/
3233
private PropertiesMetaData properties;
34+
/**
35+
*
36+
*/
37+
private List<String> qualifier;
3338
/**
3439
*
3540
*/
@@ -90,6 +95,22 @@ public void setProperties(PropertiesMetaData properties) {
9095
this.properties = properties;
9196
}
9297

98+
/**
99+
*
100+
* @return the value of qualifier
101+
*/
102+
public List<String> getQualifier() {
103+
return qualifier;
104+
}
105+
106+
/**
107+
*
108+
* @param qualifier the qualifier to set
109+
*/
110+
public void setQualifier(List<String> qualifier) {
111+
this.qualifier = qualifier;
112+
}
113+
93114
/**
94115
*
95116
* @return unchanged, may be null

‎common/src/main/java/org/jboss/metadata/javaee/spec/ManagedExecutorMetaData.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

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

9+
import java.util.List;
10+
911
/**
1012
*
1113
* @author emmartins
@@ -36,6 +38,16 @@ public class ManagedExecutorMetaData extends NamedMetaDataWithDescriptions {
3638
*/
3739
private PropertiesMetaData properties;
3840

41+
/**
42+
*
43+
*/
44+
private List<String> qualifier;
45+
46+
/**
47+
*
48+
*/
49+
private Boolean virtual;
50+
3951
/**
4052
*
4153
*/
@@ -107,4 +119,35 @@ public void setProperties(PropertiesMetaData properties) {
107119
this.properties = properties;
108120
}
109121

122+
/**
123+
*
124+
* @return the value of qualifier
125+
*/
126+
public List<String> getQualifier() {
127+
return qualifier;
128+
}
129+
130+
/**
131+
*
132+
* @param qualifier the qualifier to set
133+
*/
134+
public void setQualifier(List<String> qualifier) {
135+
this.qualifier = qualifier;
136+
}
137+
138+
/**
139+
*
140+
* @return the value of virtual
141+
*/
142+
public Boolean getVirtual() {
143+
return virtual;
144+
}
145+
146+
/**
147+
*
148+
* @param virtual the virtual to set
149+
*/
150+
public void setVirtual(Boolean virtual) {
151+
this.virtual = virtual;
152+
}
110153
}

‎common/src/main/java/org/jboss/metadata/javaee/spec/ManagedThreadFactoryMetaData.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

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

9+
import java.util.List;
10+
911
/**
1012
*
1113
* @author emmartins
@@ -31,6 +33,16 @@ public class ManagedThreadFactoryMetaData extends NamedMetaDataWithDescriptions
3133
*/
3234
private PropertiesMetaData properties;
3335

36+
/**
37+
*
38+
*/
39+
private List<String> qualifier;
40+
41+
/**
42+
*
43+
*/
44+
private Boolean virtual;
45+
3446
/**
3547
*
3648
*/
@@ -89,4 +101,35 @@ public void setProperties(PropertiesMetaData properties) {
89101
this.properties = properties;
90102
}
91103

104+
/**
105+
*
106+
* @return the value of qualifier
107+
*/
108+
public List<String> getQualifier() {
109+
return qualifier;
110+
}
111+
112+
/**
113+
*
114+
* @param qualifier the qualifier to set
115+
*/
116+
public void setQualifier(List<String> qualifier) {
117+
this.qualifier = qualifier;
118+
}
119+
120+
/**
121+
*
122+
* @return the value of virtual
123+
*/
124+
public Boolean getVirtual() {
125+
return virtual;
126+
}
127+
128+
/**
129+
*
130+
* @param virtual the virtual to set
131+
*/
132+
public void setVirtual(Boolean virtual) {
133+
this.virtual = virtual;
134+
}
92135
}

‎common/src/main/java/org/jboss/metadata/merge/javaee/spec/ContextServiceMetaDataMerger.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,10 @@ else if (original != null && original.getUnchanged() != null)
5050
dest.setProperties(override.getProperties());
5151
else if (original != null && original.getProperties() != null)
5252
dest.setProperties(original.getProperties());
53+
54+
if (override != null && override.getQualifier() != null)
55+
dest.setQualifier(override.getQualifier());
56+
else if (original != null && original.getQualifier() != null)
57+
dest.setQualifier(original.getQualifier());
5358
}
5459
}

‎common/src/main/java/org/jboss/metadata/merge/javaee/spec/JavaEEVersion.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ public enum JavaEEVersion {
2929

3030
V10,
3131

32+
V11,
3233
}

‎common/src/main/java/org/jboss/metadata/merge/javaee/spec/ManagedExecutorMetaDataMerger.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@ else if (original != null && original.getMaxAsync() != null)
4949
dest.setProperties(override.getProperties());
5050
else if (original != null && original.getProperties() != null)
5151
dest.setProperties(original.getProperties());
52+
53+
if (override != null && override.getQualifier() != null)
54+
dest.setQualifier(override.getQualifier());
55+
else if (original != null && original.getQualifier() != null)
56+
dest.setQualifier(original.getQualifier());
57+
58+
if (override != null && override.getVirtual() != null)
59+
dest.setVirtual(override.getVirtual());
60+
else if (original != null && original.getVirtual() != null)
61+
dest.setVirtual(original.getVirtual());
5262
}
5363

5464
}

‎common/src/main/java/org/jboss/metadata/merge/javaee/spec/ManagedThreadFactoryMetaDataMerger.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ else if (original != null)
4444
dest.setProperties(override.getProperties());
4545
else if (original != null && original.getProperties() != null)
4646
dest.setProperties(original.getProperties());
47+
48+
if (override != null && override.getQualifier() != null)
49+
dest.setQualifier(override.getQualifier());
50+
else if (original != null && original.getQualifier() != null)
51+
dest.setQualifier(original.getQualifier());
52+
53+
if (override != null && override.getVirtual() != null)
54+
dest.setVirtual(override.getVirtual());
55+
else if (original != null && original.getVirtual() != null)
56+
dest.setVirtual(original.getVirtual());
4757
}
4858

4959
}

‎common/src/main/java/org/jboss/metadata/parser/ee/ContextServiceMetaDataParser.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
import javax.xml.stream.XMLStreamException;
1414
import javax.xml.stream.XMLStreamReader;
15+
import java.util.ArrayList;
1516
import java.util.HashSet;
17+
import java.util.List;
1618

1719
/**
1820
* @author emmartins
@@ -68,6 +70,14 @@ public static ContextServiceMetaData parse(XMLStreamReader reader, PropertyRepla
6870
}
6971
properties.add(PropertyMetaDataParser.parse(reader, propertyReplacer));
7072
break;
73+
case QUALIFIER:
74+
List<String> qualifier = metaData.getQualifier();
75+
if (qualifier == null) {
76+
qualifier = new ArrayList<>();
77+
metaData.setQualifier(qualifier);
78+
}
79+
qualifier.add(getElementText(reader, propertyReplacer));
80+
break;
7181
default:
7282
throw unexpectedElement(reader);
7383
}

‎common/src/main/java/org/jboss/metadata/parser/ee/Element.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ public enum Element {
133133
PROPERTY("property"),
134134
PROTOCOL_BINDINGS("protocol-bindings"),
135135

136+
QUALIFIER("qualifier"),
137+
136138
REMOTE("remote"),
137139
REQUIRED("required"),
138140
RES_AUTH("res-auth"),
@@ -177,6 +179,7 @@ public enum Element {
177179
USER("user"),
178180

179181
VALUE("value"),
182+
VIRTUAL("virtual"),
180183

181184
WSDL_FILE("wsdl-file"),
182185
WSDL_OVERRIDE("wsdl-override"),;

‎common/src/main/java/org/jboss/metadata/parser/ee/ManagedExecutorMetaDataParser.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
import javax.xml.stream.XMLStreamException;
1414
import javax.xml.stream.XMLStreamReader;
15+
import java.util.ArrayList;
16+
import java.util.List;
1517

1618
/**
1719
* @author emmartins
@@ -60,6 +62,17 @@ public static void parse(XMLStreamReader reader, PropertyReplacer propertyReplac
6062
}
6163
properties.add(PropertyMetaDataParser.parse(reader, propertyReplacer));
6264
break;
65+
case QUALIFIER:
66+
List<String> qualifier = metaData.getQualifier();
67+
if (qualifier == null) {
68+
qualifier = new ArrayList<>();
69+
metaData.setQualifier(qualifier);
70+
}
71+
qualifier.add(getElementText(reader, propertyReplacer));
72+
break;
73+
case VIRTUAL:
74+
metaData.setVirtual(Boolean.valueOf(getElementText(reader, propertyReplacer)));
75+
break;
6376
default:
6477
throw unexpectedElement(reader);
6578
}

0 commit comments

Comments
 (0)