JBoss Tools SVN: r34838 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 17:13:27 -0400 (Fri, 16 Sep 2011)
New Revision: 34838
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
JBIDE-9722
https://issues.jboss.org/browse/JBIDE-9722
Test added.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-16 20:48:09 UTC (rev 34837)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-16 21:13:27 UTC (rev 34838)
@@ -34,6 +34,7 @@
import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.EnterpriseStereotypeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.InjectionPointTest;
+import org.jboss.tools.cdi.core.test.tck.InjectionPointWithNewQualifierTest;
import org.jboss.tools.cdi.core.test.tck.InterceptorDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ObserverMethodResolutionTest;
@@ -96,6 +97,7 @@
suite.addTestSuite(ResolutionByTypeTest.class);
suite.addTestSuite(EnterpriseResolutionByTypeTest.class);
suite.addTestSuite(AssignabilityOfRawAndParameterizedTypesTest.class);
+ suite.addTestSuite(InjectionPointWithNewQualifierTest.class);
suite.addTestSuite(QualifierWithMembersTest.class);
suite.addTestSuite(InterceptorDefinitionTest.class);
suite.addTestSuite(DecoratorDefinitionTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java 2011-09-16 21:13:27 UTC (rev 34838)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
+import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class InjectionPointWithNewQualifierTest extends TCKTest {
+
+ public void testNewHashSetParameter() throws CoreException {
+ IInjectionPointParameter injection = getInjectionPointParameter("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java", "initialize");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans, "java.util.HashSet");
+ }
+
+ public void testNewArrayListField() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java", "list");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans, "java.util.ArrayList");
+ IBean b = beans.iterator().next();
+ assertEquals(1, b.getQualifierDeclarations().size());
+ }
+
+ public void testNewCustomBeanField() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java", "lion");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.Lion");
+ IBean b = beans.iterator().next();
+ assertEquals(1, b.getQualifierDeclarations().size());
+
+ //Check that new bean has exactly one qualifier - @New.
+ IQualifierDeclaration d = b.getQualifierDeclarations().iterator().next();
+ assertEquals(CDIConstants.NEW_QUALIFIER_TYPE_NAME, d.getType().getFullyQualifiedName());
+ Set<IQualifier> qs = b.getQualifiers();
+ assertEquals(1, qs.size());
+ IQualifier q = qs.iterator().next();
+ assertEquals(CDIConstants.NEW_QUALIFIER_TYPE_NAME, q.getSourceType().getFullyQualifiedName());
+
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 7 months
JBoss Tools SVN: r34837 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 16:48:09 -0400 (Fri, 16 Sep 2011)
New Revision: 34837
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/NewBean.java
Log:
JBIDE-9722
https://issues.jboss.org/browse/JBIDE-9722
New bean implementation improved.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/NewBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/NewBean.java 2011-09-16 19:32:30 UTC (rev 34836)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/NewBean.java 2011-09-16 20:48:09 UTC (rev 34837)
@@ -10,7 +10,14 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import java.util.HashSet;
+import java.util.Set;
+
import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IBeanMethod;
+import org.jboss.tools.cdi.core.IObserverMethod;
+import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IQualifier;
/**
*
@@ -27,4 +34,32 @@
return true;
}
+ public Set<IQualifier> getQualifiers() {
+ Set<IQualifier> result = new HashSet<IQualifier>();
+ IQualifier q = getCDIProject().getQualifier(CDIConstants.NEW_QUALIFIER_TYPE_NAME);
+ if(q != null) {
+ result.add(q);
+ }
+ return result;
+ }
+
+ public boolean isAlternative() {
+ return false;
+ }
+
+ public boolean isSelectedAlternative() {
+ return false;
+ }
+
+ public Set<IObserverMethod> getObserverMethods() {
+ return new HashSet<IObserverMethod>();
+ }
+
+ public Set<IProducer> getProducers() {
+ return new HashSet<IProducer>();
+ }
+
+ public Set<IBeanMethod> getDisposers() {
+ return new HashSet<IBeanMethod>();
+ }
}
14 years, 7 months
JBoss Tools SVN: r34836 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-16 15:32:30 -0400 (Fri, 16 Sep 2011)
New Revision: 34836
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9723 Injection points declared in producer methods should be validated as injection points of the producer but not as injections of the class bean
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java 2011-09-16 19:03:47 UTC (rev 34835)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java 2011-09-16 19:32:30 UTC (rev 34836)
@@ -1,17 +1,36 @@
package org.jboss.jsr299.tck.tests.jbt.validation.inject.producer;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
@ApplicationScoped
public class ProducerWInjections {
- @Produces
- public Test produce(InjectionPoint ip) {
+ @Inject
+ public ProducerWInjections(InjectionPoint broken) {
+ }
+
+ @Produces
+ public Test produceOk(InjectionPoint ok) {
return null;
}
+ @Produces
+ @ApplicationScoped
+ public Test produceBroken(InjectionPoint broken) {
+ return null;
+ }
+
+ public void disposeBroken(@Disposes Test arg1, InjectionPoint broken) {
+ }
+
+ public void observeBroken(@Observes Test arg1, InjectionPoint broken) {
+ }
+
public static class Test {
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-09-16 19:03:47 UTC (rev 34835)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-09-16 19:32:30 UTC (rev 34836)
@@ -1039,6 +1039,20 @@
}
/**
+ * 5.5.7. Injection point metadata
+ * - bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default
+ *
+ * See https://issues.jboss.org/browse/JBIDE-9717
+ *
+ * @throws Exception
+ */
+ public void testBeansWithInjectionPointParams() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, 14, 24, 28, 31);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, 18);
+ }
+
+ /**
* 8.1.2. Decorator delegate injection points
* - decorator has more than one delegate injection point
*
14 years, 7 months
JBoss Tools SVN: r34835 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-16 15:03:47 -0400 (Fri, 16 Sep 2011)
New Revision: 34835
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
Log:
https://issues.jboss.org/browse/JBIDE-9723 Injection points declared in producer methods should be validated as injection points of the producer but not as injections of the class bean
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-09-16 19:03:27 UTC (rev 34834)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-09-16 19:03:47 UTC (rev 34835)
@@ -13,7 +13,6 @@
import java.util.Set;
import org.jboss.tools.common.java.IJavaMemberReference;
-import org.jboss.tools.common.java.IParametedType;
/**
* Represents a class-based bean.
14 years, 7 months
JBoss Tools SVN: r34834 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-16 15:03:27 -0400 (Fri, 16 Sep 2011)
New Revision: 34834
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
Log:
https://issues.jboss.org/browse/JBIDE-9723 Injection points declared in producer methods should be validated as injection points of the producer but not as injections of the class bean
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-09-16 19:00:02 UTC (rev 34833)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-09-16 19:03:27 UTC (rev 34834)
@@ -83,7 +83,7 @@
* If all = false, the result includes only injection points managed by this bean, and
* since injection points declared in producer methods are handled by producer method beans,
* they are not included. In this case, result is the same as that of getInjectionPoints().
- * If all = true, the result includes injection points declared in producer methods.
+ * If all = true, the result includes injection points declared in all the producer methods declared in the class.
*
* @param all
* @return
14 years, 7 months
JBoss Tools SVN: r34833 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 15:00:02 -0400 (Fri, 16 Sep 2011)
New Revision: 34833
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
minor change.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-16 18:58:52 UTC (rev 34832)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-16 19:00:02 UTC (rev 34833)
@@ -460,11 +460,10 @@
}
}
}
- }
-
- }
-
+ }
+ }
}
+
class ListContent implements IStructuredContentProvider {
@Override
@@ -520,8 +519,7 @@
sorted.addAll(map.values());
return sorted.toArray(new IBean[0]);
- }
-
+ }
}
static Color gray = new Color(null, 128, 128, 128);
@@ -588,10 +586,11 @@
.append("()", nameStyler);
}
} else {
- if(b.getBeanClass().getElementName().length() == 0) {
- System.out.println("oops");
+ String name = b.getBeanClass().getElementName();
+ if(name.length() == 0) {
+ name = b.getBeanClass().getFullyQualifiedName();
}
- sb.append(b.getBeanClass().getElementName(), nameStyler);
+ sb.append(name, nameStyler);
}
Styler qualifierStyler = eligibleBeans.contains(b) ? ELIGIBLE_QUALIFIER : DISABLED;
@@ -617,5 +616,4 @@
return null;
}
}
-
}
14 years, 7 months
JBoss Tools SVN: r34832 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 14:58:52 -0400 (Fri, 16 Sep 2011)
New Revision: 34832
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
Log:
JBIDE-9723
https://issues.jboss.org/browse/JBIDE-9723
IClassBean.getInjectionPoints(boolean all) is added and implemented.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-09-16 18:56:44 UTC (rev 34831)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-09-16 18:58:52 UTC (rev 34832)
@@ -172,6 +172,11 @@
}
@Override
+ public Set<IInjectionPoint> getInjectionPoints(boolean all) {
+ return null;
+ }
+
+ @Override
public IBean getSpecializedBean() {
return null;
}
14 years, 7 months
JBoss Tools SVN: r34831 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 14:56:44 -0400 (Fri, 16 Sep 2011)
New Revision: 34831
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
JBIDE-9723
https://issues.jboss.org/browse/JBIDE-9723
IClassBean.getInjectionPoints(boolean all) is added and implemented.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-09-16 18:55:20 UTC (rev 34830)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-09-16 18:56:44 UTC (rev 34831)
@@ -77,4 +77,16 @@
* @return the initializer methods of the class bean
*/
Set<IInitializerMethod> getInitializers();
+
+ /**
+ * Returns injection points declared in the bean class.
+ * If all = false, the result includes only injection points managed by this bean, and
+ * since injection points declared in producer methods are handled by producer method beans,
+ * they are not included. In this case, result is the same as that of getInjectionPoints().
+ * If all = true, the result includes injection points declared in producer methods.
+ *
+ * @param all
+ * @return
+ */
+ Set<IInjectionPoint> getInjectionPoints(boolean all);
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-09-16 18:55:20 UTC (rev 34830)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-09-16 18:56:44 UTC (rev 34831)
@@ -24,6 +24,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
@@ -308,6 +309,16 @@
}
public Set<IInjectionPoint> getInjectionPoints() {
+ return getInjectionPoints(true);
+ }
+
+ /**
+ * If all=false, injection points of producer methods are not included.
+ *
+ * @param all
+ * @return
+ */
+ public Set<IInjectionPoint> getInjectionPoints(boolean all) {
Set<IInjectionPoint> result = new HashSet<IInjectionPoint>();
for (BeanField f: fields) {
if(f instanceof IInjectionPoint) {
@@ -315,6 +326,9 @@
}
}
for (BeanMethod m: methods) {
+ if(!all && (m instanceof IBean)) {
+ continue;
+ }
List<IParameter> ps = m.getParameters();
for (IParameter p: ps) {
if(p instanceof IInjectionPoint) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-16 18:55:20 UTC (rev 34830)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-16 18:56:44 UTC (rev 34831)
@@ -2056,7 +2056,7 @@
addError(CDIValidationMessages.PRODUCER_IN_DECORATOR, CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, producer.getProducesAnnotation(), decorator.getResource(), PRODUCER_IN_DECORATOR_ID);
}
- Set<IInjectionPoint> injections = decorator.getInjectionPoints();
+ Set<IInjectionPoint> injections = decorator.getInjectionPoints(true);
Set<ITextSourceReference> delegates = new HashSet<ITextSourceReference>();
IInjectionPoint delegate = null;
for (IInjectionPoint injection : injections) {
14 years, 7 months
JBoss Tools SVN: r34830 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 14:55:20 -0400 (Fri, 16 Sep 2011)
New Revision: 34830
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/disposers/DisposerOk.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
Log:
JBIDE-9699
https://issues.jboss.org/browse/JBIDE-9699
Test added for parameter without qualifiers in disposer method.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/disposers/DisposerOk.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/disposers/DisposerOk.java 2011-09-16 18:42:04 UTC (rev 34829)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/disposers/DisposerOk.java 2011-09-16 18:55:20 UTC (rev 34830)
@@ -17,6 +17,6 @@
return em;
}
- public void disposeEntityManager(@Disposes EntityManager em) {
+ public void disposeEntityManager(@Disposes EntityManager em, EntityManager em2) {
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2011-09-16 18:42:04 UTC (rev 34829)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2011-09-16 18:55:20 UTC (rev 34830)
@@ -70,7 +70,7 @@
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/disposers/DisposerOk.java");
assertNotNull("Can't find the bean.", bean);
Set<IInjectionPoint> injections = bean.getInjectionPoints();
- assertEquals(1, injections.size());
+ assertEquals(2, injections.size());
}
public void testGetInjections() {
14 years, 7 months
JBoss Tools SVN: r34829 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 14:42:04 -0400 (Fri, 16 Sep 2011)
New Revision: 34829
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
JBIDE-9699
https://issues.jboss.org/browse/JBIDE-9699
Parameters of disposer method that has no qualifiers are taken into account, as injection points.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-09-16 18:05:56 UTC (rev 34828)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-09-16 18:42:04 UTC (rev 34829)
@@ -82,7 +82,8 @@
pd.setMethodDefinition(this);
pd.index = i;
pd.setLocalVariable(ps[i], context, flags);
- if(pd.isAnnotationPresent(CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME)) {
+ if(pd.isAnnotationPresent(CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME)
+ || pd.isAnnotationPresent(CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME)) {
parametersAreInjectionPoints = true;
}
ds[i] = pd;
14 years, 7 months