listInconsistencies(CtElement ctElement) {
+ ModelConsistencyChecker checker = new ModelConsistencyChecker(null, false, false);
+ checker.scan(ctElement);
+ return checker.inconsistentElements();
+ }
+
/**
* Enters an element.
*/
@Override
public void enter(CtElement element) {
- if (!stack.isEmpty()) {
- if (!element.isParentInitialized() || element.getParent() != stack.peek()) {
- if ((!element.isParentInitialized() && fixNullParents) || (element.getParent() != stack.peek() && fixInconsistencies)) {
- element.setParent(stack.peek());
- } else {
- final String name = element instanceof CtNamedElement ? " - " + ((CtNamedElement) element).getSimpleName() : "";
- environment.report(null, Level.WARN,
- (element.isParentInitialized() ? "inconsistent" : "null") + " parent for " + element.getClass() + name + " - " + element.getPosition() + " - " + stack.peek()
- .getPosition());
- dumpStack();
- }
+ if (!stack.isEmpty() && (!element.isParentInitialized() || element.getParent() != stack.peek())) {
+ InconsistentElements inconsistentElements = new InconsistentElements(element, List.copyOf(stack));
+ this.inconsistentElements.add(inconsistentElements);
+
+ if ((!element.isParentInitialized() && fixNullParents) || (element.getParent() != stack.peek() && fixInconsistencies)) {
+ element.setParent(stack.peek());
+ } else if (environment != null) {
+ environment.report(null, Level.WARN, inconsistentElements.reason());
+ this.dumpStack();
}
}
stack.push(element);
@@ -77,11 +94,91 @@ protected void exit(CtElement e) {
stack.pop();
}
+ /**
+ * Gets the list of elements that are considered inconsistent.
+ *
+ * If {@link #fixInconsistencies} is set to true, this list will
+ * contain all the elements that have been fixed.
+ *
+ * @return the invalid elements
+ */
+ private List inconsistentElements() {
+ return List.copyOf(inconsistentElements);
+ }
+
private void dumpStack() {
- environment.debugMessage("model consistency checker stack:");
+ environment.debugMessage("model consistency checker expectedParents:");
for (CtElement e : stack) {
environment.debugMessage(" " + e.getClass().getSimpleName() + " " + (e.getPosition().isValidPosition() ? String.valueOf(e.getPosition()) : "(?)"));
}
}
+
+ /**
+ * Represents an inconsistent element.
+ *
+ * @param element the element with the invalid parent
+ * @param expectedParents the expected parents of the element
+ */
+ @Internal
+ public record InconsistentElements(CtElement element, List expectedParents) {
+ /**
+ * Creates a new inconsistent element.
+ *
+ * @param element the element with the invalid parent
+ * @param expectedParents the expected parents of the element
+ */
+ public InconsistentElements {
+ expectedParents = List.copyOf(expectedParents);
+ }
+
+ private String reason() {
+ CtElement expectedParent = this.expectedParents.isEmpty() ? null : this.expectedParents.get(0);
+ return "The element %s has the parent %s, but expected the parent %s".formatted(
+ formatElement(this.element),
+ this.element.isParentInitialized() ? formatElement(this.element.getParent()) : "null",
+ expectedParent != null ? formatElement(expectedParent) : "null"
+ );
+ }
+
+ private static String formatElement(CtElement ctElement) {
+ String name = ctElement instanceof CtNamedElement ctNamedElement ? " " + ctNamedElement.getSimpleName() : "";
+
+ return "%s%s".formatted(
+ ctElement.getClass().getSimpleName(),
+ name
+ );
+ }
+
+ private String dumpExpectedParents() {
+ return this.expectedParents.stream()
+ .map(ctElement -> " %s %s".formatted(
+ ctElement.getClass().getSimpleName(),
+ ctElement.getPosition().isValidPosition() ? String.valueOf(ctElement.getPosition()) : "(?)"
+ ))
+ .collect(Collectors.joining(System.lineSeparator()));
+ }
+
+ @Override
+ public String toString() {
+ return "%s%n%s".formatted(this.reason(), this.dumpExpectedParents());
+ }
+
+ @Override
+ public boolean equals(Object object) {
+ if (this == object) {
+ return true;
+ }
+ if (!(object instanceof InconsistentElements that)) {
+ return false;
+ }
+
+ return this.element == that.element();
+ }
+
+ @Override
+ public int hashCode() {
+ return System.identityHashCode(this.element);
+ }
+ }
}
diff --git a/src/main/java/spoon/support/compiler/jdt/ParentExiter.java b/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
index 00e069c3563..776075f4f78 100644
--- a/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
+++ b/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
@@ -1169,7 +1169,10 @@ public void visitCtRecord(CtRecord recordType) {
public void visitCtRecordPattern(CtRecordPattern pattern) {
CtElement child = adjustIfLocalVariableToTypePattern(this.child);
if (child instanceof CtTypeReference typeReference) {
- pattern.setRecordType(typeReference);
+ // JDTTreeBuilder#visit(SingleTypeReference wraps the child in a CtTypeAccess later on,
+ // replacing its parent. Therefore, we need to use a clone for this otherwise the typeReference
+ // has two different parents (one wins and the model is inconsistent).
+ pattern.setRecordType(typeReference.clone());
} else if (child instanceof CtPattern innerPattern) {
pattern.addPattern(innerPattern);
}
diff --git a/src/test/java/spoon/reflect/ast/AstCheckerTest.java b/src/test/java/spoon/reflect/ast/AstCheckerTest.java
index da7b5d51450..330fc13cb3d 100644
--- a/src/test/java/spoon/reflect/ast/AstCheckerTest.java
+++ b/src/test/java/spoon/reflect/ast/AstCheckerTest.java
@@ -21,6 +21,7 @@
import spoon.reflect.code.CtStatement;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.reference.CtExecutableReference;
+import spoon.reflect.visitor.ModelConsistencyCheckerTestHelper;
import spoon.support.modelobs.FineModelChangeListener;
import spoon.reflect.CtModel;
import spoon.reflect.code.CtBinaryOperator;
@@ -126,6 +127,8 @@ public void testAvoidSetCollectionSavedOnAST() {
factory.Type().createReference(Set.class),
factory.Type().createReference(Map.class));
+ ModelConsistencyCheckerTestHelper.assertModelIsConsistent(factory);
+
final List> invocations = Query.getElements(factory, new TypeFilter>(CtInvocation.class) {
@Override
public boolean matches(CtInvocation element) {
diff --git a/src/test/java/spoon/reflect/visitor/ModelConsistencyCheckerTestHelper.java b/src/test/java/spoon/reflect/visitor/ModelConsistencyCheckerTestHelper.java
new file mode 100644
index 00000000000..b4209e8f0b4
--- /dev/null
+++ b/src/test/java/spoon/reflect/visitor/ModelConsistencyCheckerTestHelper.java
@@ -0,0 +1,26 @@
+package spoon.reflect.visitor;
+
+import spoon.reflect.factory.Factory;
+
+import java.util.stream.Collectors;
+
+public class ModelConsistencyCheckerTestHelper {
+
+ public static void assertModelIsConsistent(Factory factory) {
+ // contract: each elements direct descendants should have the element as parent
+ factory.getModel().getAllModules().forEach(ctModule -> {
+ var invalidElements = ModelConsistencyChecker.listInconsistencies(ctModule);
+
+ if (!invalidElements.isEmpty()) {
+ throw new AssertionError("Model is inconsistent, %d elements have invalid parents:%n%s".formatted(
+ invalidElements.size(),
+ invalidElements.stream()
+ .map(ModelConsistencyChecker.InconsistentElements::toString)
+ .limit(5)
+ .collect(Collectors.joining(System.lineSeparator()))
+ ));
+ }
+ });
+ }
+
+}
diff --git a/src/test/java/spoon/test/architecture/SpoonArchitectureEnforcerTest.java b/src/test/java/spoon/test/architecture/SpoonArchitectureEnforcerTest.java
index b30e0a13609..7c9a1b183f9 100644
--- a/src/test/java/spoon/test/architecture/SpoonArchitectureEnforcerTest.java
+++ b/src/test/java/spoon/test/architecture/SpoonArchitectureEnforcerTest.java
@@ -78,7 +78,7 @@ public class SpoonArchitectureEnforcerTest {
@BeforeAll
static void beforeAll() {
Launcher launcher = new Launcher();
- launcher.getEnvironment().setComplianceLevel(11);
+ launcher.getEnvironment().setComplianceLevel(17);
launcher.addInputResource("src/main/java/");
spoonSrcMainModel = launcher.buildModel();
spoonSrcMainFactory = launcher.getFactory();
diff --git a/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java b/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java
index 1d4c3531095..02ad6816ca8 100644
--- a/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java
+++ b/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java
@@ -7,6 +7,7 @@
import spoon.Launcher;
import spoon.reflect.CtModel;
import spoon.reflect.factory.Factory;
+import spoon.reflect.visitor.ModelConsistencyCheckerTestHelper;
import java.lang.reflect.Executable;
@@ -61,6 +62,9 @@ private Launcher createLauncher(Executable method) {
launcher.addInputResource(path);
}
launcher.buildModel();
+
+ ModelConsistencyCheckerTestHelper.assertModelIsConsistent(launcher.getFactory());
+
return launcher;
}
}
From 3c6e7ef1805550226e3a63d6e670f03c3c1b39c8 Mon Sep 17 00:00:00 2001
From: Hannes Greule
Date: Fri, 1 Nov 2024 13:02:29 +0100
Subject: [PATCH 03/22] test: easy type access for ModelTests (#6051)
---
src/test/java/spoon/test/type/TypeTest.java | 11 ++++----
.../java/spoon/testing/utils/ByClass.java | 22 ++++++++++++++++
.../spoon/testing/utils/BySimpleName.java | 22 ++++++++++++++++
.../utils/ModelTestParameterResolver.java | 26 +++++++++++++++++--
4 files changed, 73 insertions(+), 8 deletions(-)
create mode 100644 src/test/java/spoon/testing/utils/ByClass.java
create mode 100644 src/test/java/spoon/testing/utils/BySimpleName.java
diff --git a/src/test/java/spoon/test/type/TypeTest.java b/src/test/java/spoon/test/type/TypeTest.java
index 8625becf176..4a4a146deb8 100644
--- a/src/test/java/spoon/test/type/TypeTest.java
+++ b/src/test/java/spoon/test/type/TypeTest.java
@@ -52,6 +52,8 @@
import spoon.test.type.testclasses.Mole;
import spoon.test.type.testclasses.Pozole;
import spoon.test.type.testclasses.TypeMembersOrder;
+import spoon.testing.utils.ByClass;
+import spoon.testing.utils.BySimpleName;
import spoon.testing.utils.ModelTest;
import spoon.testing.utils.ModelUtils;
@@ -116,9 +118,8 @@ public void testTypeAccessOnPrimitive() {
}
@ModelTest("./src/test/java/spoon/test/type/testclasses")
- public void testTypeAccessForTypeAccessInInstanceOf(Launcher launcher) {
+ public void testTypeAccessForTypeAccessInInstanceOf(@ByClass(Pozole.class) CtClass aPozole) {
// contract: the right hand operator must be a CtTypeAccess.
- final CtClass aPozole = launcher.getFactory().Class().get(Pozole.class);
final CtMethod eat = aPozole.getMethodsByName("eat").get(0);
final List> typeAccesses = eat.getElements(new TypeFilter<>(CtTypeAccess.class));
@@ -389,9 +390,8 @@ public void testShadowType() {
}
@ModelTest("./src/test/java/spoon/test/type/testclasses/TypeMembersOrder.java")
- public void testTypeMemberOrder(Factory f) {
+ public void testTypeMemberOrder(Factory f, @ByClass(TypeMembersOrder.class) CtClass aTypeMembersOrder) {
// contract: The TypeMembers keeps order of members same like in source file
- final CtClass aTypeMembersOrder = f.Class().get(TypeMembersOrder.class);
{
List typeMemberNames = new ArrayList<>();
for (CtTypeMember typeMember : aTypeMembersOrder.getTypeMembers()) {
@@ -424,9 +424,8 @@ public void testBinaryOpStringsType() {
value = {"./src/test/resources/noclasspath/issue5208/"},
noClasspath = true
)
- void testClassNotReplacedInNoClasspathMode(Factory factory) {
+ void testClassNotReplacedInNoClasspathMode(@BySimpleName("ClassT1") CtType type) {
// contract: ClassT1 is not replaced once present when looking up the ClassT1#classT3 field from ClassT2
- CtType type = factory.Type().get("p20.ClassT1");
assertNotNull(type);
assertNotEquals(SourcePosition.NOPOSITION, type.getPosition());
}
diff --git a/src/test/java/spoon/testing/utils/ByClass.java b/src/test/java/spoon/testing/utils/ByClass.java
new file mode 100644
index 00000000000..a57ea88a3bf
--- /dev/null
+++ b/src/test/java/spoon/testing/utils/ByClass.java
@@ -0,0 +1,22 @@
+package spoon.testing.utils;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * If a parameter of a test method is annotated with this annotation,
+ * and the parameter type is {@link spoon.reflect.declaration.CtType} or a subtype,
+ * the parameter will be filled with the type with the fully qualified name of the class
+ * given by {@link #value()}.
+ *
+ * If no matching type exists, the test will fail with a
+ * {@link org.junit.jupiter.api.extension.ParameterResolutionException}
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface ByClass {
+
+ Class value();
+}
diff --git a/src/test/java/spoon/testing/utils/BySimpleName.java b/src/test/java/spoon/testing/utils/BySimpleName.java
new file mode 100644
index 00000000000..883fb31ec94
--- /dev/null
+++ b/src/test/java/spoon/testing/utils/BySimpleName.java
@@ -0,0 +1,22 @@
+package spoon.testing.utils;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * If a parameter of a test method is annotated with this annotation,
+ * and the parameter type is {@link spoon.reflect.declaration.CtType} or a subtype,
+ * the parameter will be filled with the first type in the model with the simple name
+ * given by {@link #value()}.
+ *
+ * If no matching type exists, the test will fail with a
+ * {@link org.junit.jupiter.api.extension.ParameterResolutionException}
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface BySimpleName {
+
+ String value();
+}
diff --git a/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java b/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java
index 02ad6816ca8..14bef313524 100644
--- a/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java
+++ b/src/test/java/spoon/testing/utils/ModelTestParameterResolver.java
@@ -6,6 +6,8 @@
import org.junit.jupiter.api.extension.ParameterResolver;
import spoon.Launcher;
import spoon.reflect.CtModel;
+import spoon.reflect.declaration.CtClass;
+import spoon.reflect.declaration.CtType;
import spoon.reflect.factory.Factory;
import spoon.reflect.visitor.ModelConsistencyCheckerTestHelper;
@@ -24,7 +26,8 @@ public boolean supportsParameter(
return false;
}
Class type = parameterContext.getParameter().getType();
- return type == Launcher.class || type == CtModel.class || type == Factory.class;
+ return type == Launcher.class || type == CtModel.class || type == Factory.class
+ || CtType.class.isAssignableFrom(type);
}
@Override
@@ -43,9 +46,28 @@ public Object resolveParameter(
return launcher.getModel();
} else if (parameterContext.getParameter().getType() == Factory.class) {
return launcher.getFactory();
+ } else if (parameterContext.isAnnotated(BySimpleName.class)
+ && CtType.class.isAssignableFrom(parameterContext.getParameter().getType())) {
+ String name = parameterContext.findAnnotation(BySimpleName.class)
+ .map(BySimpleName::value)
+ .orElseThrow();
+ return launcher.getModel().getAllTypes().stream()
+ .filter(type -> type.getSimpleName().equals(name))
+ .findFirst()
+ .orElseThrow(() -> new ParameterResolutionException("no type with simple name " + name + " found"));
+ } else if (parameterContext.isAnnotated(ByClass.class)
+ && CtType.class.isAssignableFrom(parameterContext.getParameter().getType())) {
+ Class clazz = parameterContext.findAnnotation(ByClass.class)
+ .map(ByClass::value)
+ .orElseThrow();
+ CtClass ctClass = launcher.getFactory().Class().get(clazz.getName());
+ if (ctClass == null) {
+ throw new ParameterResolutionException("no type with name " + clazz.getName() + " found");
+ }
+ return ctClass;
}
- throw new AssertionError("supportsParameter is not exhaustive");
+ throw new ParameterResolutionException("supportsParameter is not exhaustive (" + parameterContext + ")");
}
private Launcher createLauncher(Executable method) {
From a2049a7e30aa938ed20dcf5e19e1dcdc9adf5f89 Mon Sep 17 00:00:00 2001
From: Frantisek
Date: Sat, 2 Nov 2024 18:20:57 +0100
Subject: [PATCH 04/22] fix: Use new line symbol from system also for BLOCK
comments when printing (#6052)
Co-authored-by: Frantisek Simon
---
src/main/java/spoon/reflect/visitor/CommentHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/spoon/reflect/visitor/CommentHelper.java b/src/main/java/spoon/reflect/visitor/CommentHelper.java
index 4e6bbb4a104..0203e7c2d6e 100644
--- a/src/main/java/spoon/reflect/visitor/CommentHelper.java
+++ b/src/main/java/spoon/reflect/visitor/CommentHelper.java
@@ -98,7 +98,7 @@ static void printCommentContent(PrinterHelper printer, CtComment comment, Functi
if (commentType == CtComment.CommentType.BLOCK) {
printer.write(transfo.apply(line));
if (hasMoreThanOneElement(content.lines())) {
- printer.write(CtComment.LINE_SEPARATOR);
+ printer.writeln();
}
} else {
printer.write(transfo.apply(line)).writeln(); // removing spaces at the end of the space
From 9bc3d38438148b37896839a4d6f0bc99fdabd70e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:17:25 +0000
Subject: [PATCH 05/22] build(deps): update dependency
org.apache.maven.plugins:maven-surefire-plugin to v3.5.2 (#6054)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
spoon-pom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index 0716da976ab..c590d36c687 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -267,7 +267,7 @@
maven-surefire-plugin
- 3.5.1
+ 3.5.2
From ff410a4dc96e5c17d55e3af28a74be0ecb768e58 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 3 Nov 2024 01:54:10 +0000
Subject: [PATCH 06/22] build(deps): update dependency
org.apache.maven.plugins:maven-javadoc-plugin to v3.11.1 (#6055)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
spoon-pom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index c590d36c687..da5ec90cf17 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -247,7 +247,7 @@
maven-javadoc-plugin
- 3.10.1
+ 3.11.1
maven-project-info-reports-plugin
From 269d938e3abb52247b12707444bddc548cc66b42 Mon Sep 17 00:00:00 2001
From: Martin Wittlinger
Date: Sun, 3 Nov 2024 16:53:47 +0100
Subject: [PATCH 07/22] chore: remove depclean (#6053)
---
.github/workflows/tests.yml | 2 +-
chore/check-reproducible-builds.sh | 2 +-
flake.nix | 5 -----
spoon-pom/pom.xml | 18 ------------------
4 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a0746640dfc..ea632e5e3c9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -120,7 +120,7 @@ jobs:
- name: Time nix setup
run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command true
- name: Build spoon
- run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command mvn -f spoon-pom -B install -Dmaven.test.skip=true -DskipDepClean
+ run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command mvn -f spoon-pom -B install -Dmaven.test.skip=true
- name: Run Javadoc quality check
run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command javadoc-quality
diff --git a/chore/check-reproducible-builds.sh b/chore/check-reproducible-builds.sh
index 5da16c50ca7..74fc34b7060 100755
--- a/chore/check-reproducible-builds.sh
+++ b/chore/check-reproducible-builds.sh
@@ -4,7 +4,7 @@
set -e
build() {
- mvn -f spoon-pom clean package -DskipDepClean -DskipTests -Dmaven.javadoc.skip > /dev/null
+ mvn -f spoon-pom clean package -DskipTests -Dmaven.javadoc.skip > /dev/null
}
compare_files() {
diff --git a/flake.nix b/flake.nix
index 2f79c59e4a3..91d82867bd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,8 +115,6 @@
mvn -q checkstyle:checkstyle -Pcheckstyle-test
# Check documentation links
python3 ./chore/check-links-in-doc.py
- # Analyze dependencies through DepClean in spoon-core
- # mvn -q depclean:depclean
pushd spoon-decompiler || exit 1
mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
@@ -124,7 +122,6 @@
git diff
mvn -q test
mvn -q checkstyle:checkstyle license:check
- # mvn -q depclean:depclean
popd || exit 1
pushd spoon-control-flow || exit 1
@@ -140,7 +137,6 @@
mvn -q versions:update-parent -DallowSnapshots=true
git diff
mvn -q test
- # mvn -q depclean:depclean
popd || exit 1
pushd spoon-smpl || exit 1
@@ -149,7 +145,6 @@
git diff
mvn -q -Djava.src.version=17 test
mvn -q checkstyle:checkstyle license:check
- # mvn -q depclean:depclean
popd || exit 1
'');
extraRemote = pkgs.writeScriptBin "extra-remote" ''
diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index da5ec90cf17..214ea89db6b 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -194,24 +194,6 @@
deploy
-
-
- se.kth.castor
- depclean-maven-plugin
- 2.0.6
-
-
-
- depclean
-
-
-
- true
- true
-
-
-
-
From c4fdc94e8de93ea750c925cd37a77f72353c17d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 05:03:49 +0000
Subject: [PATCH 08/22] build(deps): lock file maintenance (#6056)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index b03cf135bd9..a44ef7a5faf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1729880355,
- "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+ "lastModified": 1730531603,
+ "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+ "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github"
},
"original": {
From 52762e4faf0290cc9f13fe9b775274deb79305f7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:58:51 +0000
Subject: [PATCH 09/22] build(deps): update actions/attest-build-provenance
action to v1.4.4 (#6059)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/jreleaser.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
index a7d1e1475b7..b4cbc0566de 100644
--- a/.github/workflows/jreleaser.yml
+++ b/.github/workflows/jreleaser.yml
@@ -34,7 +34,7 @@ jobs:
JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD }}
- name: Sign artifacts with sigstore/cosign
- uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+ uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
with:
subject-path: './target/staging-deploy/**/*.jar'
From 41a86e1e4c5f09a9a884106fe59dbf31153438db Mon Sep 17 00:00:00 2001
From: Martin Wittlinger
Date: Fri, 8 Nov 2024 10:27:49 +0100
Subject: [PATCH 10/22] review: feat: read jvm version for default compliance
level (#6043)
Co-authored-by: Hannes Greule
---
.../spoon/support/StandardEnvironment.java | 18 ++++++++++++++-
src/test/java/spoon/MavenLauncherTest.java | 2 +-
.../spoon/support/compiler/SpoonPomTest.java | 22 +++++++++----------
src/test/java/spoon/test/enums/EnumsTest.java | 9 +++++---
.../spoon/test/template/TemplateTest.java | 1 +
5 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/src/main/java/spoon/support/StandardEnvironment.java b/src/main/java/spoon/support/StandardEnvironment.java
index cf7c3e31ce2..85b09ccadea 100644
--- a/src/main/java/spoon/support/StandardEnvironment.java
+++ b/src/main/java/spoon/support/StandardEnvironment.java
@@ -65,7 +65,15 @@ public class StandardEnvironment implements Serializable, Environment {
private static final long serialVersionUID = 1L;
- public static final int DEFAULT_CODE_COMPLIANCE_LEVEL = 8;
+ /**
+ *
+ * Only features available in the compliance level are correctly parsed by spoon.
+ * By default, spoon uses the language level of the executing JVM. So if you use Java 11, spoon can't parse records.
+ * If you want to parse Java 21 code with a Java 17 JVM you need set the compliance level with {@link #setComplianceLevel}
+ * to at least 21.
+ *
+ */
+ public static final int DEFAULT_CODE_COMPLIANCE_LEVEL = getCurrentJvmVersion();
private transient FileGenerator defaultFileGenerator;
@@ -142,6 +150,14 @@ public void setPrettyPrintingMode(PRETTY_PRINTING_MODE prettyPrintingMode) {
public StandardEnvironment() {
}
+ private static int getCurrentJvmVersion() {
+ try {
+ return Runtime.version().feature();
+ } catch (Exception e) {
+ System.err.println("Error getting the jvm version: " + e.getMessage());
+ return 8;
+ }
+ }
@Override
public void debugMessage(String message) {
print(message, Level.DEBUG);
diff --git a/src/test/java/spoon/MavenLauncherTest.java b/src/test/java/spoon/MavenLauncherTest.java
index 2ca4c7ac300..e129a9a339c 100644
--- a/src/test/java/spoon/MavenLauncherTest.java
+++ b/src/test/java/spoon/MavenLauncherTest.java
@@ -121,7 +121,7 @@ public void spoonMavenLauncherTest() throws IOException {
targetPath.resolve("pom.xml").toString(),
MavenLauncher.SOURCE_TYPE.APP_SOURCE
);
- assertEquals(8, launcher.getEnvironment().getComplianceLevel());
+ assertEquals(Runtime.version().feature(), launcher.getEnvironment().getComplianceLevel());
// specify the pom.xml
launcher = new MavenLauncher(
diff --git a/src/test/java/spoon/support/compiler/SpoonPomTest.java b/src/test/java/spoon/support/compiler/SpoonPomTest.java
index 783fd710613..722db9fb692 100644
--- a/src/test/java/spoon/support/compiler/SpoonPomTest.java
+++ b/src/test/java/spoon/support/compiler/SpoonPomTest.java
@@ -1,27 +1,25 @@
package spoon.support.compiler;
+import static org.junit.jupiter.api.Assertions.*;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.regex.Pattern;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.junit.jupiter.api.Test;
import spoon.MavenLauncher;
import spoon.support.StandardEnvironment;
-import java.io.IOException;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.nio.file.Paths;
-
-import static org.junit.jupiter.api.Assertions.*;
-
public class SpoonPomTest {
@Test
public void getSourceVersion() throws IOException, XmlPullParserException {
- checkVersion("src/test/resources/maven-launcher/null-build/pom.xml", 11);
- checkVersion("src/test/resources/maven-launcher/java-11/pom.xml", 11);
+ // checkVersion("src/test/resources/maven-launcher/null-build/pom.xml", 11);
+ // checkVersion("src/test/resources/maven-launcher/java-11/pom.xml", 11);
checkVersion("src/test/resources/maven-launcher/pac4j/pom.xml", 8);
- checkVersion("src/test/resources/maven-launcher/source-directory/pom.xml", 8);
- checkVersion("src/test/resources/maven-launcher/very-simple/pom.xml", 8);
- checkVersion("pom.xml", 8);
+ checkVersion("src/test/resources/maven-launcher/source-directory/pom.xml", StandardEnvironment.DEFAULT_CODE_COMPLIANCE_LEVEL);
+ checkVersion("src/test/resources/maven-launcher/very-simple/pom.xml", StandardEnvironment.DEFAULT_CODE_COMPLIANCE_LEVEL);
+ checkVersion("pom.xml", StandardEnvironment.DEFAULT_CODE_COMPLIANCE_LEVEL);
}
diff --git a/src/test/java/spoon/test/enums/EnumsTest.java b/src/test/java/spoon/test/enums/EnumsTest.java
index 25d8dd37459..58264818236 100644
--- a/src/test/java/spoon/test/enums/EnumsTest.java
+++ b/src/test/java/spoon/test/enums/EnumsTest.java
@@ -50,6 +50,7 @@
import spoon.test.enums.testclasses.NestedEnums;
import spoon.test.enums.testclasses.Regular;
import spoon.testing.utils.GitHubIssue;
+import spoon.testing.utils.ModelTest;
import spoon.testing.utils.ModelUtils;
import java.io.File;
@@ -57,6 +58,7 @@
import java.nio.file.Files;
import java.util.Arrays;
import java.util.List;
+import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -218,11 +220,12 @@ void testEnumClassPublicFinalEnum() throws Exception {
));
}
- @Test
- void testEnumClassModifiersPublicEnum() throws Exception {
+ @ModelTest(value = "src/test/java/spoon/test/enums/testclasses", complianceLevel = 11)
+ void testEnumClassModifiersPublicEnum(CtModel model) {
// contract: enum modifiers are applied correctly (JLS 8.9)
// pre Java 17, enums aren't implicitly final if an enum value declares an anonymous type
- CtType publicEnum = build("spoon.test.enums.testclasses", "AnonEnum");
+ CtType publicEnum = model.getAllTypes().stream().filter(v -> v.getSimpleName().equals("AnonEnum")).findFirst().get();
+
assertThat(publicEnum.getExtendedModifiers(), contentEquals(
CtExtendedModifier.explicit(ModifierKind.PUBLIC)
));
diff --git a/src/test/java/spoon/test/template/TemplateTest.java b/src/test/java/spoon/test/template/TemplateTest.java
index 0a21d826eac..0584acc7c75 100644
--- a/src/test/java/spoon/test/template/TemplateTest.java
+++ b/src/test/java/spoon/test/template/TemplateTest.java
@@ -1096,6 +1096,7 @@ public void testAnotherFieldAccessNameSubstitution() {
public void substituteTypeAccessReference() {
//contract: the substitution of CtTypeAccess expression ignores actual type arguments if it have to
Launcher spoon = new Launcher();
+ spoon.getEnvironment().setComplianceLevel(8);
spoon.addTemplateResource(new FileSystemFile("./src/test/java/spoon/test/template/testclasses/TypeReferenceClassAccessTemplate.java"));
String outputDir = "./target/spooned/test/template/testclasses";
spoon.setSourceOutputDirectory(outputDir);
From b45e7180146e4f2763f0b8a385cf91ae8e72dbaa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:29:57 +0000
Subject: [PATCH 11/22] build(deps): update github/codeql-action digest to
4f3212b (#6061)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/qodana.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index 221313dc38a..7090ec49d93 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -22,7 +22,7 @@ jobs:
with:
args: --source-directory,./src/main/java , --fail-threshold, 0
post-pr-comment: "false"
- - uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3
+ - uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3
with:
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
code-quality-spoon-javadoc:
@@ -37,7 +37,7 @@ jobs:
with:
args: --source-directory,./spoon-javadoc/src/main/java , --fail-threshold, 0
post-pr-comment: "false"
- - uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3
+ - uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3
with:
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
code-quality-spoon-control-flow:
@@ -52,6 +52,6 @@ jobs:
with:
args: --source-directory,./spoon-control-flow/src/main/java , --fail-threshold, 0
post-pr-comment: "false"
- - uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3
+ - uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3
with:
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
From 0f73b429f555ff499dbb414431ef1a1c981c28e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:20:36 +0000
Subject: [PATCH 12/22] build(deps): update github/codeql-action action to
v3.27.1 (#6062)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index f5107f36fc6..4d38bec2d3c 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -71,6 +71,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+ uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
with:
sarif_file: results.sarif
From 22f4339c9257d8789b1bbcbcdc44d23e53017e66 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Sun, 10 Nov 2024 01:50:16 +0000
Subject: [PATCH 13/22] release: Releasing version 11.1.1-beta-13
---
pom.xml | 4 ++--
spoon-javadoc/pom.xml | 4 ++--
spoon-pom/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index a7e79a98dc8..76958c5c840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,13 +12,13 @@
fr.inria.gforge.spoon
spoon-pom
- 11.1.1-SNAPSHOT
+ 11.1.1-beta-13
spoon-pom
spoon-core
jar
- 11.1.1-SNAPSHOT
+ 11.1.1-beta-13
Spoon Core
Spoon is a tool for meta-programming, analysis and transformation of Java programs.
https://spoon.gforge.inria.fr/
diff --git a/spoon-javadoc/pom.xml b/spoon-javadoc/pom.xml
index 03046612f45..9a57df11b6e 100644
--- a/spoon-javadoc/pom.xml
+++ b/spoon-javadoc/pom.xml
@@ -5,14 +5,14 @@
spoon-pom
fr.inria.gforge.spoon
- 11.1.1-SNAPSHOT
+ 11.1.1-beta-13
../spoon-pom
4.0.0
spoon-javadoc
jar
- 11.1.1-SNAPSHOT
+ 11.1.1-beta-13
Spoon Javadoc
A javadoc parser for the java source code analysis tool spoon.
http://spoon.gforge.inria.fr/
diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index 214ea89db6b..2ba6b64bd05 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -13,7 +13,7 @@
fr.inria.gforge.spoon
spoon-pom
pom
- 11.1.1-SNAPSHOT
+ 11.1.1-beta-13
Spoon POM
Common Maven config for Spoon modules
http://spoon.gforge.inria.fr/
@@ -28,7 +28,7 @@
17
target/velocity.log
UTF-8
- 1723395513
+ 1731203410
From 6184185af831cdba9bbe67df34cd7206cc634778 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Sun, 10 Nov 2024 01:57:31 +0000
Subject: [PATCH 14/22] release: Reverting to SNAPSHOT version 11.1.1-SNAPSHOT
---
pom.xml | 4 ++--
spoon-javadoc/pom.xml | 4 ++--
spoon-pom/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76958c5c840..a7e79a98dc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,13 +12,13 @@
fr.inria.gforge.spoon
spoon-pom
- 11.1.1-beta-13
+ 11.1.1-SNAPSHOT
spoon-pom
spoon-core
jar
- 11.1.1-beta-13
+ 11.1.1-SNAPSHOT
Spoon Core
Spoon is a tool for meta-programming, analysis and transformation of Java programs.
https://spoon.gforge.inria.fr/
diff --git a/spoon-javadoc/pom.xml b/spoon-javadoc/pom.xml
index 9a57df11b6e..03046612f45 100644
--- a/spoon-javadoc/pom.xml
+++ b/spoon-javadoc/pom.xml
@@ -5,14 +5,14 @@
spoon-pom
fr.inria.gforge.spoon
- 11.1.1-beta-13
+ 11.1.1-SNAPSHOT
../spoon-pom
4.0.0
spoon-javadoc
jar
- 11.1.1-beta-13
+ 11.1.1-SNAPSHOT
Spoon Javadoc
A javadoc parser for the java source code analysis tool spoon.
http://spoon.gforge.inria.fr/
diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index 2ba6b64bd05..214ea89db6b 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -13,7 +13,7 @@
fr.inria.gforge.spoon
spoon-pom
pom
- 11.1.1-beta-13
+ 11.1.1-SNAPSHOT
Spoon POM
Common Maven config for Spoon modules
http://spoon.gforge.inria.fr/
@@ -28,7 +28,7 @@
17
target/velocity.log
UTF-8
- 1731203410
+ 1723395513
From 685f92d9070248f8c50e71ab2045e51d96c0fd17 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 04:48:55 +0000
Subject: [PATCH 15/22] build(deps): lock file maintenance (#6064)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index a44ef7a5faf..2f5f887cbbc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1730531603,
- "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+ "lastModified": 1731139594,
+ "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+ "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
From 2645f5b2780a7adbb4e72f774eada8ac8e75dd5a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:58:34 +0000
Subject: [PATCH 16/22] build(deps): update dependency gradle to v8.11 (#6065)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
spoon-dataflow/gradle/wrapper/gradle-wrapper.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spoon-dataflow/gradle/wrapper/gradle-wrapper.properties b/spoon-dataflow/gradle/wrapper/gradle-wrapper.properties
index df97d72b8b9..94113f200e6 100644
--- a/spoon-dataflow/gradle/wrapper/gradle-wrapper.properties
+++ b/spoon-dataflow/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
From f142331af6fa12cdba2aee00afec95d5bf4467ce Mon Sep 17 00:00:00 2001
From: jian
Date: Tue, 12 Nov 2024 00:38:37 -0500
Subject: [PATCH 17/22] build: remove junit dependency in spoon-control-flow
(#6060)
---
spoon-control-flow/pom.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/spoon-control-flow/pom.xml b/spoon-control-flow/pom.xml
index f981ef5865e..c6e9aff6f2c 100644
--- a/spoon-control-flow/pom.xml
+++ b/spoon-control-flow/pom.xml
@@ -84,12 +84,6 @@
1.5.2