Skip to content

Commit cbe756c

Browse files
committed
Update Weld API to bring in new CDI version, add TODO impls of newly added methods
1 parent fe6ff37 commit cbe756c

File tree

12 files changed

+48
-5
lines changed

12 files changed

+48
-5
lines changed

bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</developers>
3131

3232
<properties>
33-
<weld.api.bom.version>7.0.Alpha2</weld.api.bom.version>
33+
<weld.api.bom.version>7.0.Alpha3</weld.api.bom.version>
3434
<gpg.plugin.version>3.2.8</gpg.plugin.version>
3535
<nexus.staging.plugin.version>1.7.0</nexus.staging.plugin.version>
3636
<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/

impl/src/main/java/org/jboss/weld/bean/builtin/BeanManagerProxy.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ public boolean isMatchingEvent(Type eventType, Set<Annotation> eventQualifiers,
204204
return delegate().isMatchingEvent(eventType, eventQualifiers, observedEventType, observedEventQualifiers);
205205
}
206206

207+
@Override
208+
public <T> T unwrapClientProxy(T reference) {
209+
return delegate().unwrapClientProxy(reference);
210+
}
211+
207212
@Override
208213
public Bean<?> getPassivationCapableBean(BeanIdentifier identifier) {
209214
return delegate().getPassivationCapableBean(identifier);

impl/src/main/java/org/jboss/weld/bootstrap/events/AfterTypeDiscoveryImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ public List<Class<?>> getAlternatives() {
6868
return builder.getAlternativeList(getReceiver());
6969
}
7070

71+
@Override
72+
public List<Class<?>> getReserves() {
73+
throw new UnsupportedOperationException("Not yet implemented");
74+
75+
}
76+
7177
@Override
7278
public List<Class<?>> getInterceptors() {
7379
checkWithinObserverNotification();

impl/src/main/java/org/jboss/weld/bootstrap/events/configurator/BeanAttributesConfiguratorImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,12 @@ public BeanAttributesConfigurator<T> alternative(boolean alternative) {
219219
return this;
220220
}
221221

222+
// TODO
223+
@Override
224+
public BeanAttributesConfigurator<T> reserve(boolean value) {
225+
throw new UnsupportedOperationException("Not yet implemented");
226+
}
227+
222228
@Override
223229
public BeanAttributes<T> complete() {
224230
return new ImmutableBeanAttributes<T>(ImmutableSet.copyOf(stereotypes), isAlternative, name,

impl/src/main/java/org/jboss/weld/bootstrap/events/configurator/BeanConfiguratorImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import jakarta.enterprise.inject.spi.InjectionPoint;
3939
import jakarta.enterprise.inject.spi.InjectionTarget;
4040
import jakarta.enterprise.inject.spi.PassivationCapable;
41+
import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
4142
import jakarta.enterprise.util.TypeLiteral;
4243

4344
import org.jboss.weld.bean.BeanIdentifiers;
@@ -333,6 +334,11 @@ public WeldBeanConfigurator<T> alternative(boolean alternative) {
333334
return this;
334335
}
335336

337+
@Override
338+
public BeanConfigurator<T> reserve(boolean value) {
339+
throw new UnsupportedOperationException("Not yet implemented");
340+
}
341+
336342
public Bean<T> complete() {
337343
if (createCallback == null) {
338344
// not callback specified, Weld does not know how to instantiate this new custom bean

impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,6 +1627,11 @@ public boolean isMatchingEvent(Type eventType, Set<Annotation> eventQualifiers,
16271627
return false;
16281628
}
16291629

1630+
@Override
1631+
public <T> T unwrapClientProxy(T reference) {
1632+
throw new UnsupportedOperationException("Not yet implemented");
1633+
}
1634+
16301635
private void validateQualifiers(Set<Annotation> qualifiers, String methodName) {
16311636
for (Annotation qualifierCandidate : qualifiers) {
16321637
if (!isQualifier(qualifierCandidate.annotationType())) {

jboss-as/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
as the release plugin won't deal with double evaluation -->
3333
<weld.update.version>7.0.0-SNAPSHOT</weld.update.version>
3434
<!-- These are *NOT* automatically updated and should be reviewed if the relevant profile is to be used -->
35-
<cdi.update.version>5.0.0.Alpha1</cdi.update.version>
35+
<cdi.update.version>5.0.0.M1</cdi.update.version>
3636
</properties>
3737

3838
<dependencies>

jboss-tck-runner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>weld-jboss-runner-tck</artifactId>
11-
<name>CDI TCK runner (4.1) for Weld (WildFly)</name>
11+
<name>CDI TCK runner for Weld (WildFly)</name>
1212
<description>Aggregates dependencies and runs the CDI TCK (both standalone and on WildFly)</description>
1313

1414
<licenses>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<arquillian.tomcat.version>1.2.3.Final</arquillian.tomcat.version>
6262
<atinject.tck.version>2.0.1</atinject.tck.version>
6363
<!-- Version of the CDI 4.1 TCK release -->
64-
<cdi.tck.version>5.0.0.Alpha1</cdi.tck.version>
64+
<cdi.tck.version>5.0.0-M1</cdi.tck.version>
6565
<!-- Version of the Jakarta Platform TCK 4.1 release -->
6666
<platform.tck.version>11.0.1</platform.tck.version>
6767
<!-- By default, each mvn profile uses corresponding file from TCK repo, see jboss-tck-runner/pom.xml -->
@@ -91,7 +91,7 @@
9191
<spotbugs-maven-plugin.version>4.9.6.0</spotbugs-maven-plugin.version>
9292
<spotbugs-annotations-version>4.9.6</spotbugs-annotations-version>
9393
<testng.version>7.9.0</testng.version>
94-
<weld.api.version>7.0.Alpha2</weld.api.version>
94+
<weld.api.version>7.0.Alpha3</weld.api.version>
9595
<wildfly.arquillian.version>5.1.0.Final</wildfly.arquillian.version>
9696
</properties>
9797

weld-lite-extension-translator/src/main/java/org/jboss/weld/lite/extension/translator/BeanInfoImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ public boolean isAlternative() {
104104
return cdiBean.isAlternative();
105105
}
106106

107+
@Override
108+
public boolean isReserve() {
109+
throw new UnsupportedOperationException("Not yet implemented");
110+
}
111+
107112
@Override
108113
public Integer priority() {
109114
if (cdiDeclaration instanceof jakarta.enterprise.inject.spi.AnnotatedType

0 commit comments

Comments
 (0)