Merge pull request #3031 from 4everTheOne/fix-issue3030

Fix issue #3030 NoSuchElementException when solving type
javaparser · Jan 9, 2021 · d443ede · d443ede
2 parents 3392953 + 0ca8963
commit d443ede
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 4 deletions.
diff --git a/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -352,10 +352,18 @@ public List<ResolvedReferenceType> getAncestors(boolean acceptIncompleteList) {
             try {
                 // If an implemented interface is found, add it as an ancestor
                 ResolvedReferenceType rrt = toReferenceType(implemented);
-                ResolvedTypeDeclaration rtd = rrt.getTypeDeclaration().get().asType();
-                // do not consider an inner or nested class as an ancestor
-                if (!rtd.getQualifiedName().contains(wrappedNode.getFullyQualifiedName().get())) {
-                    ancestors.add(rrt);
+                Optional<ResolvedReferenceTypeDeclaration> resolvedReferenceTypeDeclaration = rrt.getTypeDeclaration();
+                if (resolvedReferenceTypeDeclaration.isPresent()) {
+
+                    ResolvedTypeDeclaration rtd = resolvedReferenceTypeDeclaration.get().asType();
+                    Optional<String> qualifiedName = wrappedNode.getFullyQualifiedName();
+                    if (qualifiedName.isPresent()) {
+
+                        // do not consider an inner or nested class as an ancestor
+                        if (!rtd.getQualifiedName().contains(qualifiedName.get())) {
+                            ancestors.add(rrt);
+                        }
+                    }
                 }
             } catch (UnsolvedSymbolException e) {
                 // in case we could not resolve some implemented interface, we may still be able to resolve the

diff --git a/...symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3030Test.java b/...symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3030Test.java
@@ -0,0 +1,94 @@
+package com.github.javaparser.symbolsolver;
+
+import com.github.javaparser.StaticJavaParser;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.resolution.types.ResolvedType;
+import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+import java.util.Spliterator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Issue3030Test extends AbstractResolutionTest {
+
+    @Test
+    public void test3030() {
+        String sourceCode = "package com.example;\n" +
+                "\n" +
+                "import java.util.Comparator;\n" +
+                "import java.util.Spliterator;\n" +
+                "import java.util.function.Consumer;\n" +
+                "import java.util.function.IntConsumer;\n" +
+                "import java.util.function.IntFunction;\n" +
+                "import java.util.stream.IntStream;\n" +
+                "\n" +
+                "public class TestClass {\n" +
+                "\n" +
+                "    static <T> Spliterator<T> indexed(int size, int extraCharacteristics, IntFunction<T> function, Comparator<? super T> comparator) {\n" +
+                "        class WithCharacteristics implements Spliterator<T> {\n" +
+                "\n" +
+                "            private final Spliterator.OfInt delegate;\n" +
+                "\n" +
+                "            WithCharacteristics(Spliterator.OfInt delegate) {\n" +
+                "                this.delegate = delegate;\n" +
+                "            }\n" +
+                "\n" +
+                "            @Override\n" +
+                "            public boolean tryAdvance(Consumer<? super T> action) {\n" +
+                "                return delegate.tryAdvance((IntConsumer) i -> action.accept(function.apply(i)));\n" +
+                "            }\n" +
+                "\n" +
+                "            @Override\n" +
+                "            public void forEachRemaining(Consumer<? super T> action) {\n" +
+                "                delegate.forEachRemaining((IntConsumer) i -> action.accept(function.apply(i)));\n" +
+                "            }\n" +
+                "\n" +
+                "            @Override\n" +
+                "            public Spliterator<T> trySplit() {\n" +
+                "                Spliterator.OfInt split = delegate.trySplit();\n" +
+                "                return (split == null) ? null : new WithCharacteristics(split);\n" +
+                "            }\n" +
+                "\n" +
+                "            @Override\n" +
+                "            public long estimateSize() {\n" +
+                "                return delegate.estimateSize();\n" +
+                "            }\n" +
+                "\n" +
+                "            @Override\n" +
+                "            public int characteristics() {\n" +
+                "                return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED | extraCharacteristics;\n" +
+                "            }\n" +
+                "\n" +
+                "            @Override\n" +
+                "            public Comparator<? super T> getComparator() {\n" +
+                "                if (hasCharacteristics(Spliterator.SORTED)) {\n" +
+                "                    return comparator;\n" +
+                "                } else {\n" +
+                "                    throw new IllegalStateException();\n" +
+                "                }\n" +
+                "            }\n" +
+                "        }\n" +
+                "        return new WithCharacteristics(IntStream.range(0, size).spliterator());\n" +
+                "    }\n" +
+                "\n" +
+                "}\n";
+
+        ReflectionTypeSolver reflectionSolver = new ReflectionTypeSolver();
+        JavaSymbolSolver symbolSolver = new JavaSymbolSolver(reflectionSolver);
+        StaticJavaParser.getConfiguration()
+                .setSymbolResolver(symbolSolver);
+
+        CompilationUnit cu = StaticJavaParser.parse(sourceCode);
+        Optional<FieldDeclaration> optionalFieldDeclaration = cu.findFirst(FieldDeclaration.class);
+        assertTrue(optionalFieldDeclaration.isPresent());
+
+        ResolvedType resolvedField = optionalFieldDeclaration.get().resolve().getType();
+        assertEquals(Spliterator.OfInt.class.getCanonicalName(), resolvedField.asReferenceType().getQualifiedName());
+    }
+
+}