[jbosstools-commits] JBoss Tools SVN: r36598 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder and 8 other directories.

Author: xcoulon Date: 2011-11-24 03:48:43 -0500 (Thu, 24 Nov 2011) New Revision: 36598 Removed: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingVisitor.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingsVisitor.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodBindingVisitor.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameter.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameterAnnotation.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParametersVisitor.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/ResourceMethodAnnotatedParameter.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/.externalToolBuilders/ Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedListener.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsApplication.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsElement.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsProvider.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/.project trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AbstractCommonTestCase.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsElementChangedProcessorTestCase.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/CompilationUnitsRepositoryTestCase.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java Log: fixing first level of test failures with Tycho (and removing old stuff) Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-11-24 08:48:43 UTC (rev 36598) @@ -10,16 +10,17 @@ org.eclipse.core.resources;bundle-version="3.7.100";visibility:=reexport, org.eclipse.equinox.ds;bundle-version="1.3.0";visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.7.0";visibility:=reexport, - org.eclipse.jdt.launching;bundle-version="3.6.0", - org.eclipse.jdt.launching.macosx;bundle-version="3.2.100";resolution:=optional, + org.eclipse.jdt.launching;bundle-version="3.6.0";visibility:=reexport, + org.eclipse.jdt.launching.macosx;bundle-version="3.2.100";visibility:=reexport;resolution:=optional, org.eclipse.jface.text;bundle-version="3.7.0";visibility:=reexport, - org.eclipse.ui.workbench;bundle-version="3.7.0", - org.eclipse.jdt.ui;bundle-version="3.7.0", - org.eclipse.jdt.core.manipulation;bundle-version="1.3.0", - org.eclipse.ui.editors;bundle-version="3.7.0", - org.eclipse.core.commands;bundle-version="3.6.0", - org.eclipse.ui;bundle-version="3.7.0", - org.eclipse.ltk.core.refactoring;bundle-version="3.5.200", + org.eclipse.jst.j2ee.ejb;bundle-version="1.1.502", + org.eclipse.ui.workbench;bundle-version="3.7.0";visibility:=reexport, + org.eclipse.jdt.ui;bundle-version="3.7.0";visibility:=reexport, + org.eclipse.jdt.core.manipulation;bundle-version="1.3.0";visibility:=reexport, + org.eclipse.ui.editors;bundle-version="3.7.0";visibility:=reexport, + org.eclipse.core.commands;bundle-version="3.6.0";visibility:=reexport, + org.eclipse.ui;bundle-version="3.7.0";visibility:=reexport, + org.eclipse.ltk.core.refactoring;bundle-version="3.5.200";visibility:=reexport, org.eclipse.wst.validation;bundle-version="1.2.302";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedListener.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedListener.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedListener.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -8,7 +8,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jdt.core.IElementChangedListener; -import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; /** Listens to all change events (Java elements and resources) and triggers a new * job for each change.<br> Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsApplication.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsApplication.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsApplication.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -21,6 +21,7 @@ import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind; import org.jboss.tools.ws.jaxrs.core.metamodel.EnumKind; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsApplication; +import org.jboss.tools.ws.jaxrs.core.metamodel.InvalidModelElementException; /** The optional '@Application' annotation, used to designate the base context * URI of the root resources. Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsElement.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsElement.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsElement.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -48,6 +48,7 @@ import org.jboss.tools.ws.jaxrs.core.metamodel.EnumKind; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsElement; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsHttpMethod; +import org.jboss.tools.ws.jaxrs.core.metamodel.InvalidModelElementException; /** Base class for all elements in the JAX-RS Metamodel. * Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsProvider.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsProvider.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsProvider.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -22,6 +22,7 @@ import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind; import org.jboss.tools.ws.jaxrs.core.metamodel.EnumKind; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsProvider; +import org.jboss.tools.ws.jaxrs.core.metamodel.InvalidModelElementException; /** JAX-RS Provider class Providers *must* implement MessageBodyReader, * MessageBodyWriter or ExceptionMapper Providers *may* be annotated with Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -38,6 +38,7 @@ import org.jboss.tools.ws.jaxrs.core.metamodel.EnumKind; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsHttpMethod; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResourceMethod; +import org.jboss.tools.ws.jaxrs.core.metamodel.InvalidModelElementException; /** @author xcoulon */ public class JaxrsResourceMethod extends JaxrsElement<IMethod> implements IJaxrsResourceMethod { Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,6 +1,5 @@ package org.jboss.tools.ws.jaxrs.core.jdt; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -31,10 +31,12 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TypedRegion; -/** A visitor for a single annotation on a java member (can be a method or a +/** + * A visitor for a single annotation on a java member (can be a method or a * type). * - * @author xcoulon */ + * @author xcoulon + */ public class JavaAnnotationsVisitor extends ASTVisitor { /** the annotated member name. */ @@ -49,7 +51,8 @@ /** the bindings for the matching annotation. */ private final List<Annotation> annotations = new ArrayList<Annotation>(); - /** Full Constructor to resolve a single annotation from its fully qualified + /** + * Full Constructor to resolve a single annotation from its fully qualified * name. * * @param name @@ -57,7 +60,8 @@ * @param memberType * the member type * @param name - * the annotation name */ + * the annotation name + */ public JavaAnnotationsVisitor(final IMember member, final String annotationName) { super(); this.memberName = member.getElementName(); @@ -65,7 +69,8 @@ this.annotationNames.add(annotationName); } - /** Full Constructor to resolve a multiple annotations from their fully + /** + * Full Constructor to resolve a multiple annotations from their fully * qualified name. * * @param name @@ -73,7 +78,8 @@ * @param memberType * the member type * @param name - * the annotation name */ + * the annotation name + */ public JavaAnnotationsVisitor(final IMember member, final List<String> annotationNames) { super(); this.memberName = member.getElementName(); @@ -81,9 +87,11 @@ this.annotationNames.addAll(annotationNames); } - /** {@inheritDoc} + /** + * {@inheritDoc} * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.AnnotationTypeDeclaration) */ + * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.AnnotationTypeDeclaration) + */ @Override public final boolean visit(final AnnotationTypeDeclaration node) { if (memberType == IJavaElement.TYPE && node.getName().getFullyQualifiedName().equals(memberName)) { @@ -93,10 +101,12 @@ return true; } - /** {@inheritDoc} + /** + * {@inheritDoc} * * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * TypeDeclaration) */ + * TypeDeclaration) + */ @Override public final boolean visit(final TypeDeclaration node) { if (memberType == IJavaElement.TYPE && node.getName().getFullyQualifiedName().equals(memberName)) { @@ -106,10 +116,12 @@ return true; } - /** {@inheritDoc} + /** + * {@inheritDoc} * * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * MethodDeclaration) */ + * MethodDeclaration) + */ @Override public final boolean visit(final MethodDeclaration node) { if (memberType == IJavaElement.METHOD && node.getName().getFullyQualifiedName().equals(memberName)) { @@ -119,10 +131,12 @@ return true; } - /** {@inheritDoc} + /** + * {@inheritDoc} * * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * MethodDeclaration) */ + * MethodDeclaration) + */ @Override public final boolean visit(final FieldDeclaration node) { if (memberType == IJavaElement.FIELD) { @@ -135,38 +149,44 @@ return true; } - /** Visits the modifiers. + /** + * Visits the modifiers. * * @param modifiers - * the modifiers */ + * the modifiers + */ private void visitExtendedModifiers(final List<?> modifiers) { for (Object modifier : modifiers) { if (modifier instanceof org.eclipse.jdt.core.dom.Annotation) { final org.eclipse.jdt.core.dom.Annotation annotation = (org.eclipse.jdt.core.dom.Annotation) modifier; IAnnotationBinding annotationBinding = ((org.eclipse.jdt.core.dom.Annotation) modifier) .resolveAnnotationBinding(); - final String qualifiedName = annotationBinding.getAnnotationType().getQualifiedName(); - final String name = annotationBinding.getAnnotationType().getName(); - if (annotationNames.contains(qualifiedName) || annotationNames.contains(name)) { - final String annotationName = annotationBinding.getAnnotationType().getQualifiedName(); - final Map<String, List<String>> annotationElements = resolveAnnotationElements(annotationBinding); - final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(), - annotation.getLength(), IDocument.DEFAULT_CONTENT_TYPE); - final IAnnotation javaAnnotation = (IAnnotation) annotationBinding.getJavaElement(); - annotations.add(new Annotation(javaAnnotation, annotationName, annotationElements, typedRegion)); + if (annotationBinding != null) { + final String qualifiedName = annotationBinding.getAnnotationType().getQualifiedName(); + final String name = annotationBinding.getAnnotationType().getName(); + if (annotationNames.contains(qualifiedName) || annotationNames.contains(name)) { + final String annotationName = annotationBinding.getAnnotationType().getQualifiedName(); + final Map<String, List<String>> annotationElements = resolveAnnotationElements(annotationBinding); + final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(), + annotation.getLength(), IDocument.DEFAULT_CONTENT_TYPE); + final IAnnotation javaAnnotation = (IAnnotation) annotationBinding.getJavaElement(); + annotations + .add(new Annotation(javaAnnotation, annotationName, annotationElements, typedRegion)); + } } } } } - /** Returns the Annotation element matching the annotation name given in the - * visitor constructor. - * This method should only be called when the constructor with a single - * annotation name was used. + /** + * Returns the Annotation element matching the annotation name given in the + * visitor constructor. This method should only be called when the + * constructor with a single annotation name was used. * * @return the annotation found on the target java element * @throws JavaModelException - * in case of underlying exception */ + * in case of underlying exception + */ public final Annotation getResolvedAnnotation() throws JavaModelException { assert annotationNames.size() == 1; if (annotations.size() == 0) { @@ -175,19 +195,19 @@ return annotations.get(0); } - /** Returns the Annotation elements matching the annotations name given in - * the - * visitor constructor. The matching annotations are indexed by their - * associated Java type's fully qualified names. - * This method should only be called when the constructor with multiple - * annotation names was used. + /** + * Returns the Annotation elements matching the annotations name given in + * the visitor constructor. The matching annotations are indexed by their + * associated Java type's fully qualified names. This method should only be + * called when the constructor with multiple annotation names was used. * * @return the annotation found on the target java element * @throws JavaModelException - * in case of underlying exception */ + * in case of underlying exception + */ public final Map<String, Annotation> getResolvedAnnotations() throws JavaModelException { final Map<String, Annotation> resolvedJavaAnnotations = new HashMap<String, Annotation>(); - for (Annotation annotation: annotations) { + for (Annotation annotation : annotations) { resolvedJavaAnnotations.put(annotation.getName(), annotation); } return resolvedJavaAnnotations; Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -15,14 +15,12 @@ import org.eclipse.jdt.core.dom.IAnnotationBinding; import org.eclipse.jdt.core.dom.IMemberValuePairBinding; import org.eclipse.jdt.core.dom.IMethodBinding; -import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.IVariableBinding; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.SingleVariableDeclaration; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TypedRegion; import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; -import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsElement; public class JavaMethodSignaturesVisitor extends ASTVisitor { Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -18,11 +18,8 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -31,6 +28,7 @@ import org.eclipse.jdt.core.Flags; import org.eclipse.jdt.core.IAnnotatable; import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IClassFile; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; @@ -38,25 +36,20 @@ import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.ISourceRange; -import org.eclipse.jdt.core.ISourceReference; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.ITypeHierarchy; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTParser; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.IAnnotationBinding; -import org.eclipse.jdt.core.dom.IMemberValuePairBinding; -import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.jdt.core.search.IJavaSearchScope; import org.eclipse.jdt.core.search.SearchEngine; +import org.eclipse.jdt.internal.core.BinaryType; import org.eclipse.jdt.internal.core.CreateTypeHierarchyOperation; -import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jdt.internal.core.SourceType; import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; /** A JDT wrapper that provides utility methods to manipulate the Java Model. @@ -200,14 +193,22 @@ * once for each type. Returns null if the given member was null. * @throws JavaModelException * in case of exception underneath... */ - public static CompilationUnit parse(final IMember member, final IProgressMonitor progressMonitor) + public static CompilationUnit parse(final ICompilationUnit compilationUnit, final IProgressMonitor progressMonitor) throws JavaModelException { - if (member == null) { + if (compilationUnit == null || !compilationUnit.exists()) { return null; } - return parse(member.getCompilationUnit(), progressMonitor); - } + ASTParser parser = ASTParser.newParser(AST.JLS3); + parser.setKind(ASTParser.K_COMPILATION_UNIT); + parser.setSource(compilationUnit); + parser.setResolveBindings(true); + parser.setEnvironment(null, null, null, true); + parser.setBindingsRecovery(true); + final CompilationUnit ast = (CompilationUnit) parser.createAST(progressMonitor); + return ast; + } + /** Parse the DOM of the given member, and resolve bindings. If the given * member is not a type, then its declaring type is used by the parser. * @@ -219,22 +220,64 @@ * method. This operation is expensive and should be performed only * once for each type. Returns null if the given member was null. * @throws JavaModelException - * in case of exception underneath... */ - public static CompilationUnit parse(final ICompilationUnit compilationUnit, final IProgressMonitor progressMonitor) + * in case of exception underneath... + */ + public static CompilationUnit parse(final IMember member, final IProgressMonitor progressMonitor) throws JavaModelException { - if (compilationUnit == null || !compilationUnit.exists()) { + if (member == null) { return null; } - - ASTParser parser = ASTParser.newParser(AST.JLS3); - parser.setSource(compilationUnit); - parser.setResolveBindings(true); - parser.setBindingsRecovery(true); - // FIXME : parser.createAST throws an IllegalStateException on binary - // parameterizedType if source code is not available. - return (CompilationUnit) parser.createAST(progressMonitor); + return parse(member.getCompilationUnit(), progressMonitor); } + + /** + * Parse the DOM of the given member, and resolve bindings. If the given + * member is not a type, then its declaring type is used by the parser. + * + * @param member + * the type to parse + * @param progressMonitor + * the progress monitor + * @return compilationUnit the DOM CompilationUnit returned by the parse() + * method. This operation is expensive and should be performed only + * once for each type. Returns null if the given member was null. + * @throws JavaModelException + * in case of exception underneath... + public static CompilationUnit parse(final IMember member, final IProgressMonitor progressMonitor) + throws JavaModelException { + if (member == null) { + return null; + } + IType type = null; + if (member.getElementType() == IMember.TYPE) { + type = (IType) member; + } else { + type = member.getDeclaringType(); + } + ASTParser parser = ASTParser.newParser(AST.JLS3); + if (type instanceof BinaryType) { + IClassFile classFile = (IClassFile) type.getParent(); + if (classFile.getSource() == null) { + Logger.warn("No source attachment is available for type '" + type + + "'. Unable to resolve type arguments."); + return null; + } + parser.setKind(ASTParser.K_COMPILATION_UNIT); + parser.setSource(classFile); + } else if (type instanceof SourceType) { + parser.setSource(type.getCompilationUnit()); + } + parser.setResolveBindings(true); + parser.setBindingsRecovery(true); + // FIXME : parser.createAST throws an IllegalStateException on binary + // parameterizedType if source code is not available. + CompilationUnit node = (CompilationUnit) parser.createAST(progressMonitor); + return node; + } + */ + + /** Resolves the annotation given its type. * * @param type @@ -343,246 +386,7 @@ return annotationElements; } - /** Return the annotation binding (AST3/DOM) matching the fully qualified - * name (or matching the simple name) on the given element. Checks that the - * annotation really exists (not a fake handle) or returns null - * - * @param member - * the element to scan (can be a type or a method) - * @param compilationUnit - * the DOM CompilationUnit returned by the parse() method. This - * operation is expensive and should be performed only once for - * each type. - * @param annotationQualifiedName - * the fully qualified name of the annotation to retrieve - * @return the annotation if it exists, null otherwise - * @throws JavaModelException - * the underlying Exception thrown by the manipulated JDT APIs */ - @Deprecated - public static IAnnotationBinding resolveAnnotationBinding(final IMember member, - final CompilationUnit compilationUnit, final Class<?> annotationClass) throws JavaModelException { - return resolveAnnotationBinding(member, compilationUnit, annotationClass.getName()); - } - - @Deprecated - public static IAnnotationBinding resolveAnnotationBinding(final IMember member, - final CompilationUnit compilationUnit, final String annotationName) { - if (compilationUnit == null) { - return null; - } - MemberAnnotationBindingVisitor visitor = new MemberAnnotationBindingVisitor(member.getElementName(), - member.getElementType(), annotationName); - compilationUnit.accept(visitor); - return visitor.getAnnotationBinding(); - } - - @SuppressWarnings("unchecked") - @Deprecated - public static <T> T resolveAnnotationAttributeValue(IAnnotation annotation, CompilationUnit ast, - String attributeName) throws JavaModelException { - if (annotation == null) { - return null; - } - if (((IMember) annotation.getParent()).isBinary()) { - for (IMemberValuePair mvp : annotation.getMemberValuePairs()) { - if (mvp.getMemberName().equals(attributeName)) { - return (T) mvp.getValue(); - } - } - return null; - } - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding((IMember) annotation.getParent(), ast, - annotation.getElementName()); - return (T) resolveAnnotationAttributeValue(annotationBinding, attributeName); - } - - /** Returns the value set for the given attribute from the given annotation - * binding. - * - * @param annotationBinding - * the annotation binding - * @param attributeName - * the attribute name to look up - * @return - * @return the value of the attribute, or null if the attribute is not - * defined. The value can also be an Array of objects if the - * attribute is multi-valued. - * @throws CoreException - * the underlying CoreException thrown by the manipulated JDT - * APIs */ - @SuppressWarnings("unchecked") - @Deprecated - public static <T> T resolveAnnotationAttributeValue(final IAnnotationBinding annotationBinding, - final String attributeName) { - if (annotationBinding != null) { - for (IMemberValuePairBinding binding : annotationBinding.getAllMemberValuePairs()) { - if (binding.getName().equals(attributeName)) { - return (T) binding.getValue(); - } - } - } - return null; - } - - /** Returns the value set for the given attribute from the given annotation - * binding. - * - * @param annotationBinding - * the annotation binding - * @param attributeName - * the attribute name to look up - * @return - * @return the value of the attribute, or null if the attribute is not - * defined. The value can also be an Array of objects if the - * attribute is multi-valued. - * @throws JavaModelException - * @throws CoreException - * the underlying CoreException thrown by the manipulated JDT - * APIs */ - @Deprecated - public static Object resolveAnnotationAttributeValue(final IMember member, final CompilationUnit compilationUnit, - final Class<?> annotationClass, final String attributeName) throws JavaModelException { - if (member.isBinary()) { - final IMemberValuePair[] memberValuePairs = ((IAnnotatable) member) - .getAnnotation(annotationClass.getName()).getMemberValuePairs(); - for (IMemberValuePair valuePair : memberValuePairs) { - if (valuePair.getMemberName().equals(attributeName)) { - return valuePair.getValue(); - } - } - return null; - } - CompilationUnit ast = compilationUnit != null ? compilationUnit : parse(member, new NullProgressMonitor()); - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding(member, ast, annotationClass); - return resolveAnnotationAttributeValue(annotationBinding, attributeName); - } - - /** Resolves the fully qualified name of the annotation given its binding. - * - * @param annotationBinding - * the annotation binding - * @return the fully qualified name, or null if it could not be resolved - * @throws JavaModelException - * the exception thrown underneath */ - @Deprecated - public static String resolveAnnotationFullyQualifiedName(final IAnnotationBinding annotationBinding) - throws JavaModelException { - if (annotationBinding != null) { - return annotationBinding.getAnnotationType().getQualifiedName(); - } - return null; - } - - /** Resolves the fully qualified name of the annotation given its binding. - * - * @param annotationBinding - * the annotation binding - * @return the fully qualified name, or null if it could not be resolved - * @throws JavaModelException - * the exception thrown underneath */ - @Deprecated - public static String resolveAnnotationFullyQualifiedName(IAnnotation annotation, CompilationUnit ast) - throws JavaModelException { - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding((IMember) annotation.getParent(), ast, - annotation.getElementName()); - return resolveAnnotationFullyQualifiedName(annotationBinding); - } - - /** Resolves the parameters of the given annotation on the given method. - * - * @param methodBinding - * the binding of the method - * @param annotationNameFilter - * the fully qualified name of the annotation - * @return a map in which each 'key' is the value of an annotation and - * 'value' is the literal of the type ('int', 'long', etc.) - * @throws JavaModelException - * in case of underlying exception */ - public static Map<IAnnotationBinding, ITypedRegion> resolveMethodParamBindings(final IMethod javaMethod, - CompilationUnit compilationUnit, final Class<?> annotationTypeFilter) throws JavaModelException { - MemberAnnotationBindingsVisitor visitor = new MemberAnnotationBindingsVisitor(javaMethod, - annotationTypeFilter.getName()); - compilationUnit.accept(visitor); - return visitor.getAnnotationBindings(); - } - - /** Resolves the bindings for the given method in the given Compilation Unit - * (AST3/DOM). - * - * @param method - * the method - * @param compilationUnit - * the compilation unit - * @return the method binding or null if not found. */ - public static IMethodBinding resolveMethodBinding(final IMethod method, final CompilationUnit compilationUnit) { - MethodBindingVisitor visitor = new MethodBindingVisitor(method); - compilationUnit.accept(visitor); - return visitor.getMethodBinding(); - } - - /** Retrieve error problems from the given source member in the given - * compilation unit. - * - * @param member - * the member - * @param compilationUnit - * the compilation unit - * @return the compilation errors - * @throws JavaModelException - * in case of underlying exception */ - public static Set<IProblem> resolveErrors(final ISourceReference member, final CompilationUnit compilationUnit) - throws JavaModelException { - Set<IProblem> problems = new HashSet<IProblem>(); - ISourceRange sourceRange = member.getSourceRange(); - int typeSourceStart = sourceRange.getOffset(); - int typeSourceEnd = typeSourceStart + sourceRange.getLength(); - for (IProblem problem : compilationUnit.getProblems()) { - if (problem.isError() && typeSourceStart < problem.getSourceStart() - && problem.getSourceStart() < typeSourceEnd) { - problems.add(problem); - } - } - return problems; - } - - /** Resolves the method parameters. - * - * @param javaMethod - * @param compilationUnit - * @param annotationType - * @return the method parameters - * @throws JavaModelException */ - @Deprecated - public static List<JavaMethodParameter> resolveMethodParameters(IMethod javaMethod, - CompilationUnit compilationUnit, Class<?> annotationType) throws JavaModelException { - List<JavaMethodParameter> parameters = new ArrayList<JavaMethodParameter>(); - Map<IAnnotationBinding, ITypedRegion> bindings = JdtUtils.resolveMethodParamBindings(javaMethod, - compilationUnit, annotationType); - for (Entry<IAnnotationBinding, ITypedRegion> entry : bindings.entrySet()) { - IAnnotationBinding binding = entry.getKey(); - ITypedRegion region = entry.getValue(); - IMemberValuePairBinding[] allMemberValuePairs = binding.getAllMemberValuePairs(); - IMemberValuePairBinding memberValuePair = allMemberValuePairs[0]; - String annotationValue = (String) memberValuePair.getValue(); - int lineNumber = compilationUnit.getLineNumber(region.getOffset()); - /* - * parameters.add(new JavaMethodParameter(region.getType(), - * annotationType.getName(), annotationValue, region.getOffset(), - * region.getOffset() + region.getLength(), lineNumber)); - */ - } - // Collections.sort(parameters); - return parameters; - } - - @Deprecated - public static List<MethodParameter> resolveMethodParameters(IMethod javaMethod, CompilationUnit ast) - throws JavaModelException { - MethodParametersVisitor visitor = new MethodParametersVisitor(javaMethod); - ast.accept(visitor); - return visitor.getMethodParameters(); - } - + /** Return the first IType that matches the QualifiedName in the javaProject * (anyway, there shouldn't be more than one, unless there are duplicate * jars in the classpath, should it ?). Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingVisitor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingVisitor.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingVisitor.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,154 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.jaxrs.core.jdt; - -import java.util.List; - -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.dom.ASTVisitor; -import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration; -import org.eclipse.jdt.core.dom.FieldDeclaration; -import org.eclipse.jdt.core.dom.IAnnotationBinding; -import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.eclipse.jdt.core.dom.VariableDeclarationFragment; - -/** - * A visitor for a single annotation on a java member (can be a method or a - * type). - * - * @author xcoulon - * - */ -public class MemberAnnotationBindingVisitor extends ASTVisitor { - - /** the name of the member. */ - private final String memberName; - - /** the type of the member. */ - private final int memberType; - - /** the name of the annotation. */ - private final String annotationName; - - /** the bindings for the matching annotation. */ - private IAnnotationBinding annotationBinding = null; - - /** - * Full Constructor to resolve annotation binding from its fully qualified - * name. - * - * @param mName - * the member name - * @param mType - * the member type - * @param aName - * the annotation name - */ - public MemberAnnotationBindingVisitor(final String mName, final int mType, final String aName) { - super(); - this.memberName = mName; - this.memberType = mType; - this.annotationName = aName; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.AnnotationTypeDeclaration) - */ - @Override - public final boolean visit(final AnnotationTypeDeclaration node) { - if (memberType == IJavaElement.TYPE && node.getName().getFullyQualifiedName().equals(memberName)) { - visitExtendedModifiers((List<?>) node.getStructuralProperty(AnnotationTypeDeclaration.MODIFIERS2_PROPERTY)); - return false; - } - return true; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * TypeDeclaration) - */ - @Override - public final boolean visit(final TypeDeclaration node) { - if (memberType == IJavaElement.TYPE && node.getName().getFullyQualifiedName().equals(memberName)) { - visitExtendedModifiers((List<?>) node.getStructuralProperty(TypeDeclaration.MODIFIERS2_PROPERTY)); - return false; - } - return true; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * MethodDeclaration) - */ - @Override - public final boolean visit(final MethodDeclaration node) { - if (memberType == IJavaElement.METHOD && node.getName().getFullyQualifiedName().equals(memberName)) { - visitExtendedModifiers((List<?>) node.getStructuralProperty(MethodDeclaration.MODIFIERS2_PROPERTY)); - return false; - } - return true; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * MethodDeclaration) - */ - @Override - public final boolean visit(final FieldDeclaration node) { - if (memberType == IJavaElement.FIELD) { - VariableDeclarationFragment fragment = (VariableDeclarationFragment) (node.fragments().get(0)); - if (fragment.getName().toString().equals(memberName)) { - visitExtendedModifiers((List<?>) node.getStructuralProperty(FieldDeclaration.MODIFIERS2_PROPERTY)); - return false; - } - } - return true; - } - - /** - * Visits the modifiers. - * - * @param modifiers - * the modifiers - */ - private void visitExtendedModifiers(final List<?> modifiers) { - for (Object modifier : modifiers) { - if (modifier instanceof Annotation) { - IAnnotationBinding binding = ((Annotation) modifier).resolveAnnotationBinding(); - if (annotationName != null - && (annotationName.equals(binding.getAnnotationType().getQualifiedName()) || annotationName - .equals(binding.getAnnotationType().getName()))) { - annotationBinding = binding; - break; - } - } - } - } - - /** - * @return the annotation binding found during the call to visit(). - */ - public final IAnnotationBinding getAnnotationBinding() { - return annotationBinding; - } - -} \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingsVisitor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingsVisitor.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MemberAnnotationBindingsVisitor.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,126 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.jaxrs.core.jdt; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.dom.ASTVisitor; -import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.IAnnotationBinding; -import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.eclipse.jdt.core.dom.SingleVariableDeclaration; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.TypedRegion; - -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -/** - * A visitor for multiple annotations on a java member (can be a method or a - * type). - * - * @author xcoulon - * - */ -// TODO : very similar to MemberAnnotationBindingVisitor in common bundle, but -// this one manages several annotations of the same type on a single member (ex -// : multiple <code>javax.ws.rs.PathParam</code> on a method parameters) - -public class MemberAnnotationBindingsVisitor extends ASTVisitor { - - /** the name of the method for which its parameters are looked for. */ - private final String methodName; - - /** the name of the annotation. */ - private final String annotationName; - - /** the bindings for the matching annotation. */ - private final Map<IAnnotationBinding, ITypedRegion> annotationBindings = new HashMap<IAnnotationBinding, ITypedRegion>(); - - /** - * Full Constructor to resolve annotation binding from its fully qualified - * name. - * - * @param mName - * the member name - * @param mType - * the member type - * @param aName - * the annotation name - */ - public MemberAnnotationBindingsVisitor(final IMethod method, final String aName) { - super(); - this.methodName = method.getElementName(); - this.annotationName = aName; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * MethodDeclaration) - */ - @Override - public final boolean visit(final MethodDeclaration node) { - if (node.getName().getFullyQualifiedName().equals(methodName)) { - visitExtendedModifiers((List<?>) node.getStructuralProperty(MethodDeclaration.PARAMETERS_PROPERTY)); - } - return false; - } - - /** - * Visits the modifiers. - * - * @param modifiers - * the modifiers - */ - private void visitExtendedModifiers(final List<?> parameters) { - for (Object param : parameters) { - if (param instanceof SingleVariableDeclaration) { - SingleVariableDeclaration variable = (SingleVariableDeclaration) param; - List<?> modifiers = (List<?>) ((SingleVariableDeclaration) param) - .getStructuralProperty(SingleVariableDeclaration.MODIFIERS2_PROPERTY); - for (Object modifier : modifiers) { - if (modifier instanceof Annotation) { - IAnnotationBinding annotationBinding = ((Annotation)modifier).resolveAnnotationBinding(); - if (annotationName != null - && (annotationName.equals(annotationBinding.getAnnotationType().getQualifiedName()) || annotationName - .equals(annotationBinding.getAnnotationType().getName()))) { - int startPosition = variable.getStartPosition(); - int length = variable.getLength(); - annotationBindings.put(annotationBinding, new TypedRegion(startPosition, length, variable.getType().toString())); - } - } - } - } - } - } - - /** - * @return the annotation binding found during the call to visit(). - */ - public final Map<IAnnotationBinding, ITypedRegion> getAnnotationBindings() { - return annotationBindings; - } - -} \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodBindingVisitor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodBindingVisitor.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodBindingVisitor.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.jaxrs.core.jdt; - -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.ISourceRange; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.ASTVisitor; -import org.eclipse.jdt.core.dom.IMethodBinding; -import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; - -/** - * A visitor for a single annotation on a java member (can be a method or a - * type). - * - * @author xcoulon - * - */ -public class MethodBindingVisitor extends ASTVisitor { - - /** the method to match during the visit. */ - private final IMethod method; - - /** the bindings for the matching method. */ - private IMethodBinding methodBinding = null; - - - /** - * Full Constructor to resolve method binding. - * - * @param m - * the method to match during the visit - */ - public MethodBindingVisitor(final IMethod m) { - super(); - this.method = m; - } - - @Override - public final boolean visit(final MethodDeclaration node) { - try { - ISourceRange sourceRange = method.getSourceRange(); - int position = node.getStartPosition(); - int begin = sourceRange.getOffset(); - int end = sourceRange.getOffset() + sourceRange.getLength(); - if (node.getName().getFullyQualifiedName().equals(method.getElementName()) - // need to take care about comments above a method declaration - && begin <= position - && position <= end) { - methodBinding = node.resolveBinding(); - } - } catch (JavaModelException e) { - Logger.error("Error while resolving method bindings", e); - } - return false; - } - - /** - * @return the method binding that correspond to the method given in the instance constructor. - */ - public final IMethodBinding getMethodBinding() { - return methodBinding; - } - -} \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameter.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameter.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameter.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,96 +0,0 @@ -package org.jboss.tools.ws.jaxrs.core.jdt; - -import java.util.List; - -@Deprecated -public class MethodParameter { - - private final String name; - private final String typeName; - private final List<MethodParameterAnnotation> annotations; - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the typeName - */ - public String getTypeName() { - return typeName; - } - - /** - * @return the annotations - */ - public List<MethodParameterAnnotation> getAnnotations() { - return annotations; - } - - public MethodParameter(String name, String typeName, List<MethodParameterAnnotation> annotations) { - this.name = name; - this.typeName = typeName; - this.annotations = annotations; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((annotations == null) ? 0 : annotations.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((typeName == null) ? 0 : typeName.hashCode()); - return result; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - MethodParameter other = (MethodParameter) obj; - if (annotations == null) { - if (other.annotations != null) - return false; - } else if (!annotations.equals(other.annotations)) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - if (typeName == null) { - if (other.typeName != null) - return false; - } else if (!typeName.equals(other.typeName)) - return false; - return true; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "MethodParameter [name=" + name + ", typeName=" + typeName + ", annotations=" + annotations + "]"; - } - -} Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameterAnnotation.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameterAnnotation.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParameterAnnotation.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,91 +0,0 @@ -package org.jboss.tools.ws.jaxrs.core.jdt; - -import org.eclipse.jface.text.TypedRegion; - -@Deprecated -public class MethodParameterAnnotation { - - private final String annotationTypeName; - private final String annotationValue; - private final TypedRegion region; - - public MethodParameterAnnotation(String annotationTypeName, String annotationValue, TypedRegion region) { - this.annotationTypeName = annotationTypeName; - this.annotationValue = annotationValue; - this.region = region; - } - - /** - * @return the annotationTypeName - */ - public String getAnnotationTypeName() { - return annotationTypeName; - } - - /** - * @return the annotationValue - */ - public String getAnnotationValue() { - return annotationValue; - } - - /** - * @return the region - */ - public TypedRegion getRegion() { - return region; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((annotationTypeName == null) ? 0 : annotationTypeName.hashCode()); - result = prime * result + ((annotationValue == null) ? 0 : annotationValue.hashCode()); - return result; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - MethodParameterAnnotation other = (MethodParameterAnnotation) obj; - if (annotationTypeName == null) { - if (other.annotationTypeName != null) - return false; - } else if (!annotationTypeName.equals(other.annotationTypeName)) - return false; - if (annotationValue == null) { - if (other.annotationValue != null) - return false; - } else if (!annotationValue.equals(other.annotationValue)) - return false; - return true; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "MethodParameterAnnotation [annotationTypeName=" + annotationTypeName + ", annotationValue=" - + annotationValue + "]"; - } - -} Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParametersVisitor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParametersVisitor.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/MethodParametersVisitor.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.jaxrs.core.jdt; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.dom.ASTVisitor; -import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.IAnnotationBinding; -import org.eclipse.jdt.core.dom.IVariableBinding; -import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.eclipse.jdt.core.dom.SingleVariableDeclaration; -import org.eclipse.jface.text.TypedRegion; - -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -/** - * A visitor for multiple annotations on a java member (can be a method or a - * type). - * - * @author xcoulon - * - */ -// TODO : very similar to MemberAnnotationBindingVisitor in common bundle, but -// this one manages several annotations of the same type on a single member (ex -// : multiple <code>javax.ws.rs.PathParam</code> on a method parameters) - -public class MethodParametersVisitor extends ASTVisitor { - - /** the name of the method for which its parameters are looked for. */ - private final String methodName; - - /** the bindings for the matching annotation. */ - private final List<MethodParameter> methodParameters = new ArrayList<MethodParameter>(); - - /** - * Full Constructor to resolve annotation binding from its fully qualified - * name. - * - * @param mName - * the member name - * @param mType - * the member type - * @param aName - * the annotation name - */ - public MethodParametersVisitor(final IMethod method) { - super(); - this.methodName = method.getElementName(); - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom. - * MethodDeclaration) - */ - @Override - public final boolean visit(final MethodDeclaration node) { - if (node.getName().getFullyQualifiedName().equals(methodName)) { - visitExtendedModifiers((List<?>) node.getStructuralProperty(MethodDeclaration.PARAMETERS_PROPERTY)); - } - return false; - } - - /** - * Visits the modifiers. - * - * @param modifiers - * the modifiers - */ - private void visitExtendedModifiers(final List<?> parameters) { - for (Object p : parameters) { - if (p instanceof SingleVariableDeclaration) { - SingleVariableDeclaration param = (SingleVariableDeclaration) p; - final String parameterName = param.getName().getFullyQualifiedName(); - final IVariableBinding paramBinding = param.resolveBinding(); - final String paramTypeName = paramBinding.getType().getQualifiedName(); - final List<MethodParameterAnnotation> annotations = new ArrayList<MethodParameterAnnotation>(); - final List<?> modifiers = (List<?>) (param - .getStructuralProperty(SingleVariableDeclaration.MODIFIERS2_PROPERTY)); - for (Object modifier : modifiers) { - if (modifier instanceof Annotation) { - final Annotation annotation = (Annotation) modifier; - IAnnotationBinding annotationBinding = annotation.resolveAnnotationBinding(); - final String qualifiedName = annotationBinding.getAnnotationType().getQualifiedName(); - final String annotationValue = JdtUtils.resolveAnnotationAttributeValue(annotationBinding, - "value"); - final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(), - annotation.getLength(), param.getType().toString()); - annotations.add(new MethodParameterAnnotation(qualifiedName, annotationValue, typedRegion)); - } - } - MethodParameter methodParameter = new MethodParameter(parameterName, paramTypeName, annotations); - methodParameters.add(methodParameter); - } - } - } - - public List<MethodParameter> getMethodParameters() { - return methodParameters; - } - -} \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/ResourceMethodAnnotatedParameter.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/ResourceMethodAnnotatedParameter.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/ResourceMethodAnnotatedParameter.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.jaxrs.core.jdt; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.IValidable; - -@Deprecated -public class ResourceMethodAnnotatedParameter implements IValidable { - - private final String parameterType; - - private final String annotationType; - - private final String annotationValue; - - private final int charStart; - - private final int charEnd; - - private final int lineNumber; - - /** - * Full constructor - * - * @param parent - * @param parameterName - * @param parameterType - * @param annotationType - * @param annotationValue - * @param charStart - * @param charEnd - * @param lineNumber - */ - public ResourceMethodAnnotatedParameter(String parameterType, String annotationType, String annotationValue, - int charStart, int charEnd, int lineNumber) { - super(); - this.parameterType = parameterType; - this.annotationType = annotationType; - this.annotationValue = annotationValue; - this.charStart = charStart; - this.charEnd = charEnd; - this.lineNumber = lineNumber; - } - - @Override - public void validate(IProgressMonitor progressMonitor) throws CoreException { - // TODO Auto-generated method stub - } - - /** - * @return the parameterType - */ - public String getParameterType() { - return parameterType; - } - - /** - * @return the annotationType - */ - public String getAnnotationType() { - return annotationType; - } - - /** - * @return the annotationValue - */ - public String getAnnotationValue() { - return annotationValue; - } - - /** - * @return the charStart - */ - public int getCharStart() { - return charStart; - } - - /** - * @return the charEnd - */ - public int getCharEnd() { - return charEnd; - } - - /** - * @return the lineNumber - */ - public int getLineNumber() { - return lineNumber; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "ResourceMethodAnnotatedParameter [parameterType=" + parameterType + ", annotationType=" - + annotationType + ", annotationValue=" + annotationValue + "]"; - } - -} Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-11-24 08:48:43 UTC (rev 36598) @@ -21,7 +21,19 @@ org.eclipse.jst.common.project.facet.ui;bundle-version="1.4.102", org.eclipse.ui.workbench.texteditor;bundle-version="3.6.0", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.102", - org.eclipse.jdt.ui;bundle-version="3.6.0" + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.jdt.doc.user;bundle-version="3.7.0";resolution:=optional, + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.equinox.ds;bundle-version="1.3.1", + org.eclipse.jdt.core;bundle-version="3.7.1", + org.eclipse.jface.text;bundle-version="3.7.1", + org.eclipse.ui.workbench;bundle-version="3.7.0", + org.eclipse.jdt.core.manipulation;bundle-version="1.4.0", + org.eclipse.ui.editors;bundle-version="3.7.0", + org.eclipse.core.commands;bundle-version="3.6.0", + org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.ltk.core.refactoring;bundle-version="3.5.201", + org.eclipse.wst.validation;bundle-version="1.2.302" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-11-24 08:48:43 UTC (rev 36598) @@ -6,18 +6,30 @@ Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core.test;singleton:=true Bundle-Version: 1.2.2.qualifier Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCoreTestsPlugin -Require-Bundle: org.jboss.tools.ws.jaxrs.core;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport, - org.slf4j.api;bundle-version="1.6.1";visibility:=reexport, +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.jboss.tools.ws.jaxrs.core;bundle-version="1.2.2", + org.eclipse.ui.ide;bundle-version="3.7.0", + org.slf4j.api;bundle-version="1.6.1", org.apache.commons.lang;bundle-version="2.1.0", org.eclipse.swt;bundle-version="3.7.0", - org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200";visibility:=reexport, + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", org.eclipse.jst.ws.jaxrs.core;bundle-version="1.0.300", org.junit4;bundle-version="4.8.1", ch.qos.logback.core;bundle-version="0.9.27", ch.qos.logback.classic;bundle-version="0.9.27", org.eclipse.jdt.ui;bundle-version="3.7.0", - org.eclipse.jdt.doc.user;bundle-version="3.7.0";resolution:=optional + org.eclipse.jdt.doc.user;bundle-version="3.7.0";resolution:=optional, + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.equinox.ds;bundle-version="1.3.1", + org.eclipse.jdt.core;bundle-version="3.7.1", + org.eclipse.jface.text;bundle-version="3.7.1", + org.eclipse.ui.workbench;bundle-version="3.7.0", + org.eclipse.jdt.core.manipulation;bundle-version="1.4.0", + org.eclipse.ui.editors;bundle-version="3.7.0", + org.eclipse.core.commands;bundle-version="3.6.0", + org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.ltk.core.refactoring;bundle-version="3.5.201", + org.eclipse.wst.validation;bundle-version="1.2.302" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Eclipse-RegisterBuddy: org.apache.log4j Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/.project =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/.project 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/.project 2011-11-24 08:48:43 UTC (rev 36598) @@ -11,30 +11,10 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AbstractCommonTestCase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AbstractCommonTestCase.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AbstractCommonTestCase.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -58,7 +58,7 @@ protected IProject project; - protected Bundle bundle = JBossJaxrsCoreTestsPlugin.getDefault().getBundle(); + protected static Bundle bundle = JBossJaxrsCoreTestsPlugin.getDefault().getBundle(); public final static String DEFAULT_SAMPLE_PROJECT_NAME = WorkbenchUtils .retrieveSampleProjectName(AbstractCommonTestCase.class); @@ -84,6 +84,7 @@ @BeforeClass public static void setupWorkspace() throws Exception { + org.eclipse.jdt.core.JavaCore.getPlugin().start(bundle.getBundleContext()); long startTime = new Date().getTime(); try { IWorkspace workspace = ResourcesPlugin.getWorkspace(); Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsElementChangedProcessorTestCase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsElementChangedProcessorTestCase.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsElementChangedProcessorTestCase.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -6,16 +6,17 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isOneOf; +import static org.jboss.tools.ws.jaxrs.core.WorkbenchUtils.getAnnotation; +import static org.jboss.tools.ws.jaxrs.core.WorkbenchUtils.getMethod; +import static org.jboss.tools.ws.jaxrs.core.WorkbenchUtils.getType; import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementChangedEvent.F_ELEMENT_KIND; import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementChangedEvent.F_PATH_VALUE; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.spy; import java.util.Arrays; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -28,12 +29,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.ws.jaxrs.core.AbstractCommonTestCase; -import org.jboss.tools.ws.jaxrs.core.WorkbenchUtils; import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsEndpoint; import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsHttpMethod; import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsMetamodel; @@ -54,8 +53,6 @@ import org.junit.Ignore; import org.junit.Test; -import static org.jboss.tools.ws.jaxrs.core.WorkbenchUtils.*; - public class JaxrsElementChangedProcessorTestCase extends AbstractCommonTestCase { private JaxrsMetamodel metamodel; Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/CompilationUnitsRepositoryTestCase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/CompilationUnitsRepositoryTestCase.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/CompilationUnitsRepositoryTestCase.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -23,9 +23,6 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.jboss.tools.ws.jaxrs.core.AbstractCommonTestCase; import org.jboss.tools.ws.jaxrs.core.WorkbenchUtils; -import org.jboss.tools.ws.jaxrs.core.jdt.CompilationUnitsRepository; -import org.jboss.tools.ws.jaxrs.core.jdt.JavaMethodSignature; -import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils; import org.junit.Before; import org.junit.Test; @@ -108,7 +105,6 @@ public void shouldRemoveAST() throws CoreException { // pre-conditions final IType type = getType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource"); - final IMethod method = getMethod(type, "getCustomer"); final ICompilationUnit compilationUnit = type.getCompilationUnit(); // record the previous version repository.getAST(compilationUnit); Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2011-11-24 08:33:32 UTC (rev 36597) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2011-11-24 08:48:43 UTC (rev 36598) @@ -31,7 +31,6 @@ import javax.ws.rs.HttpMethod; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; import junit.framework.Assert; @@ -50,9 +49,6 @@ import org.eclipse.jdt.core.ITypeHierarchy; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.IAnnotationBinding; -import org.eclipse.jdt.core.dom.IMethodBinding; -import org.eclipse.jface.text.ITypedRegion; import org.jboss.tools.ws.jaxrs.core.AbstractCommonTestCase; import org.jboss.tools.ws.jaxrs.core.JBossJaxrsCoreTestsPlugin; import org.jboss.tools.ws.jaxrs.core.WorkbenchUtils; @@ -160,167 +156,6 @@ } @Test - public void shouldAssertTypeHasAnnotationWithFullyQualifiedNameUsage() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.PurchaseOrderResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - Assert.assertNotNull("Type SimpleAnnotation not found", - JdtUtils.resolveAnnotationBinding(resourceType, compilationUnit, Path.class)); - } - - @Test - public void shouldAssertTypeHasAnnotationWithSimpleNameUsage() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - Assert.assertNotNull("Type SimpleAnnotation not found", - JdtUtils.resolveAnnotationBinding(resourceType, compilationUnit, Path.class)); - } - - @Test - public void shouldAssertMethodHasAnnotationWithSimpleName() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - for (IMethod method : resourceType.getMethods()) { - if (method.getElementName().equals("createCustomer")) { - Assert.assertNotNull("Method SimpleAnnotation not found", - JdtUtils.resolveAnnotationBinding(method, compilationUnit, "javax.ws.rs.POST")); - } - } - } - - @Test - public void shouldNotAssertTypeHasInvalidAnnotation() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.PurchaseOrderResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - Assert.assertNull("Type SimpleAnnotation not expected", - JdtUtils.resolveAnnotationBinding(resourceType, compilationUnit, "@Path")); - - } - - @Test - public void shouldNotAssertTypeHasUnusedAnnotation() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.PurchaseOrderResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - Assert.assertNull("Type SimpleAnnotation not expected", - JdtUtils.resolveAnnotationBinding(resourceType, compilationUnit, HttpMethod.class)); - - } - - @Test - public void shouldResolveTypeAnnotationAttributeValue() throws CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.PurchaseOrderResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - Object value = JdtUtils.resolveAnnotationAttributeValue(resourceType, compilationUnit, Path.class, "value"); - Assert.assertEquals("Wrong result", "/orders", value); - } - - @Test - public void shouldNotResolveTypeAnnotationAttributeValueWhenAttributeUnknown() throws CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - Assert.assertNull("Wrong result", - JdtUtils.resolveAnnotationAttributeValue(resourceType, compilationUnit, Path.class, "unknown")); - } - - @Test - public void shouldNotResolveTypeAnnotationOnbinaryType() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.resteasy.plugins.providers.jaxb.CollectionProvider", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, progressMonitor); - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding(type, compilationUnit, Produces.class); - Assert.assertNull("Type SimpleAnnotation not expected", annotationBinding); - } - - @Test - public void shouldResolveTypeAnnotationAttributeValueAsSingleString() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.PurchaseOrderResource", - javaProject, progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, progressMonitor); - Object value = JdtUtils.resolveAnnotationAttributeValue(type, compilationUnit, Path.class, "value"); - Assert.assertNotNull("Values not found", value); - Assert.assertTrue("Wrong result type", value instanceof String); - Assert.assertEquals("Wrong result value", "/orders", value); - } - - @Test - public void shouldResolveTypeAnnotationAttributeValueAsSingleStringQualifiedValue() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, progressMonitor); - Object value = JdtUtils.resolveAnnotationAttributeValue(type, compilationUnit, Path.class, "value"); - Assert.assertNotNull("Values not found", value); - Assert.assertTrue("Wrong result type", value instanceof String); - Assert.assertEquals("Wrong result value", "/customers", value); - } - - @Test - public void shouldResolveTypeAnnotationAttributeValueAsSingleQualifiedMediaTypeValue() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, progressMonitor); - Object value = JdtUtils.resolveAnnotationAttributeValue(type, compilationUnit, Consumes.class, "value"); - Assert.assertNotNull("Values not found", value); - Assert.assertTrue("Wrong result type: " + value.getClass(), value instanceof Object[]); - Assert.assertEquals("Wrong result: " + value, 1, ((Object[]) value).length); - Assert.assertTrue("Wrong result type: " + value, ((Object[]) value)[0] instanceof String); - Assert.assertEquals("Wrong result value", "application/xml", ((Object[]) value)[0]); - } - - @Test - public void shouldResolveTypeAnnotationAttributeValueAsSingleSimpleMediaTypeValue() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.GameResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - // warning : ensure the annotation syntax includes brackets to make an - // array : @Consumes({ APPLICATION_XML }) - CompilationUnit compilationUnit = JdtUtils.parse(type, progressMonitor); - Object values = JdtUtils.resolveAnnotationAttributeValue(type, compilationUnit, Consumes.class, "value"); - Assert.assertNotNull("Values not found", values); - Assert.assertTrue("Wrong result type: " + values.getClass(), values instanceof Object[]); - Assert.assertEquals("Wrong result value", "application/xml", ((Object[]) values)[0]); - } - - @Test - public void shouldNotResolveTypeAnnotationAttributeValueOnMissingAnnotation() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.BookResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, progressMonitor); - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding(type, compilationUnit, Consumes.class); - Assert.assertNull("Type SimpleAnnotation not expected", annotationBinding); - } - - @Test public void shouldResolveConcreteTypeArgumentsOnBinaryTypesWithoutSources() throws CoreException, OperationCanceledException, InterruptedException { @@ -419,34 +254,6 @@ } @Test - public void shouldResolveFullyQualifiedNameFromSimpleName() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding(resourceType, compilationUnit, - Path.class); - Assert.assertNotNull("Type SimpleAnnotation not found", annotationBinding); - Assert.assertEquals("Type SimpleAnnotation not found", Path.class.getName(), - JdtUtils.resolveAnnotationFullyQualifiedName(annotationBinding)); - } - - @Test - public void shouldResolveFullyQualifiedNameFromQualifiedName() throws JavaModelException, CoreException { - - IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", - javaProject, progressMonitor); - Assert.assertNotNull("ResourceType not found", resourceType); - CompilationUnit compilationUnit = JdtUtils.parse(resourceType, progressMonitor); - IAnnotationBinding annotationBinding = JdtUtils.resolveAnnotationBinding(resourceType, compilationUnit, - Consumes.class); - Assert.assertNotNull("Type SimpleAnnotation not found", annotationBinding); - Assert.assertEquals("Type SimpleAnnotation not found", Consumes.class.getName(), - JdtUtils.resolveAnnotationFullyQualifiedName(annotationBinding)); - } - - @Test public void shouldResolveTopLevelTypeFromSourceType() throws JavaModelException, CoreException { IType resourceType = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", @@ -490,21 +297,6 @@ } @Test - public void shouldResolveMethodBinding() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.BookResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, null); - for (IMethod method : type.getMethods()) { - if (method.getElementName().equals("getProduct")) { - IMethodBinding methodBinding = JdtUtils.resolveMethodBinding(method, compilationUnit); - Assert.assertNotNull("Binding not found", methodBinding); - } - } - } - - @Test public void shouldGetCompiltationUnitFromType() throws CoreException { IResource resource = project .findMember("src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BookResource.java"); @@ -520,124 +312,6 @@ } @Test - public void shouldResolveMethodAnnotationBinding() throws CoreException { - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.ProductResourceLocator", - javaProject, new NullProgressMonitor()); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, null); - for (IMethod method : type.getMethods()) { - if (method.getElementName().equals("getProductResourceLocator")) { - IAnnotationBinding binding = JdtUtils.resolveAnnotationBinding(method, compilationUnit, - javax.ws.rs.Path.class); - Assert.assertNotNull("Binding not found", binding); - } - } - } - - @Test - public void shouldResolveMethodZeroQueryParam() throws CoreException { - - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.BookResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, null); - - for (IMethod method : type.getMethods()) { - if (method.getElementName().equals("getProduct")) { - Map<IAnnotationBinding, ITypedRegion> resolvedQueryParams = JdtUtils.resolveMethodParamBindings(method, - compilationUnit, QueryParam.class); - Assert.assertEquals("Wrong number of params", 0, resolvedQueryParams.size()); - } - } - } - - @Test - public void shouldResolveMethodZeroQueryParamOnNoAnnotatedParamMethod() throws CoreException { - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, null); - - for (IMethod method : type.getMethods()) { - if (method.getElementName().equals("createCustomer")) { - Map<IAnnotationBinding, ITypedRegion> resolvedQueryParams = JdtUtils.resolveMethodParamBindings(method, - compilationUnit, QueryParam.class); - Assert.assertEquals("Wrong number of params", 0, resolvedQueryParams.size()); - } - } - } - - @Test - public void shouldResolveMethodZeroQueryParamOnNoQueryParamAnnotatedParamMethod() throws CoreException { - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, null); - - for (IMethod method : type.getMethods()) { - if (method.getElementName().equals("createCustomer")) { - Map<IAnnotationBinding, ITypedRegion> resolvedQueryParams = JdtUtils.resolveMethodParamBindings(method, - compilationUnit, QueryParam.class); - Assert.assertEquals("Wrong number of params", 0, resolvedQueryParams.size()); - } - } - } - - @Test - public void shouldResolveMethodTwoQueryParam() throws CoreException { - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - CompilationUnit compilationUnit = JdtUtils.parse(type, null); - - for (IMethod method : type.getMethods()) { - if (method.getElementName().equals("getCustomers")) { - Map<IAnnotationBinding, ITypedRegion> resolvedQueryParams = JdtUtils.resolveMethodParamBindings(method, - compilationUnit, QueryParam.class); - Assert.assertEquals("Wrong number of params", 2, resolvedQueryParams.size()); - } - } - } - - @Test - public void shoudRetrieveTwoMethodParametersWithAnnotations() throws CoreException { - // preconditions - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - MethodParametersVisitor visitor = new MethodParametersVisitor(WorkbenchUtils.getMethod(type, "getCustomers")); - final CompilationUnit ast = JdtUtils.parse(type.getCompilationUnit(), progressMonitor); - // operation - ast.accept(visitor); - List<MethodParameter> methodParameters = visitor.getMethodParameters(); - // verifications - assertThat(methodParameters.size(), equalTo(3)); - assertThat(methodParameters.get(0).getName(), equalTo("start")); - assertThat(methodParameters.get(0).getTypeName(), equalTo("int")); - assertThat(methodParameters.get(0).getAnnotations().get(0).getAnnotationTypeName(), - equalTo(QueryParam.class.getName())); - assertThat(methodParameters.get(0).getAnnotations().get(0).getAnnotationValue(), equalTo("start")); - assertThat(methodParameters.get(1).getAnnotations().size(), equalTo(2)); - } - - @Test - public void shoudRetrieveOneMethodParametersWithoutAnnotation() throws CoreException { - // pre-conditions - IType type = JdtUtils.resolveType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource", javaProject, - progressMonitor); - Assert.assertNotNull("Type not found", type); - MethodParametersVisitor visitor = new MethodParametersVisitor(WorkbenchUtils.getMethod(type, "createCustomer")); - // operation - JdtUtils.parse(type, progressMonitor).accept(visitor); - List<MethodParameter> methodParameters = visitor.getMethodParameters(); - // verifications - assertThat(methodParameters.size(), equalTo(1)); - assertThat(methodParameters.get(0).getName(), equalTo("customer")); - assertThat(methodParameters.get(0).getTypeName(), equalTo("org.jboss.tools.ws.jaxrs.sample.domain.Customer")); - assertThat(methodParameters.get(0).getAnnotations().size(), equalTo(0)); - } - - @Test public void shoudNotParseNullMember() throws CoreException { Assert.assertNull(JdtUtils.parse((IMember) null, progressMonitor)); }