Updating to javaparser parent 3.26.1

Author: smillst

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# Applied automatic formatting to the entire project
+# See https://github.com/javaparser/javaparser/issues/4408 for details
+5106428130cd3ff052a57d37a3d192f040da5edf

.github/workflows/create_github_release.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
 
       - name: Create Release
         id: create_release

.github/workflows/maven_tests.yml

@@ -45,7 +45,7 @@ jobs:
     steps:
       ## Checkout the current version of the code from the repo.
       - name: Checkout latest code
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           fetch-depth: "0"
 
@@ -84,7 +84,7 @@ jobs:
 
 
       - name: CodeCov - JavaParser Core
-        uses: codecov/codecov-action@v4.2.0
+        uses: codecov/codecov-action@v4.5.0
         timeout-minutes: 10
         with:
           files: javaparser-core-testing/target/site/jacoco/jacoco.xml,javaparser-core-testing-bdd/target/site/jacoco/jacoco.xml
@@ -94,7 +94,7 @@ jobs:
           env_vars: OS,JDK
 
       - name: CodeCov - JavaParser Symbol Solver
-        uses: codecov/codecov-action@v4.2.0
+        uses: codecov/codecov-action@v4.5.0
         timeout-minutes: 10
         with:
           file: javaparser-symbol-solver-testing/target/site/jacoco/jacoco.xml
@@ -109,7 +109,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           fetch-depth: "0"
       - name: Set up JDK 11
@@ -119,3 +119,23 @@ jobs:
           distribution: 'zulu'
       - name: Validate Project Checkstyle
         run: ./mvnw -B checkstyle:check
+
+  spotless_check:
+    name: Validate code generation and formatting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout latest code
+        uses: actions/[email protected]
+        with:
+          fetch-depth: "0"
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'zulu'
+      - name: Generate code and format
+        run: |
+          ./run_core_metamodel_generator.sh
+          # ./run_core_generators.sh automatically runs ./mvnw spotless:apply
+          ./run_core_generators.sh
+          git diff --exit-code

.github/workflows/prepare_release_changelog.yml

@@ -15,7 +15,7 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

CONTRIBUTING.md

