[jbosstools-commits] JBoss Tools SVN: r35882 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Oct 20 20:23:43 EDT 2011
Author: scabanovich
Date: 2011-10-20 20:23:43 -0400 (Thu, 20 Oct 2011)
New Revision: 35882
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
Log:
JBIDE-9988
https://issues.jboss.org/browse/JBIDE-9988
Legal types of default producer bean without @DefaultBean annotation are restricted.
For that case, error markers are attached to member type.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-10-21 00:20:00 UTC (rev 35881)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-10-21 00:23:43 UTC (rev 35882)
@@ -13,6 +13,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -31,10 +32,13 @@
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IAmbiguousBeanResolverFeature;
+import org.jboss.tools.cdi.core.extension.feature.IBeanKeyProvider;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
import org.jboss.tools.cdi.core.extension.feature.IValidatorFeature;
+import org.jboss.tools.cdi.internal.core.impl.BeanMember;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
@@ -43,9 +47,10 @@
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IJavaAnnotation;
import org.jboss.tools.common.java.IParametedType;
-import org.jboss.tools.common.java.ParametedTypeFactory;
+import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.java.impl.AnnotationLiteral;
import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.common.text.ITextSourceReference;
/**
* Implements support for org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension.
@@ -59,14 +64,15 @@
* @author Viacheslav Kabanovich
*
*/
-public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature, IValidatorFeature {
+public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature, IValidatorFeature, IBeanKeyProvider {
protected Version getVersion() {
return Version.instance;
}
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- boolean defaultBean = typeDefinition.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName());
+ String defaultBeanAnnotationTypeName = getVersion().getDefaultBeanAnnotationTypeName();
+ boolean defaultBean = typeDefinition.isAnnotationPresent(defaultBeanAnnotationTypeName);
IJavaAnnotation beanTyped = null;
if(defaultBean) {
beanTyped = createFakeTypedAnnotation(typeDefinition, context);
@@ -77,7 +83,7 @@
List<MethodDefinition> ms = typeDefinition.getMethods();
for (MethodDefinition m: ms) {
if(m.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || m.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
+ if(defaultBean || m.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
IJavaAnnotation methodTyped = createFakeTypedAnnotation(m, context);
if(methodTyped != null) {
m.addAnnotation(methodTyped, context);
@@ -88,7 +94,7 @@
List<FieldDefinition> fs = typeDefinition.getFields();
for (FieldDefinition f: fs) {
if(f.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || f.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
+ if(defaultBean || f.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
IJavaAnnotation fieldTyped = createFakeTypedAnnotation(f, context);
if(fieldTyped != null) {
f.addAnnotation(fieldTyped, context);
@@ -110,6 +116,14 @@
result = new AnnotationLiteral(def.getResource(), a.getStartPosition(), a.getLength(), defaultType, IMemberValuePair.K_CLASS, typedAnnotation);
}
}
+ } else if(def instanceof BeanMemberDefinition) {
+ ITypeDeclaration type = BeanMember.getTypeDeclaration(def, context.getProject().getTypeFactory());
+ if(type != null) {
+ IType typedAnnotation = context.getProject().getType(CDIConstants.TYPED_ANNOTATION_TYPE_NAME);
+ if (typedAnnotation != null) {
+ result = new AnnotationLiteral(def.getResource(), type.getStartPosition(), type.getLength(), type.getType().getFullyQualifiedName(), IMemberValuePair.K_CLASS, typedAnnotation);
+ }
+ }
}
return result;
@@ -118,14 +132,8 @@
public Set<IBean> getResolvedBeans(Set<IBean> result) {
Set<IBean> defaultBeans = new HashSet<IBean>();
for (IBean b: result) {
- if(b.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
+ if(isBeanDefault(b)) {
defaultBeans.add(b);
- } else if(b instanceof IProducer) {
- IProducer producer = (IProducer)b;
- IClassBean parent = producer.getClassBean();
- if(parent != null && parent.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
- defaultBeans.add(b);
- }
}
}
if(!defaultBeans.isEmpty() && defaultBeans.size() < result.size()) {
@@ -134,13 +142,35 @@
return result;
}
+ private boolean isBeanDefault(IBean bean) {
+ String defaultBeanAnnotationTypeName = getVersion().getDefaultBeanAnnotationTypeName();
+ if(bean.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
+ return true;
+ } else if(bean instanceof IProducer) {
+ IProducer producer = (IProducer)bean;
+ IClassBean parent = producer.getClassBean();
+ if(parent != null && parent.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public void validateResource(IFile file, CDICoreValidator validator) {
String defaultBeanAnnotationTypeName = getVersion().getDefaultBeanAnnotationTypeName();
ICDIProject cdiProject = CDICorePlugin.getCDIProject(file.getProject(), true);
Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
for (IBean bean: bs) {
- IAnnotationDeclaration a = bean.getAnnotation(defaultBeanAnnotationTypeName);
- if(a != null) {
+ if(isBeanDefault(bean)) {
+ ITextSourceReference a = bean.getAnnotation(defaultBeanAnnotationTypeName);
+ if(a == null) {
+ Set<ITypeDeclaration> ds = bean.getAllTypeDeclarations();
+ if(!ds.isEmpty()) {
+ a = ds.iterator().next();
+ } else {
+ continue;
+ }
+ }
if(bean instanceof IProducerField) {
IClassBean cb = ((IProducerField) bean).getClassBean();
IScope scope = cb.getScope();
@@ -150,35 +180,28 @@
}
}
IQualifierDeclaration[] qs = bean.getQualifierDeclarations().toArray(new IQualifierDeclaration[0]);
- Set<IParametedType> ts = bean.getLegalTypes();
- if(ts.size() < 3) {
- IParametedType type = null;
- for (IParametedType t: ts) {
- if(!"java.lang.Object".equals(t.getType().getFullyQualifiedName())) {
- type = t;
- }
- }
- if(type != null) {
- Set<IBean> bs2 = cdiProject.getBeans(false, type, qs);
- StringBuilder otherDefaultBeans = new StringBuilder();
- for (IBean b: bs2) {
- try {
- if(b != bean && b.isAnnotationPresent(defaultBeanAnnotationTypeName)
- && CDIProject.areMatchingQualifiers(bean.getQualifierDeclarations(), b.getQualifierDeclarations(true))) {
- if(otherDefaultBeans.length() > 0) {
- otherDefaultBeans.append(", ");
- }
- otherDefaultBeans.append(b.getElementName());
+ IParametedType type = getDefaultType(bean);
+ if(type != null) {
+ validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, createKey(type, bean.getQualifierDeclarations(true)), file.getFullPath(), true);
+ Set<IBean> bs2 = cdiProject.getBeans(false, type, qs);
+ StringBuilder otherDefaultBeans = new StringBuilder();
+ for (IBean b: bs2) {
+ try {
+ if(b != bean && isBeanDefault(b)
+ && CDIProject.areMatchingQualifiers(bean.getQualifierDeclarations(), b.getQualifierDeclarations(true))) {
+ if(otherDefaultBeans.length() > 0) {
+ otherDefaultBeans.append(", ");
}
- } catch (CoreException e) {
- CDISeamSolderCorePlugin.getDefault().logError(e);
- }
+ otherDefaultBeans.append(b.getElementName());
}
- if(otherDefaultBeans.length() > 0) {
- String message = NLS.bind(SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS, otherDefaultBeans);
- validator.addError(message, CDISeamSolderPreferences.IDENTICAL_DEFAULT_BEANS, new String[]{}, a, file);
+ } catch (CoreException e) {
+ CDISeamSolderCorePlugin.getDefault().logError(e);
}
}
+ if(otherDefaultBeans.length() > 0) {
+ String message = NLS.bind(SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS, otherDefaultBeans);
+ validator.addError(message, CDISeamSolderPreferences.IDENTICAL_DEFAULT_BEANS, new String[]{}, a, file);
+ }
}
}
}
@@ -188,4 +211,44 @@
return CDISeamSolderPreferences.getInstance();
}
+ private IParametedType getDefaultType(IBean bean) {
+ Set<IParametedType> ts = bean.getLegalTypes();
+ if(ts.size() < 3) {
+ for (IParametedType t: ts) {
+ if(!"java.lang.Object".equals(t.getType().getFullyQualifiedName())) {
+ return t;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getKey(IBean bean) {
+ IAnnotationDeclaration a = bean.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName());
+ if(a != null) {
+ IParametedType type = getDefaultType(bean);
+ if(type != null) {
+ return createKey(type, bean.getQualifierDeclarations(true));
+ }
+ }
+ return null;
+ }
+
+ private String createKey(IParametedType type, Set<IQualifierDeclaration> qs) {
+ Set<String> ss = new TreeSet<String>();
+ for (IQualifierDeclaration q: qs) {
+ if(!q.getTypeName().equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME)
+ && !q.getTypeName().equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)) {
+ ss.add(q.getTypeName());
+ }
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append("#DefaultBean_").append(type.getType().getFullyQualifiedName());
+ for (String s: ss) {
+ sb.append(':').append(s);
+ }
+ return sb.toString();
+ }
+
}
More information about the jbosstools-commits
mailing list