Add javassist support for records
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java
index 77aa498..d0edb2b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java
@@ -21,11 +21,16 @@
package com.github.javaparser.resolution.declarations;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
+
import java.util.List;
import java.util.Optional;
/**
+<<<<<<< HEAD
* Declaration of a Record (not an interface or an enum).
+=======
+ * Declaration of a Class (not an interface or an enum).
+>>>>>>> 2951cae62 (Add javassist support for records)
*
* Note that it can be associated to a Node AST because anonymous class declarations return an incompatible
* node type, compared to classic class declarations.
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
index 79ac116..da863ea 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
@@ -74,6 +74,9 @@
if (ctClazz.isArray()) {
throw new IllegalArgumentException("This method should not be called passing an array");
}
+ if (ctClazz.getAttribute("Record") != null) {
+ return new JavassistRecordDeclaration(ctClazz, typeSolver);
+ }
return new JavassistClassDeclaration(ctClazz, typeSolver);
}
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
index b9dc844..b022b17 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
@@ -35,11 +35,12 @@
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.core.resolution.MethodUsageResolutionCapability;
import com.github.javaparser.symbolsolver.core.resolution.SymbolResolutionCapability;
-import com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration;
+import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
import com.github.javaparser.symbolsolver.resolution.SymbolSolver;
import javassist.CtClass;
import javassist.CtField;
+import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -47,8 +48,8 @@
/**
* @author Federico Tomassetti
*/
-public class JavassistRecordDeclaration extends AbstractClassDeclaration
- implements MethodUsageResolutionCapability, SymbolResolutionCapability {
+public class JavassistRecordDeclaration extends AbstractTypeDeclaration
+ implements ResolvedRecordDeclaration, MethodUsageResolutionCapability, SymbolResolutionCapability {
private CtClass ctClass;
private TypeSolver typeSolver;
@@ -58,9 +59,9 @@
if (ctClass == null) {
throw new IllegalArgumentException();
}
- if (ctClass.isInterface() || ctClass.isAnnotation() || ctClass.isPrimitive() || ctClass.isEnum()) {
+ if (ctClass.getAttribute("Record") == null) {
throw new IllegalArgumentException(
- "Trying to instantiate a JavassistClassDeclaration with something which is not a class: "
+ "Trying to instantiate a JavassistRecordDeclaration with something which is not a record: "
+ ctClass.toString());
}
this.ctClass = ctClass;
@@ -69,11 +70,6 @@
}
@Override
- protected ResolvedReferenceType object() {
- return new ReferenceTypeImpl(typeSolver.getSolvedJavaLangObject());
- }
-
- @Override
public boolean hasDirectlyAnnotation(String canonicalName) {
return ctClass.hasAnnotation(canonicalName);
}
@@ -188,13 +184,6 @@
return javassistTypeDeclarationAdapter.getAncestors(acceptIncompleteList);
}
- @Override
- @Deprecated
- public SymbolReference<ResolvedMethodDeclaration> solveMethod(
- String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
- return JavassistUtils.solveMethod(name, argumentsTypes, staticOnly, typeSolver, this, ctClass);
- }
-
public ResolvedType getUsage(Node node) {
return new ReferenceTypeImpl(this);
}
@@ -263,11 +252,6 @@
}
@Override
- public boolean isClass() {
- return !ctClass.isInterface();
- }
-
- @Override
public Optional<ResolvedReferenceType> getSuperClass() {
return javassistTypeDeclarationAdapter.getSuperClass();
}
@@ -278,6 +262,31 @@
}
@Override
+ public final List<ResolvedReferenceType> getAllSuperClasses() {
+ List<ResolvedReferenceType> superclasses = new ArrayList<>();
+
+ getSuperClass().ifPresent(superClass -> {
+ superclasses.add(superClass);
+ superclasses.addAll(superClass.getAllClassesAncestors());
+ });
+
+ return superclasses;
+ }
+
+ @Override
+ public final List<ResolvedReferenceType> getAllInterfaces() {
+ List<ResolvedReferenceType> interfaces = new ArrayList<>();
+ for (ResolvedReferenceType interfaceDeclaration : getInterfaces()) {
+ interfaces.add(interfaceDeclaration);
+ interfaces.addAll(interfaceDeclaration.getAllInterfacesAncestors());
+ }
+ getSuperClass().ifPresent(superClass -> {
+ interfaces.addAll(superClass.getAllInterfacesAncestors());
+ });
+ return interfaces;
+ }
+
+ @Override
public boolean isInterface() {
return ctClass.isInterface();
}
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassOrRecordDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassOrRecordDeclaration.java
new file mode 100644
index 0000000..274d892
--- /dev/null
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassOrRecordDeclaration.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2015-2016 Federico Tomassetti
+ * Copyright (C) 2017-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+package com.github.javaparser.symbolsolver.logic;
+
+import com.github.javaparser.resolution.declarations.ResolvedClassDeclaration;
+import com.github.javaparser.resolution.logic.MethodResolutionCapability;
+import com.github.javaparser.resolution.types.ResolvedReferenceType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A common ancestor for all ClassDeclarations.
+ *
+ * @author Federico Tomassetti
+ */
+public abstract class AbstractClassOrRecordDeclaration extends AbstractTypeDeclaration
+ implements ResolvedClassDeclaration, MethodResolutionCapability {
+
+ ///
+ /// Public
+ ///
+
+ @Override
+ public boolean hasName() {
+ return getQualifiedName() != null;
+ }
+
+ @Override
+ public final List<ResolvedReferenceType> getAllSuperClasses() {
+ List<ResolvedReferenceType> superclasses = new ArrayList<>();
+
+ getSuperClass().ifPresent(superClass -> {
+ superclasses.add(superClass);
+ superclasses.addAll(superClass.getAllClassesAncestors());
+ });
+
+ if (superclasses.removeIf(ResolvedReferenceType::isJavaLangObject)) {
+ superclasses.add(object());
+ }
+ return superclasses;
+ }
+
+ @Override
+ public final List<ResolvedReferenceType> getAllInterfaces() {
+ List<ResolvedReferenceType> interfaces = new ArrayList<>();
+ for (ResolvedReferenceType interfaceDeclaration : getInterfaces()) {
+ interfaces.add(interfaceDeclaration);
+ interfaces.addAll(interfaceDeclaration.getAllInterfacesAncestors());
+ }
+ getSuperClass().ifPresent(superClass -> {
+ interfaces.addAll(superClass.getAllInterfacesAncestors());
+ });
+ return interfaces;
+ }
+
+ @Override
+ public final ResolvedClassDeclaration asClass() {
+ return this;
+ }
+
+ ///
+ /// Protected
+ ///
+
+ /**
+ * An implementation of the Object class.
+ */
+ protected abstract ResolvedReferenceType object();
+}
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java
index 19bfa9a..cf608a7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java
@@ -27,24 +27,15 @@
import com.github.javaparser.resolution.declarations.AssociableToAST;
import com.github.javaparser.resolution.declarations.ResolvedFieldDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
-import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
-import com.github.javaparser.resolution.model.LambdaArgumentTypePlaceholder;
-import com.github.javaparser.resolution.model.typesystem.NullType;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.resolution.types.ResolvedType;
-import com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration;
-import com.github.javaparser.symbolsolver.logic.AbstractClassDeclarationTest;
import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
-import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
+import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclarationTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import com.google.common.collect.ImmutableSet;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.NotFoundException;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -54,24 +45,14 @@
import static org.junit.jupiter.api.Assertions.*;
-class JavassistRecordDeclarationTest extends AbstractClassDeclarationTest {
+class JavassistRecordDeclarationTest extends AbstractTypeDeclarationTest {
private TypeSolver typeSolver;
- private TypeSolver newTypeSolver;
-
- private TypeSolver anotherTypeSolver;
-
@BeforeEach
void setup() throws IOException {
- Path pathToJar = adaptPath("src/test/resources/javaparser-core-2.1.0.jar");
+ Path pathToJar = adaptPath("src/test/resources/record_declarations/Box.jar");
typeSolver = new CombinedTypeSolver(new JarTypeSolver(pathToJar), new ReflectionTypeSolver());
-
- Path newPathToJar = adaptPath("src/test/resources/javaparser-core-3.0.0-alpha.2.jar");
- newTypeSolver = new CombinedTypeSolver(new JarTypeSolver(newPathToJar), new ReflectionTypeSolver());
-
- Path anotherPathToJar = adaptPath("src/test/resources/test-artifact-1.0.0.jar");
- anotherTypeSolver = new CombinedTypeSolver(new JarTypeSolver(anotherPathToJar), new ReflectionTypeSolver());
}
///
@@ -80,58 +61,67 @@
@Test
void testIsClass() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertTrue(compilationUnit.isClass());
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ assertFalse(compilationUnit.isClass());
}
@Test
void testIsInterface() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertFalse(compilationUnit.isInterface());
}
@Test
void testIsEnum() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertFalse(compilationUnit.isEnum());
}
@Test
+ void testIsRecord() {
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ assertTrue(compilationUnit.isRecord());
+ }
+
+ @Test
void testIsTypeVariable() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertFalse(compilationUnit.isTypeParameter());
}
@Test
void testIsType() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertTrue(compilationUnit.isType());
}
@Test
void testAsType() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertEquals(compilationUnit, compilationUnit.asType());
}
@Test
void testAsClass() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals(compilationUnit, compilationUnit.asClass());
+ assertThrows(UnsupportedOperationException.class, () -> {
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ compilationUnit.asInterface();
+ });
}
@Test
void testAsInterface() {
assertThrows(UnsupportedOperationException.class, () -> {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
compilationUnit.asInterface();
});
}
@@ -139,55 +129,46 @@
@Test
void testAsEnum() {
assertThrows(UnsupportedOperationException.class, () -> {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
compilationUnit.asEnum();
});
}
@Test
+ void testAsRecord() {
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ assertEquals(compilationUnit, compilationUnit.asRecord());
+ }
+
+ @Test
void testGetPackageName() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals("com.github.javaparser.ast", compilationUnit.getPackageName());
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ assertEquals("box", compilationUnit.getPackageName());
}
@Test
void testGetClassName() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals("CompilationUnit", compilationUnit.getClassName());
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ assertEquals("Box", compilationUnit.getClassName());
}
@Test
void testGetQualifiedName() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals("com.github.javaparser.ast.CompilationUnit", compilationUnit.getQualifiedName());
- }
-
- @Test
- void testHasDirectlyAnnotation() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) anotherTypeSolver.solveType("com.github.javaparser.test.TestClass");
- assertTrue(compilationUnit.hasDirectlyAnnotation("com.github.javaparser.test.TestAnnotation"));
- }
-
- @Test
- void testHasAnnotation() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) anotherTypeSolver.solveType("com.github.javaparser.test.TestChildClass");
- // TestChildClass has no TestAnnotation annotation declared even though parent class is annotated with this
- // annotation because TestAnnotation annotation is not inheritable
- assertFalse(compilationUnit.hasAnnotation("com.github.javaparser.test.TestAnnotation"));
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ assertEquals("box.Box", compilationUnit.getQualifiedName());
}
@Test
void testGetGenericTypeField() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) anotherTypeSolver.solveType("com.github.javaparser.test.ClassWithFields");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
List<ResolvedFieldDeclaration> declarationList = compilationUnit.getAllFields();
- assertEquals(6, declarationList.size());
+ assertEquals(1, declarationList.size());
Map<String, ResolvedType> fields = new HashMap<>();
for (ResolvedFieldDeclaration fieldDeclaration : declarationList) {
@@ -196,50 +177,31 @@
fields.put(name, type);
}
- assertTrue(fields.containsKey("genericParamObjectField"));
- assertTrue(fields.containsKey("genericPrimitiveArrayField"));
- assertTrue(fields.containsKey("genericObjectArrayField"));
- assertTrue(fields.containsKey("genericField"));
- assertTrue(fields.containsKey("primitiveField"));
- assertTrue(fields.containsKey("objectField"));
+ assertTrue(fields.containsKey("value"));
}
@Test
void testGetDeclaredMethods() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.Position");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
Set<ResolvedMethodDeclaration> methodsSet = compilationUnit.getDeclaredMethods();
- assertEquals(12, methodsSet.size());
+ assertEquals(5, methodsSet.size());
Map<String, MethodUsage> methods = new HashMap<>();
for (ResolvedMethodDeclaration method : methodsSet) {
methods.put(method.getName(), new MethodUsage(method));
}
- assertTrue(methods.containsKey("pos"));
- assertEquals(2, methods.get("pos").getNoParams());
- assertTrue(methods.containsKey("withColumn"));
- assertEquals(1, methods.get("withColumn").getNoParams());
- assertTrue(methods.containsKey("withLine"));
- assertEquals(1, methods.get("withLine").getNoParams());
- assertTrue(methods.containsKey("valid"));
- assertEquals(0, methods.get("valid").getNoParams());
- assertTrue(methods.containsKey("invalid"));
- assertEquals(0, methods.get("invalid").getNoParams());
- assertTrue(methods.containsKey("orIfInvalid"));
- assertEquals(1, methods.get("orIfInvalid").getNoParams());
- assertTrue(methods.containsKey("isAfter"));
- assertEquals(1, methods.get("isAfter").getNoParams());
- assertTrue(methods.containsKey("isBefore"));
- assertEquals(1, methods.get("isBefore").getNoParams());
- assertTrue(methods.containsKey("compareTo"));
- assertEquals(1, methods.get("compareTo").getNoParams());
- assertTrue(methods.containsKey("equals"));
- assertEquals(1, methods.get("equals").getNoParams());
+ assertTrue(methods.containsKey("map"));
+ assertEquals(1, methods.get("map").getNoParams());
+ assertTrue(methods.containsKey("value"));
+ assertEquals(0, methods.get("value").getNoParams());
assertTrue(methods.containsKey("hashCode"));
assertEquals(0, methods.get("hashCode").getNoParams());
assertTrue(methods.containsKey("toString"));
assertEquals(0, methods.get("toString").getNoParams());
+ assertTrue(methods.containsKey("equals"));
+ assertEquals(1, methods.get("equals").getNoParams());
}
///
@@ -248,10 +210,10 @@
@Test
void testGetSuperclass() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertEquals(
- "com.github.javaparser.ast.Node",
+ "java.lang.Record",
compilationUnit
.getSuperClass()
.orElseThrow(() -> new RuntimeException("super class unexpectedly empty"))
@@ -259,52 +221,11 @@
}
@Test
- void testGetSuperclassOfJavaLangObject() throws NotFoundException {
- CtClass javaLangObject = ClassPool.getDefault().get("java.lang.Object");
- JavassistClassDeclaration objectDeclaration = new JavassistClassDeclaration(javaLangObject, typeSolver);
- assertFalse(objectDeclaration.getSuperClass().isPresent());
- }
-
- @Test
- void testGetSuperclassWithoutTypeParameters() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals(
- "com.github.javaparser.ast.Node",
- compilationUnit
- .getSuperClass()
- .orElseThrow(() -> new RuntimeException("super class unexpectedly empty"))
- .getQualifiedName());
- }
-
- @Test
- void testGetSuperclassWithTypeParameters() {
- JavassistClassDeclaration compilationUnit = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
- assertEquals(
- "com.github.javaparser.ast.body.BodyDeclaration",
- compilationUnit
- .getSuperClass()
- .orElseThrow(() -> new RuntimeException("super class unexpectedly empty"))
- .getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- compilationUnit
- .getSuperClass()
- .orElseThrow(() -> new RuntimeException("super class unexpectedly empty"))
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.body.BodyDeclaration.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
- }
-
- @Test
void testGetAllSuperclasses() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration cu =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertEquals(
- ImmutableSet.of("com.github.javaparser.ast.Node", "java.lang.Object"),
+ ImmutableSet.of("java.lang.Record", "java.lang.Object"),
cu.getAllSuperClasses().stream()
.map(ResolvedReferenceType::getQualifiedName)
.collect(Collectors.toSet()));
@@ -312,10 +233,10 @@
@Test
void testGetAllAncestorsWithDepthFirstTraversalOrder() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration cu =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertEquals(
- ImmutableSet.of("com.github.javaparser.ast.Node", "java.lang.Object"),
+ ImmutableSet.of("java.lang.Record", "java.lang.Object", "box.Foo"),
cu.getAllAncestors().stream()
.map(ResolvedReferenceType::getQualifiedName)
.collect(Collectors.toSet()));
@@ -323,564 +244,25 @@
@Test
void testGetInterfaces() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertEquals(
- ImmutableSet.of(),
+ ImmutableSet.of("box.Foo"),
compilationUnit.getInterfaces().stream()
.map(ResolvedReferenceType::getQualifiedName)
.collect(Collectors.toSet()));
-
- JavassistClassDeclaration coid = (JavassistClassDeclaration)
- typeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration");
- assertEquals(
- ImmutableSet.of("com.github.javaparser.ast.DocumentableNode"),
- coid.getInterfaces().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
}
@Test
void testGetAllInterfaces() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
+ JavassistRecordDeclaration compilationUnit =
+ (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
assertEquals(
- ImmutableSet.of(),
+ ImmutableSet.of("box.Foo"),
compilationUnit.getAllInterfaces().stream()
.map(ResolvedReferenceType::getQualifiedName)
.collect(Collectors.toSet()));
- JavassistClassDeclaration coid = (JavassistClassDeclaration)
- typeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration");
- assertEquals(
- ImmutableSet.of(
- "com.github.javaparser.ast.NamedNode",
- "com.github.javaparser.ast.body.AnnotableNode",
- "com.github.javaparser.ast.DocumentableNode"),
- coid.getAllInterfaces().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
- }
-
- @Test
- void testGetAllSuperclassesWithoutTypeParameters() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals(
- ImmutableSet.of("com.github.javaparser.ast.Node", "java.lang.Object"),
- cu.getAllSuperClasses().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
- }
-
- @Test
- void testGetAllSuperclassesWithTypeParameters() {
- JavassistClassDeclaration constructorDeclaration = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
- assertEquals(3, constructorDeclaration.getAllSuperClasses().size());
- assertTrue(constructorDeclaration.getAllSuperClasses().stream()
- .anyMatch(s -> s.getQualifiedName().equals("com.github.javaparser.ast.body.BodyDeclaration")));
- assertTrue(constructorDeclaration.getAllSuperClasses().stream()
- .anyMatch(s -> s.getQualifiedName().equals("com.github.javaparser.ast.Node")));
- assertTrue(constructorDeclaration.getAllSuperClasses().stream()
- .anyMatch(s -> s.getQualifiedName().equals("java.lang.Object")));
-
- ResolvedReferenceType ancestor;
-
- ancestor = constructorDeclaration.getAllSuperClasses().get(0);
- assertEquals("com.github.javaparser.ast.body.BodyDeclaration", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.body.BodyDeclaration.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAllSuperClasses().get(1);
- assertEquals("com.github.javaparser.ast.Node", ancestor.getQualifiedName());
-
- ancestor = constructorDeclaration.getAllSuperClasses().get(2);
- assertEquals("java.lang.Object", ancestor.getQualifiedName());
- }
-
- @Test
- void testGetInterfacesWithoutParameters() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals(
- ImmutableSet.of(),
- compilationUnit.getInterfaces().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
-
- JavassistClassDeclaration coid = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration");
- assertEquals(
- ImmutableSet.of(
- "com.github.javaparser.ast.nodeTypes.NodeWithExtends",
- "com.github.javaparser.ast.nodeTypes.NodeWithImplements"),
- coid.getInterfaces().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
- }
-
- @Test
- void testGetInterfacesWithParameters() {
- JavassistClassDeclaration constructorDeclaration = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
- assertEquals(7, constructorDeclaration.getInterfaces().size());
-
- ResolvedReferenceType interfaze;
-
- interfaze = constructorDeclaration.getInterfaces().get(0);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getInterfaces().get(1);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithDeclaration", interfaze.getQualifiedName());
-
- interfaze = constructorDeclaration.getInterfaces().get(2);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithName", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithName.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getInterfaces().get(3);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithModifiers", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithModifiers.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getInterfaces().get(4);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithParameters", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithParameters.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getInterfaces().get(5);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithThrowable", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithThrowable.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getInterfaces().get(6);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
- }
-
- @Test
- void testGetAllInterfacesWithoutParameters() {
- JavassistClassDeclaration compilationUnit =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals(
- ImmutableSet.of("java.lang.Cloneable"),
- compilationUnit.getAllInterfaces().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
-
- JavassistClassDeclaration coid = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration");
- assertEquals(
- ImmutableSet.of(
- "com.github.javaparser.ast.nodeTypes.NodeWithExtends",
- "com.github.javaparser.ast.nodeTypes.NodeWithAnnotations",
- "java.lang.Cloneable",
- "com.github.javaparser.ast.nodeTypes.NodeWithImplements",
- "com.github.javaparser.ast.nodeTypes.NodeWithName",
- "com.github.javaparser.ast.nodeTypes.NodeWithModifiers",
- "com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc",
- "com.github.javaparser.ast.nodeTypes.NodeWithMembers"),
- coid.getAllInterfaces().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
- }
-
- @Test
- void testGetAllInterfacesWithParametersWithDepthFirstTraversalOrder() {
- JavassistClassDeclaration constructorDeclaration = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
- assertEquals(9, constructorDeclaration.getAllInterfaces().size());
-
- ResolvedReferenceType interfaze;
-
- interfaze = constructorDeclaration.getAllInterfaces().get(0);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(1);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithDeclaration", interfaze.getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(2);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithName", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithName.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(3);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithModifiers", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithModifiers.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(4);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithParameters", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithParameters.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(5);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithThrowable", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithThrowable.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(6);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(7);
- assertEquals("java.lang.Cloneable", interfaze.getQualifiedName());
-
- interfaze = constructorDeclaration.getAllInterfaces().get(8);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations", interfaze.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- interfaze
- .typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
- }
-
- @Test
- void testGetAncestorsWithTypeParametersWithDepthFirstTraversalOrder() {
- JavassistClassDeclaration constructorDeclaration = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
- assertEquals(8, constructorDeclaration.getAncestors().size());
-
- ResolvedReferenceType ancestor;
-
- ancestor = constructorDeclaration.getAncestors().get(0);
- assertEquals("com.github.javaparser.ast.body.BodyDeclaration", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.body.BodyDeclaration.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(1);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(2);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithDeclaration", ancestor.getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(3);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithName", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithName.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(4);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithModifiers", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithModifiers.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(5);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithParameters", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithParameters.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(6);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithThrowable", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithThrowable.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = constructorDeclaration.getAncestors().get(7);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
- }
-
- @Test
- void testGetAllAncestorsWithoutTypeParametersWithDepthFirstTraversalOrder() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertEquals(
- ImmutableSet.of("java.lang.Cloneable", "com.github.javaparser.ast.Node", "java.lang.Object"),
- cu.getAllAncestors().stream()
- .map(ResolvedReferenceType::getQualifiedName)
- .collect(Collectors.toSet()));
- }
-
- @Test
- void testGetAllAncestorsWithTypeParametersWithDepthFirstTraversalOrder() {
- JavassistClassDeclaration constructorDeclaration = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
-
- List<ResolvedReferenceType> ancestors = constructorDeclaration.getAllAncestors();
-
- assertEquals(12, ancestors.size());
-
- ResolvedReferenceType ancestor;
-
- ancestor = ancestors.get(0);
- assertEquals("com.github.javaparser.ast.body.BodyDeclaration", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.body.BodyDeclaration.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(1);
- assertEquals("com.github.javaparser.ast.Node", ancestor.getQualifiedName());
-
- ancestor = ancestors.get(2);
- assertEquals("java.lang.Object", ancestor.getQualifiedName());
-
- ancestor = ancestors.get(3);
- assertEquals("java.lang.Cloneable", ancestor.getQualifiedName());
-
- ancestor = ancestors.get(4);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(5);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithJavaDoc.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(6);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithDeclaration", ancestor.getQualifiedName());
-
- ancestor = ancestors.get(7);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithName", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithName.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(8);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithModifiers", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithModifiers.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(9);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithParameters", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithParameters.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(10);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithThrowable", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithThrowable.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
-
- ancestor = ancestors.get(11);
- assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", ancestor.getQualifiedName());
- assertEquals(
- "com.github.javaparser.ast.body.ConstructorDeclaration",
- ancestor.typeParametersMap()
- .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.T")
- .get()
- .asReferenceType()
- .getQualifiedName());
- }
-
- @Nested
- class TestIsAssignableBy {
- @Test
- void whenNullTypeIsProvided() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertTrue(cu.isAssignableBy(NullType.INSTANCE));
- }
-
- @Test
- void whenLambdaArgumentTypePlaceholderIsProvided() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertFalse(cu.isAssignableBy(new LambdaArgumentTypePlaceholder(0)));
- }
-
- @Test
- void whenEqualTypeIsProvided() {
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertTrue(cu.isAssignableBy(cu));
- }
-
- @Test
- void whenSuperClassIsProvided() {
- ResolvedReferenceTypeDeclaration node = newTypeSolver.solveType("com.github.javaparser.ast.Node");
- JavassistClassDeclaration cu =
- (JavassistClassDeclaration) newTypeSolver.solveType("com.github.javaparser.ast.CompilationUnit");
- assertFalse(cu.isAssignableBy(node));
- assertTrue(node.isAssignableBy(cu));
- }
-
- @Test
- void whenInterfaceIsProvided() {
- JavassistInterfaceDeclaration nodeWithImplements = (JavassistInterfaceDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.nodeTypes.NodeWithImplements");
- JavassistClassDeclaration classDeclaration = (JavassistClassDeclaration)
- newTypeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration");
- assertFalse(classDeclaration.isAssignableBy(nodeWithImplements));
- assertTrue(nodeWithImplements.isAssignableBy(classDeclaration));
- }
-
- @Test
- void issue3673() {
- ReflectionClassDeclaration optionalDeclaration =
- (ReflectionClassDeclaration) typeSolver.solveType("java.util.Optional");
- JavassistEnumDeclaration enumDeclaration =
- (JavassistEnumDeclaration) anotherTypeSolver.solveType("com.github.javaparser.test.TestEnum");
- assertFalse(optionalDeclaration.isAssignableBy(enumDeclaration));
- assertFalse(enumDeclaration.isAssignableBy(optionalDeclaration));
- }
- }
-
- @Override
- public AbstractClassDeclaration createValue() {
- try {
- TypeSolver typeSolver = new ReflectionTypeSolver();
- CtClass clazz = ClassPool.getDefault().getCtClass("java.lang.StringBuilder");
- return new JavassistClassDeclaration(clazz, typeSolver);
- } catch (NotFoundException e) {
- throw new RuntimeException("Unexpected error.", e);
- }
}
@Override
@@ -889,6 +271,11 @@
}
@Override
+ public AbstractTypeDeclaration createValue() {
+ return (JavassistRecordDeclaration) typeSolver.solveType("box.Box");
+ }
+
+ @Override
public boolean isFunctionalInterface(AbstractTypeDeclaration typeDeclaration) {
return false;
}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.class b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.class
index dec5e6e..f6aa9b6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.class
+++ b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.class
Binary files differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.jar b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.jar
index 6394204..fdca191 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.jar
+++ b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.jar
Binary files differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.java b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.java
index dc2f7b4..9ca124f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/Box.java
@@ -1,6 +1,10 @@
+package box;
+
import java.util.function.Function;
-record Box<T>(T value) {
+interface Foo {}
+
+record Box<T>(T value) implements Foo {
public <U> Box<U> map(Function<T, U> f) {
return new Box<U>(f.apply(value));
}