@@ -10,6 +10,7 @@ We noticed we get the best feedback from those.
 Here are [some fun project ideas](https://github.com/javaparser/javaparser/labels/fun%20project%20idea).
 - If you start working on an issue, please say so with a comment in the issue.
 - If you know how to fix a problem, please fix it and open a pull request instead of opening an issue.
+- If you would like to add new nodes, or new fields to existing nodes, check out the [Guide to Adding New Nodes and Fields](https://github.com/javaparser/javaparser/wiki/A-Detailed-Guide-to-Adding-New-Nodes-and-Fields).
 
 Thanks for helping!
 
@@ -28,3 +29,4 @@ Our development workflow is based on Pull Request. If you are not familiar with
 - Pull requests often stay open for at least a few days to give people a chance to review it.
 - A pull request is merged when all comments on it have been resolved.
 - If you create a pull request for an issue, mention the issue in the format #123 to make github link it automatically.
+- Before submitting a pull request, please run `./mvnw spotless:apply` to format your code to avoid any formatting related issues during review.

changelog.md

@@ -1,7 +1,7 @@
 
-Next Release (Version 3.25.11-snapshot)
+Next Release (Version 3.26.2-snapshot)
 --------------------------------------
-[issues resolved](https://github.com/javaparser/javaparser/milestone/207?closed=1)
+[issues resolved](https://github.com/javaparser/javaparser/milestone/209?closed=1)
 
 ### Added
 ### Changed
@@ -10,6 +10,101 @@ Next Release (Version 3.25.11-snapshot)
 ### Fixed
 ### Security
 
+Version 3.26.1
+--------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/208?closed=1)
+
+### Added
+
+* Fix record declarations nested in annotation declarations (PR [#4460](https://github.com/javaparser/javaparser/pull/4460) by [@johannescoetzee](https://github.com/johannescoetzee))
+
+### Changed
+
+* Format code with spotless (PR [#4465](https://github.com/javaparser/javaparser/pull/4465) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Simplifying the search for types in compilation unit (PR [#4459](https://github.com/javaparser/javaparser/pull/4459) by [@jlerbsc](https://github.com/jlerbsc))
+* Add spotless plugin configuration (PR [#4409](https://github.com/javaparser/javaparser/pull/4409) by [@johannescoetzee](https://github.com/johannescoetzee))
+
+### Fixed
+
+* Disable spotless ratcheting and fix formatting (PR [#4478](https://github.com/javaparser/javaparser/pull/4478) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Fix: issue 4450 Endless recursion (-> StackOverflow) with cyclic static references (PR [#4477](https://github.com/javaparser/javaparser/pull/4477) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix: issue 4399 MethodCallExpr inside lambda in assignment expression cannot be resolved (PR [#4462](https://github.com/javaparser/javaparser/pull/4462) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix crash on SwitchExpr entries if tokens are not stored (PR [#4461](https://github.com/javaparser/javaparser/pull/4461) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Fix lookahead for pattern expression in switch entries [Issue 4455] (PR [#4458](https://github.com/javaparser/javaparser/pull/4458) by [@johannescoetzee](https://github.com/johannescoetzee))
+
+### Developer Changes
+
+* Automatically format code after codegen and validate with a github action (PR [#4468](https://github.com/javaparser/javaparser/pull/4468) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Add git-blame-ignore-revs file to ignore the reformatting commit in git blame (PR [#4466](https://github.com/javaparser/javaparser/pull/4466) by [@johannescoetzee](https://github.com/johannescoetzee))
+
+### Uncategorised
+
+* Add link to the guide to adding nodes in CONTRIBUTING.md (PR [#4453](https://github.com/javaparser/javaparser/pull/4453) by [@johannescoetzee](https://github.com/johannescoetzee))
+
+### :heart: Contributors
+
+Thank You to all contributors who worked on this release!
+
+* [@johannescoetzee](https://github.com/johannescoetzee)
+* [@jlerbsc](https://github.com/jlerbsc)
+
+
+
+Version 3.26.0
+--------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/207?closed=1)
+
+### Added
+
+* [JEP 440] Add support for record patterns (PR [#4432](https://github.com/javaparser/javaparser/pull/4432) by [@johannescoetzee](https://github.com/johannescoetzee))
+* PatternExpr -> TypePatternExpr refactor in preparation for record pattern implementation (PR [#4387](https://github.com/javaparser/javaparser/pull/4387) by [@johannescoetzee](https://github.com/johannescoetzee))
+* [JEP441] Add support for switch pattern matching (PR [#4375](https://github.com/javaparser/javaparser/pull/4375) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Add support for `case null, default` in switch and fix concrete syntax model for new switch syntax (PR [#4364](https://github.com/javaparser/javaparser/pull/4364) by [@johannescoetzee](https://github.com/johannescoetzee))
+
+### Changed
+
+* Fixes SYSTEM_EOL warnings (PR [#4412](https://github.com/javaparser/javaparser/pull/4412) by [@matthieu-vergne](https://github.com/matthieu-vergne))
+* Refact: Adds a find node by range method in Node class (PR [#4377](https://github.com/javaparser/javaparser/pull/4377) by [@jlerbsc](https://github.com/jlerbsc))
+
+### Fixed
+
+* Fix: issue 3277 StackOverflow issue while parse MethodCallExpr/FieldAccessExpr, their ancestor/child node is ObjectCreation expression which contain .new (PR [#4447](https://github.com/javaparser/javaparser/pull/4447) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix expressions in the body of switch expression entries (Issue 4440) (PR [#4446](https://github.com/javaparser/javaparser/pull/4446) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Fix: issue 4442 LexicalPreservingPrinter does not support unexpected token (PR [#4444](https://github.com/javaparser/javaparser/pull/4444) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix: issue 3100 JavaSymbolSolver unable to resolve an inner class defined in a base class (PR [#4441](https://github.com/javaparser/javaparser/pull/4441) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix: 4330 Method 'forEach' cannot be resolved in certain context (PR [#4436](https://github.com/javaparser/javaparser/pull/4436) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix: 'permits' and 'sealed' Contextual keyworlds usage (PR [#4434](https://github.com/javaparser/javaparser/pull/4434) by [@jlerbsc](https://github.com/jlerbsc))
+* Fixes an error in jbehave tests when they are run in a Windows os (PR [#4433](https://github.com/javaparser/javaparser/pull/4433) by [@jlerbsc](https://github.com/jlerbsc))
+* Make resolution of implements and extends types start with the parent… (PR [#4430](https://github.com/javaparser/javaparser/pull/4430) by [@eldapiiro](https://github.com/eldapiiro))
+* Fix: solveMethodAsUsage() for implicit method <enum>::values() (PR [#4424](https://github.com/javaparser/javaparser/pull/4424) by [@Kimmmey](https://github.com/Kimmmey))
+* Fix: <enum>::values() is a static method, was not static (PR [#4417](https://github.com/javaparser/javaparser/pull/4417) by [@Kimmmey](https://github.com/Kimmmey))
+* Fix missed generated code from PatternExpr refactor (PR [#4414](https://github.com/javaparser/javaparser/pull/4414) by [@johannescoetzee](https://github.com/johannescoetzee))
+* Fixes #4410 (PR [#4411](https://github.com/javaparser/javaparser/pull/4411) by [@matthieu-vergne](https://github.com/matthieu-vergne))
+* Fix issue 2368 Unable to calculate the type of a varargs parameter (PR [#4402](https://github.com/javaparser/javaparser/pull/4402) by [@jlerbsc](https://github.com/jlerbsc))
+* Fix: Fixes the version currently supported by Javaparser. (PR [#4393](https://github.com/javaparser/javaparser/pull/4393) by [@jlerbsc](https://github.com/jlerbsc))
+* ?? make mvnw command runnable by copy-pasting (PR [#4382](https://github.com/javaparser/javaparser/pull/4382) by [@cravingPixels](https://github.com/cravingPixels))
+
+### Developer Changes
+
+* chore(deps): bump actions/checkout from 4.1.4 to 4.1.5 (PR [#4415](https://github.com/javaparser/javaparser/pull/4415) by [@dependabot[bot]](https://github.com/apps/dependabot))
+* Minor refactoring on Concrete syntax model (PR [#4405](https://github.com/javaparser/javaparser/pull/4405) by [@jlerbsc](https://github.com/jlerbsc))
+* chore(deps): bump actions/checkout from 4.1.2 to 4.1.3 (PR [#4381](https://github.com/javaparser/javaparser/pull/4381) by [@dependabot[bot]](https://github.com/apps/dependabot))
+
+### Uncategorised
+
+* Improve unit test on generic (PR [#4407](https://github.com/javaparser/javaparser/pull/4407) by [@jlerbsc](https://github.com/jlerbsc))
+
+### :heart: Contributors
+
+Thank You to all contributors who worked on this release!
+
+* [@eldapiiro](https://github.com/eldapiiro)
+* [@cravingPixels](https://github.com/cravingPixels)
+* [@johannescoetzee](https://github.com/johannescoetzee)
+* [@matthieu-vergne](https://github.com/matthieu-vergne)
+* [@jlerbsc](https://github.com/jlerbsc)
+* [@Kimmmey](https://github.com/Kimmmey)
+
 
 Version 3.25.10
 ---------------

javaparser-core-generators/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>javaparser-parent</artifactId>
         <groupId>com.github.javaparser</groupId>
-        <version>3.25.10</version>
+        <version>3.26.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

javaparser-core-generators/src/main/java/com/github/javaparser/generator/CompilationUnitGenerator.java

@@ -24,23 +24,21 @@
 import com.github.javaparser.ParseResult;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.utils.SourceRoot;
-
 import java.util.List;
 
 public abstract class CompilationUnitGenerator extends Generator {
 
-	protected CompilationUnitGenerator(SourceRoot sourceRoot) {
-		super(sourceRoot);
-	}
-
-	@Override
-	public void generate() throws Exception {
-		List<ParseResult<CompilationUnit>> parsedCus = sourceRoot.tryToParse();
-		for (ParseResult<CompilationUnit> cu : parsedCus) {
-			cu.ifSuccessful(this::generateCompilationUnit);
-		}
-	}
+    protected CompilationUnitGenerator(SourceRoot sourceRoot) {
+        super(sourceRoot);
+    }
 
-	protected abstract void generateCompilationUnit(CompilationUnit compilationUnit);
+    @Override
+    public void generate() throws Exception {
+        List<ParseResult<CompilationUnit>> parsedCus = sourceRoot.tryToParse();
+        for (ParseResult<CompilationUnit> cu : parsedCus) {
+            cu.ifSuccessful(this::generateCompilationUnit);
+        }
+    }
 
+    protected abstract void generateCompilationUnit(CompilationUnit compilationUnit);
 }

javaparser-core-generators/src/main/java/com/github/javaparser/generator/Generator.java

@@ -21,6 +21,9 @@
 
 package com.github.javaparser.generator;
 
+import static com.github.javaparser.ast.NodeList.toNodeList;
+import static com.github.javaparser.utils.CodeGenerationUtils.f;
+
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.CallableDeclaration;
@@ -30,12 +33,8 @@
 import com.github.javaparser.ast.expr.StringLiteralExpr;
 import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
 import com.github.javaparser.utils.SourceRoot;
-
 import java.util.List;
 
-import static com.github.javaparser.ast.NodeList.toNodeList;
-import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 /**
  * A general pattern that the generators in this module will follow.
  */
@@ -61,10 +60,9 @@ protected void annotateOverridden(MethodDeclaration method) {
     }
 
     private <T extends Node & NodeWithAnnotations<?>> void annotate(T node, Class<?> annotation, Expression content) {
-        node.setAnnotations(
-                node.getAnnotations().stream()
-                        .filter(a -> !a.getNameAsString().equals(annotation.getSimpleName()))
-                        .collect(toNodeList()));
+        node.setAnnotations(node.getAnnotations().stream()
+                .filter(a -> !a.getNameAsString().equals(annotation.getSimpleName()))
+                .collect(toNodeList()));
 
         if (content != null) {
             node.addSingleMemberAnnotation(annotation.getSimpleName(), content);
@@ -78,7 +76,8 @@ private <T extends Node & NodeWithAnnotations<?>> void annotate(T node, Class<?>
      * Utility method that looks for a method or constructor with an identical signature as "callable" and replaces it
      * with callable. If not found, adds callable. When the new callable has no javadoc, any old javadoc will be kept.
      */
-    protected void addOrReplaceWhenSameSignature(ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callable) {
+    protected void addOrReplaceWhenSameSignature(
+            ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callable) {
         addMethod(containingClassOrInterface, callable, () -> containingClassOrInterface.addMember(callable));
     }
 
@@ -87,27 +86,33 @@ protected void addOrReplaceWhenSameSignature(ClassOrInterfaceDeclaration contain
      * with callable. If not found, fails. When the new callable has no javadoc, any old javadoc will be kept. The
      * method or constructor is annotated with the generator class.
      */
-    protected void replaceWhenSameSignature(ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callable) {
-        addMethod(containingClassOrInterface, callable,
-                () -> {
-                    throw new AssertionError(f("Wanted to regenerate a method with signature %s in %s, but it wasn't there.", callable.getSignature(), containingClassOrInterface.getNameAsString()));
-                });
+    protected void replaceWhenSameSignature(
+            ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callable) {
+        addMethod(containingClassOrInterface, callable, () -> {
+            throw new AssertionError(f(
+                    "Wanted to regenerate a method with signature %s in %s, but it wasn't there.",
+                    callable.getSignature(), containingClassOrInterface.getNameAsString()));
+        });
     }
 
     private void addMethod(
             ClassOrInterfaceDeclaration containingClassOrInterface,
             CallableDeclaration<?> callable,
             Runnable onNoExistingMethod) {
-        List<CallableDeclaration<?>> existingCallables = containingClassOrInterface.getCallablesWithSignature(callable.getSignature());
+        List<CallableDeclaration<?>> existingCallables =
+                containingClassOrInterface.getCallablesWithSignature(callable.getSignature());
         if (existingCallables.isEmpty()) {
             onNoExistingMethod.run();
             return;
         }
         if (existingCallables.size() > 1) {
-            throw new AssertionError(f("Wanted to regenerate a method with signature %s in %s, but found more than one.", callable.getSignature(), containingClassOrInterface.getNameAsString()));
+            throw new AssertionError(f(
+                    "Wanted to regenerate a method with signature %s in %s, but found more than one.",
+                    callable.getSignature(), containingClassOrInterface.getNameAsString()));
         }
         final CallableDeclaration<?> existingCallable = existingCallables.get(0);
-        callable.setJavadocComment(callable.getJavadocComment().orElseGet(() -> existingCallable.getJavadocComment().orElse(null)));
+        callable.setJavadocComment(callable.getJavadocComment()
+                .orElseGet(() -> existingCallable.getJavadocComment().orElse(null)));
         annotateGenerated(callable);
         containingClassOrInterface.getMembers().replace(existingCallable, callable);
     }
@@ -116,10 +121,11 @@ private void addMethod(
      * Removes all methods from containingClassOrInterface that have the same signature as callable. This is not used by
      * any code, but it is useful when changing a generator and you need to get rid of a set of outdated methods.
      */
-    protected void removeMethodWithSameSignature(ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callable) {
-        for (CallableDeclaration<?> existingCallable : containingClassOrInterface.getCallablesWithSignature(callable.getSignature())) {
+    protected void removeMethodWithSameSignature(
+            ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callable) {
+        for (CallableDeclaration<?> existingCallable :
+                containingClassOrInterface.getCallablesWithSignature(callable.getSignature())) {
             containingClassOrInterface.remove(existingCallable);
         }
     }
-
 }