rename Helper to AstResolutionUtils

javaparser · Aug 15, 2018 · 066832b · 066832b
1 parent d3bc278
commit 066832b
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 42 deletions.
diff --git a/.../javaparsermodel/declarations/Helper.java → ...odel/declarations/AstResolutionUtils.java b/.../javaparsermodel/declarations/Helper.java → ...odel/declarations/AstResolutionUtils.java
@@ -33,18 +33,10 @@
 /**
  * @author Federico Tomassetti
  */
-class Helper {
+class AstResolutionUtils {
 
-    public static AccessSpecifier toAccessLevel(EnumSet<Modifier> modifiers) {
-        if (modifiers.contains(Modifier.PRIVATE)) {
-            return AccessSpecifier.PRIVATE;
-        } else if (modifiers.contains(Modifier.PROTECTED)) {
-            return AccessSpecifier.PROTECTED;
-        } else if (modifiers.contains(Modifier.PUBLIC)) {
-            return AccessSpecifier.PUBLIC;
-        } else {
-            return AccessSpecifier.DEFAULT;
-        }
+    static AccessSpecifier toAccessLevel(EnumSet<Modifier> modifiers) {
+        return Modifier.getAccessSpecifier(modifiers);
     }
 
     static String containerName(Node container) {

diff --git a/...javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java b/...javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java
@@ -13,8 +13,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode;
-
 /**
  * @author Federico Tomassetti
  */
@@ -60,17 +58,17 @@ public boolean hasDirectlyAnnotation(String qualifiedName) {
 
     @Override
     public String getPackageName() {
-        return Helper.getPackageName(wrappedNode);
+        return AstResolutionUtils.getPackageName(wrappedNode);
     }
 
     @Override
     public String getClassName() {
-        return Helper.getClassName("", wrappedNode);
+        return AstResolutionUtils.getClassName("", wrappedNode);
     }
 
     @Override
     public String getQualifiedName() {
-        String containerName = Helper.containerName(wrappedNode.getParentNode().orElse(null));
+        String containerName = AstResolutionUtils.containerName(wrappedNode.getParentNode().orElse(null));
         if (containerName.isEmpty()) {
             return wrappedNode.getName().getId();
         } else {

diff --git a/...parser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java b/...parser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
@@ -1,7 +1,5 @@
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
-import static com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode;
-
 import com.github.javaparser.ast.AccessSpecifier;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.ObjectCreationExpr;
@@ -161,17 +159,17 @@ public boolean hasDirectlyAnnotation(String qualifiedName) {
 
   @Override
   public String getPackageName() {
-    return Helper.getPackageName(wrappedNode);
+    return AstResolutionUtils.getPackageName(wrappedNode);
   }
 
   @Override
   public String getClassName() {
-    return Helper.getClassName("", wrappedNode);
+    return AstResolutionUtils.getClassName("", wrappedNode);
   }
 
   @Override
   public String getQualifiedName() {
-    String containerName = Helper.containerName(wrappedNode.getParentNode().orElse(null));
+    String containerName = AstResolutionUtils.containerName(wrappedNode.getParentNode().orElse(null));
     if (containerName.isEmpty()) {
       return getName();
     } else {

diff --git a/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -19,7 +19,6 @@
 import com.github.javaparser.ast.AccessSpecifier;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.*;
-import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
 import com.github.javaparser.resolution.declarations.*;
@@ -197,7 +196,7 @@ public List<ResolvedConstructorDeclaration> getConstructors() {
 
     @Override
     public boolean hasDirectlyAnnotation(String canonicalName) {
-        return Helper.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
+        return AstResolutionUtils.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
     }
 
     @Override
@@ -380,7 +379,7 @@ public com.github.javaparser.ast.body.ClassOrInterfaceDeclaration getWrappedNode
 
     @Override
     public AccessSpecifier accessSpecifier() {
-        return Helper.toAccessLevel(wrappedNode.getModifiers());
+        return AstResolutionUtils.toAccessLevel(wrappedNode.getModifiers());
     }
 
     ///

diff --git a/...avaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java b/...avaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
@@ -78,7 +78,7 @@ public com.github.javaparser.ast.body.ConstructorDeclaration getWrappedNode() {
 
     @Override
     public AccessSpecifier accessSpecifier() {
-        return Helper.toAccessLevel(wrappedNode.getModifiers());
+        return AstResolutionUtils.toAccessLevel(wrappedNode.getModifiers());
     }
 
     @Override

diff --git a/...ithub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java b/...ithub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
@@ -19,9 +19,7 @@
 import com.github.javaparser.ast.AccessSpecifier;
 import com.github.javaparser.ast.Node;
 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;
@@ -103,7 +101,7 @@ public boolean isType() {
 
     @Override
     public boolean hasDirectlyAnnotation(String canonicalName) {
-        return Helper.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
+        return AstResolutionUtils.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
     }
 
     @Override
@@ -316,7 +314,7 @@ public List<ResolvedTypeParameterDeclaration> getTypeParameters() {
 
         @Override
         public AccessSpecifier accessSpecifier() {
-            return Helper.toAccessLevel(enumDeclaration.getWrappedNode().getModifiers());
+            return AstResolutionUtils.toAccessLevel(enumDeclaration.getWrappedNode().getModifiers());
         }
 
         @Override

diff --git a/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java b/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java
@@ -24,14 +24,11 @@
 import com.github.javaparser.resolution.declarations.ResolvedFieldDeclaration;
 import com.github.javaparser.resolution.declarations.ResolvedTypeDeclaration;
 import com.github.javaparser.resolution.types.ResolvedType;
-import com.github.javaparser.symbolsolver.javaparser.Navigator;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
-import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
 
 import java.util.Optional;
 
-import static com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode;
 import static com.github.javaparser.symbolsolver.javaparser.Navigator.requireParentNode;
 
 /**
@@ -103,7 +100,7 @@ public String toString() {
 
     @Override
     public AccessSpecifier accessSpecifier() {
-        return Helper.toAccessLevel(wrappedNode.getModifiers());
+        return AstResolutionUtils.toAccessLevel(wrappedNode.getModifiers());
     }
 
     @Override

diff --git a/.../javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/.../javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
@@ -20,7 +20,6 @@
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
-import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
 import com.github.javaparser.resolution.declarations.*;
@@ -105,7 +104,7 @@ public ResolvedInterfaceDeclaration asInterface() {
 
     @Override
     public boolean hasDirectlyAnnotation(String canonicalName) {
-        return Helper.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
+        return AstResolutionUtils.hasDirectlyAnnotation(wrappedNode, typeSolver, canonicalName);
     }
 
     @Override
@@ -280,7 +279,7 @@ public ClassOrInterfaceDeclaration getWrappedNode() {
 
     @Override
     public AccessSpecifier accessSpecifier() {
-        return Helper.toAccessLevel(wrappedNode.getModifiers());
+        return AstResolutionUtils.toAccessLevel(wrappedNode.getModifiers());
     }
 
     @Override

diff --git a/...hub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java b/...hub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java
@@ -147,7 +147,7 @@ public com.github.javaparser.ast.body.MethodDeclaration getWrappedNode() {
 
     @Override
     public AccessSpecifier accessSpecifier() {
-        return Helper.toAccessLevel(wrappedNode.getModifiers());
+        return AstResolutionUtils.toAccessLevel(wrappedNode.getModifiers());
     }
 
     @Override

diff --git a/...om/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java b/...om/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
@@ -41,15 +41,15 @@ public JavaParserTypeAdapter(T wrappedNode, TypeSolver typeSolver) {
     }
 
     public String getPackageName() {
-        return Helper.getPackageName(wrappedNode);
+        return AstResolutionUtils.getPackageName(wrappedNode);
     }
 
     public String getClassName() {
-        return Helper.getClassName("", wrappedNode);
+        return AstResolutionUtils.getClassName("", wrappedNode);
     }
 
     public String getQualifiedName() {
-        String containerName = Helper.containerName(getParentNode(wrappedNode));
+        String containerName = AstResolutionUtils.containerName(getParentNode(wrappedNode));
         if (containerName.isEmpty()) {
             return wrappedNode.getName().getId();
         } else {

diff --git a/...vaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java b/...vaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java
@@ -56,12 +56,12 @@ public boolean isAssignableBy(ResolvedReferenceTypeDeclaration other) {
 
     @Override
     public String getPackageName() {
-        return Helper.getPackageName(wrappedNode);
+        return AstResolutionUtils.getPackageName(wrappedNode);
     }
 
     @Override
     public String getClassName() {
-        return Helper.getClassName("", wrappedNode);
+        return AstResolutionUtils.getClassName("", wrappedNode);
     }
 
     @Override