handle JavassistInterfaceDeclaration and JavassistEnumDeclaration #1716

javaparser · Aug 6, 2018 · be54789 · be54789
1 parent c1c9c4f
commit be54789
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/...main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java b/...main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
@@ -27,6 +27,7 @@
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
+import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
 import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic;
 import com.github.javaparser.symbolsolver.resolution.SymbolSolver;
 import javassist.CtClass;
@@ -91,26 +92,14 @@ public List<ResolvedReferenceType> getAncestors() {
         // Direct ancestors of an enum are java.lang.Enum and interfaces
         List<ResolvedReferenceType> ancestors = new ArrayList<>();
 
-        try {
-            CtClass superClass = ctClass.getSuperclass();
-
-            if (superClass != null) {
-                ResolvedType superClassTypeUsage = JavassistFactory.typeUsageFor(superClass, typeSolver);
+        String superClassName = ctClass.getClassFile().getSuperclass();
 
-                if (superClassTypeUsage.isReferenceType()) {
-                    ancestors.add(superClassTypeUsage.asReferenceType());
-                }
-            }
-
-            for (CtClass interfaze : ctClass.getInterfaces()) {
-                ResolvedType interfazeTypeUsage = JavassistFactory.typeUsageFor(interfaze, typeSolver);
+        if (superClassName != null) {
+            ancestors.add(new ReferenceTypeImpl(typeSolver.solveType(superClassName), typeSolver));
+        }
 
-                if (interfazeTypeUsage.isReferenceType()) {
-                    ancestors.add(interfazeTypeUsage.asReferenceType());
-                }
-            }
-        } catch (NotFoundException e) {
-            throw new RuntimeException("Ancestor not found for " + ctClass.getName() + ".", e);
+        for (String interfazeName : ctClass.getClassFile().getInterfaces()) {
+            ancestors.add(new ReferenceTypeImpl(typeSolver.solveType(interfazeName), typeSolver));
         }
 
         return ancestors;

diff --git a/...java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java b/...java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
@@ -69,12 +69,8 @@ public JavassistInterfaceDeclaration(CtClass ctClass, TypeSolver typeSolver) {
 
     @Override
     public List<ResolvedReferenceType> getInterfacesExtended() {
-        try {
-            return Arrays.stream(ctClass.getInterfaces()).map(i -> new JavassistInterfaceDeclaration(i, typeSolver))
-                    .map(i -> new ReferenceTypeImpl(i, typeSolver)).collect(Collectors.toList());
-        } catch (NotFoundException e) {
-            throw new RuntimeException(e);
-        }
+        return Arrays.stream(ctClass.getClassFile().getInterfaces()).map(i -> typeSolver.solveType(i))
+                .map(i -> new ReferenceTypeImpl(i, typeSolver)).collect(Collectors.toList());
     }
 
     @Override