introduce HasAccessLevel

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java

@@ -416,4 +416,9 @@ protected TypeSolver typeSolver() {
 	public com.github.javaparser.ast.body.ClassOrInterfaceDeclaration getWrappedNode() {
 		return wrappedNode;
 	}
+
+	@Override
+	public AccessLevel accessLevel() {
+		throw new UnsupportedOperationException();
+	}
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java

@@ -366,16 +366,6 @@ public boolean isAbstract() {
             throw new UnsupportedOperationException();
         }
 
-        @Override
-        public boolean isPrivate() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isPackageProtected() {
-            throw new UnsupportedOperationException();
-        }
-
         @Override
         public boolean isDefaultMethod() {
             return false;
@@ -390,5 +380,15 @@ public String getName() {
         public List<TypeParameter> getTypeParameters() {
             return Collections.emptyList();
         }
+
+        @Override
+        public AccessLevel accessLevel() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
     }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java

@@ -2,6 +2,7 @@
 
 import com.github.javaparser.ast.body.EnumConstantDeclaration;
 import com.github.javaparser.ast.body.VariableDeclarator;
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.declarations.FieldDeclaration;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeImpl;
@@ -69,4 +70,8 @@ public com.github.javaparser.ast.body.FieldDeclaration getWrappedNode()
 		return wrappedNode;
 	}
 
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java

@@ -359,4 +359,9 @@ public ClassOrInterfaceDeclaration getWrappedNode()
 	{
 		return wrappedNode;
 	}
+
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java

@@ -6,6 +6,7 @@
 
 import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.ParameterDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
@@ -156,11 +157,6 @@ public boolean isAbstract() {
         return (wrappedNode.getBody() == null);
     }
 
-    @Override
-    public boolean isPrivate() {
-        return wrappedNode.getModifiers().contains(com.github.javaparser.ast.Modifier.PRIVATE);
-    }
-
     private Optional<Type> typeParamByName(String name, TypeSolver typeSolver, Context context) {
         int i = 0;
         if (wrappedNode.getTypeParameters() != null) {
@@ -227,11 +223,6 @@ public List<TypeParameter> getTypeParameters() {
         return this.wrappedNode.getTypeParameters().stream().map((astTp) -> new JavaParserTypeParameter(astTp, typeSolver)).collect(Collectors.toList());
     }
 
-    @Override
-    public boolean isPackageProtected() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public boolean isDefaultMethod() {
         return wrappedNode.isDefault();
@@ -246,4 +237,10 @@ public com.github.javaparser.ast.body.MethodDeclaration getWrappedNode()
 	{
 		return wrappedNode;
 	}
+
+    @Override
+    public AccessLevel accessLevel() {
+        // return wrappedNode.getModifiers().contains(com.github.javaparser.ast.Modifier.PRIVATE);
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclaration.java

@@ -392,4 +392,9 @@ public List<TypeParameter> getTypeParameters() {
             }
         }
     }
+
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistFieldDeclaration.java

@@ -2,6 +2,7 @@
 
 import javassist.CtField;
 import javassist.NotFoundException;
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.typesystem.Type;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 
@@ -41,4 +42,9 @@ public boolean isParameter() {
     public boolean isType() {
         return false;
     }
+
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java

@@ -275,5 +275,8 @@ public List<TypeParameter> getTypeParameters() {
         }
     }
 
-
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistMethodDeclaration.java

@@ -5,6 +5,7 @@
 import javassist.NotFoundException;
 import javassist.bytecode.BadBytecode;
 import javassist.bytecode.SignatureAttribute;
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.ParameterDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
@@ -114,16 +115,6 @@ public boolean isAbstract() {
         return Modifier.isAbstract(ctMethod.getModifiers());
     }
 
-    @Override
-    public boolean isPrivate() {
-        return Modifier.isPrivate(ctMethod.getModifiers());
-    }
-
-    @Override
-    public boolean isPackageProtected() {
-        return !Modifier.isPrivate(ctMethod.getModifiers()) && !Modifier.isProtected(ctMethod.getModifiers()) && !Modifier.isPublic(ctMethod.getModifiers());
-    }
-
     @Override
     public List<TypeParameter> getTypeParameters() {
         try {
@@ -136,4 +127,10 @@ public List<TypeParameter> getTypeParameters() {
             throw new RuntimeException(badBytecode);
         }
     }
+
+    @Override
+    public AccessLevel accessLevel() {
+        // return !Modifier.isPrivate(ctMethod.getModifiers()) && !Modifier.isProtected(ctMethod.getModifiers()) && !Modifier.isPublic(ctMethod.getModifiers());
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java

@@ -432,4 +432,9 @@ public int compare(Method o1, Method o2) {
             return 0;
         }
     }
+
+    @Override
+    public AccessLevel accessLevel() {
+        return ReflectionFactory.modifiersToAccessLevel(this.clazz.getModifiers());
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionFactory.java

@@ -1,5 +1,6 @@
 package me.tomassetti.symbolsolver.reflectionmodel;
 
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.*;
 import me.tomassetti.symbolsolver.model.typesystem.Type;
@@ -80,4 +81,16 @@ public static Type typeUsageFor(java.lang.reflect.Type type, TypeSolver typeSolv
             throw new UnsupportedOperationException(type.getClass().getCanonicalName() + " " + type);
         }
     }
+
+    static AccessLevel modifiersToAccessLevel(final int modifiers) {
+        if (Modifier.isPublic(modifiers)) {
+            return AccessLevel.PUBLIC;
+        } else if (Modifier.isProtected(modifiers)) {
+            return AccessLevel.PROTECTED;
+        } else if (Modifier.isPrivate(modifiers)) {
+            return AccessLevel.PRIVATE;
+        } else {
+            return AccessLevel.PACKAGE_PROTECTED;
+        }
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java

@@ -1,5 +1,6 @@
 package me.tomassetti.symbolsolver.reflectionmodel;
 
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.declarations.FieldDeclaration;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.Type;
@@ -57,4 +58,9 @@ public boolean isParameter() {
     public boolean isType() {
         return false;
     }
+
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java

@@ -325,4 +325,9 @@ public List<TypeParameter> getTypeParameters() {
     protected TypeSolver typeSolver() {
         return typeSolver;
     }
+
+    @Override
+    public AccessLevel accessLevel() {
+        throw new UnsupportedOperationException();
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java

@@ -1,6 +1,7 @@
 package me.tomassetti.symbolsolver.reflectionmodel;
 
 import com.github.javaparser.ast.Node;
+import me.tomassetti.symbolsolver.model.declarations.AccessLevel;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.ParameterDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
@@ -214,18 +215,13 @@ public boolean isAbstract() {
     }
 
     @Override
-    public boolean isPrivate() {
-        return Modifier.isPrivate(method.getModifiers());
-    }
-
-    @Override
-    public boolean isPackageProtected() {
-        return !Modifier.isPrivate(method.getModifiers()) && !Modifier.isProtected(method.getModifiers()) && !Modifier.isPublic(method.getModifiers());
+    public boolean isDefaultMethod() {
+        return method.isDefault();
     }
 
     @Override
-    public boolean isDefaultMethod() {
-        return method.isDefault();
+    public AccessLevel accessLevel() {
+        return ReflectionFactory.modifiersToAccessLevel(this.method.getModifiers());
     }
 
 }

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java

@@ -125,7 +125,7 @@ public void testGetDeclaredMethods() {
         TypeSolver typeResolver = new JreTypeSolver();
         TypeDeclaration string = new ReflectionClassDeclaration(String.class, typeResolver);
         List<MethodDeclaration> methods = string.getDeclaredMethods().stream()
-                .filter(m -> !m.isPrivate() && !m.isPackageProtected())
+                .filter(m -> m.accessLevel() != AccessLevel.PRIVATE && m.accessLevel() != AccessLevel.PACKAGE_PROTECTED)
                 .sorted((a, b) -> a.getName().compareTo(b.getName()))
                 .collect(Collectors.toList());
         assertEquals(67, methods.size());

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/AccessLevel.java

@@ -0,0 +1,11 @@
+package me.tomassetti.symbolsolver.model.declarations;
+
+/**
+ * @author Federico Tomassetti
+ */
+public enum AccessLevel  {
+    PUBLIC,
+    PRIVATE,
+    PROTECTED,
+    PACKAGE_PROTECTED
+}

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/ClassDeclaration.java

@@ -9,7 +9,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface ClassDeclaration extends TypeDeclaration, TypeParametrizable {
+public interface ClassDeclaration extends TypeDeclaration, TypeParametrizable, HasAccessLevel {
 
     /**
      * This method should always return true.

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/EnumDeclaration.java

@@ -5,7 +5,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface EnumDeclaration extends TypeDeclaration {
+public interface EnumDeclaration extends TypeDeclaration, HasAccessLevel {
 
     @Override
     default boolean isEnum() {

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/FieldDeclaration.java

@@ -5,7 +5,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface FieldDeclaration extends ValueDeclaration {
+public interface FieldDeclaration extends ValueDeclaration, HasAccessLevel {
 
     @Override
     default boolean isField() {

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/HasAccessLevel.java

@@ -0,0 +1,10 @@
+package me.tomassetti.symbolsolver.model.declarations;
+
+/**
+ * @author Federico Tomassetti
+ */
+public interface HasAccessLevel {
+
+    AccessLevel accessLevel();
+
+}

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/InterfaceDeclaration.java

@@ -10,7 +10,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface InterfaceDeclaration extends TypeDeclaration, TypeParametrizable {
+public interface InterfaceDeclaration extends TypeDeclaration, TypeParametrizable, HasAccessLevel {
 
     @Override
     default boolean isInterface() {

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/declarations/MethodDeclaration.java

@@ -7,7 +7,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface MethodDeclaration extends Declaration, TypeParametrizable {
+public interface MethodDeclaration extends Declaration, TypeParametrizable, HasAccessLevel {
 
     /**
      * The type in which the method is declared.
@@ -44,10 +44,6 @@ default boolean hasVariadicParameter() {
 
     boolean isAbstract();
 
-    boolean isPrivate();
-
-    boolean isPackageProtected();
-
     default String getQualifiedName() {
         return declaringType().getQualifiedName()+ "." + this.getName();
     }