moving HasDirectlyAnnotation to Helper

javaparser · Aug 15, 2018 · 2402d77 · 2402d77
1 parent 999c27a
commit 2402d77
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/...src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/Helper.java b/...src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/Helper.java
@@ -17,6 +17,13 @@
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.*;
+import com.github.javaparser.ast.expr.AnnotationExpr;
+import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
+import com.github.javaparser.resolution.UnsolvedSymbolException;
+import com.github.javaparser.resolution.declarations.ResolvedTypeDeclaration;
+import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
+import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
+import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 
 import java.util.EnumSet;
 import java.util.Optional;
@@ -82,4 +89,20 @@ static String getClassName(String base, Node container) {
         }
         return base;
     }
+
+    static boolean hasDirectlyAnnotation(NodeWithAnnotations<?> nodeWithAnnotations, TypeSolver typeSolver,
+                                         String canonicalName) {
+        for (AnnotationExpr annotationExpr : nodeWithAnnotations.getAnnotations()) {
+            SymbolReference<ResolvedTypeDeclaration> ref = JavaParserFactory.getContext(annotationExpr, typeSolver)
+                    .solveType(annotationExpr.getName().getId(), typeSolver);
+            if (ref.isSolved()) {
+                if (ref.getCorrespondingDeclaration().getQualifiedName().endsWith(canonicalName)) {
+                    return true;
+                }
+            } else {
+                throw new UnsolvedSymbolException(annotationExpr.getName().getId());
+            }
+        }
+        return false;
+    }
 }
diff --git a/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -197,12 +197,7 @@ public List<ResolvedConstructorDeclaration> getConstructors() {
 
     @Override
     public boolean hasDirectlyAnnotation(String canonicalName) {
-        for (AnnotationExpr annotationExpr : wrappedNode.getAnnotations()) {
-            if (solveType(annotationExpr.getName().getId(), typeSolver).getCorrespondingDeclaration().getQualifiedName().equals(canonicalName)) {
-                return true;
-            }
-        }
-        return false;
+        return Helper.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
     }
 
     @Override

diff --git a/...ithub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java b/...ithub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
@@ -21,6 +21,7 @@
 import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.body.EnumConstantDeclaration;
 import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.resolution.MethodUsage;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
@@ -102,7 +103,7 @@ public boolean isType() {
 
     @Override
     public boolean hasDirectlyAnnotation(String canonicalName) {
-        throw new UnsupportedOperationException();
+        return Helper.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
     }
 
     @Override