Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,15 @@ private static void checkFacadeInjectionPoint(InjectionPoint injectionPoint, Cla
throw ValidatorLogger.LOG.injectionPointHasWildcard(injectionPoint,
Formats.formatAsStackTraceElement(injectionPoint));
}
} else if (type.equals(Event.class) && parameterizedType.getRawType().equals(Instance.class)) {
// check for wildcard in Event injected via Instance -> @Inject Instance<Event<?>>
Type instanceTypeArgument = parameterizedType.getActualTypeArguments()[0];
if (instanceTypeArgument instanceof ParameterizedType
&& ((ParameterizedType) instanceTypeArgument).getRawType().equals(Event.class)
&& ((ParameterizedType) instanceTypeArgument).getActualTypeArguments()[0] instanceof WildcardType) {
throw ValidatorLogger.LOG.injectionPointHasWildcard(injectionPoint,
Formats.formatAsStackTraceElement(injectionPoint));
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public void fireEventViaWithNoQualifier() {

@Dependent
public static class Receiver {

public void receive1(@Observes @Updated String s) {
RECEIVE_1_OBSERVED = true;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.jboss.weld.tests.event.wildcard;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Event;
import jakarta.inject.Inject;

@ApplicationScoped
public class BeanWithEventWildcard {

@Inject
Event<?> wildEvent;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.jboss.weld.tests.event.wildcard;

import jakarta.enterprise.inject.spi.DefinitionException;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.ShouldThrowException;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.test.util.Utils;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class EventWildcardTest {

@Deployment
@ShouldThrowException(DefinitionException.class)
public static Archive<?> getDeployment() {
return ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(EventWildcardTest.class))
.addClass(BeanWithEventWildcard.class);
}

@Test
public void testEventWithWildcard() {
// should throw definition exception
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.jboss.weld.tests.instance.wildcard;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Event;
import jakarta.enterprise.inject.Instance;
import jakarta.inject.Inject;

@ApplicationScoped
public class BeanWithEventWildcardInstance {

@Inject
Instance<Event<?>> sneakyWildcard;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.jboss.weld.tests.instance.wildcard;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Instance;
import jakarta.inject.Inject;

@ApplicationScoped
public class BeanWithWildcardInstance {
@Inject
Instance<?> wildInstance;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.jboss.weld.tests.instance.wildcard;

import jakarta.enterprise.inject.spi.DefinitionException;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.ShouldThrowException;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.test.util.Utils;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class InstanceWithEventWildcardTest {

@Deployment
@ShouldThrowException(DefinitionException.class)
public static Archive<?> getDeployment() {
return ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(InstanceWithEventWildcardTest.class))
.addClass(BeanWithEventWildcardInstance.class);
}

@Test
public void testInstanceWithWildcard() {
// should throw definition exception
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.jboss.weld.tests.instance.wildcard;

import jakarta.enterprise.inject.spi.DefinitionException;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.ShouldThrowException;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.test.util.Utils;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class InstanceWithWildcardTest {

@Deployment
@ShouldThrowException(DefinitionException.class)
public static Archive<?> getDeployment() {
return ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(InstanceWithWildcardTest.class))
.addClass(BeanWithWildcardInstance.class);
}

@Test
public void testInstanceWithWildcard() {
// should throw definition exception
}
}
Loading