Merge tag 'javaparser-parent-3.25.8'

* tag 'javaparser-parent-3.25.8': (87 commits) [maven-release-plugin] prepare release javaparser-parent-3.25.8 update readme Update changelog chore(deps): update dependency org.assertj:assertj-core to v3.25.0 chore(deps): update dependency com.puppycrawl.tools:checkstyle to v10.12.7 Updates copyright fix: checkstyle rules fix: Eliminates the use of instanceof in favour of using the API fix: checkstyle rule fix: issue 4240 Calling resolve on catch block parameter throws exception. feat: creates cache statistics and moves Cache interface to javaparser-core (continued) feat: creates cache statistics and moves Cache interface to javaparser-core Fix: replaces RuntimeException to UnsolvedSymbolException in the class JavaParserFacade feat: Adds cache statistics Adds comment on JavaSymbolSolver feat: Add parseArrayInitializerExpr to JavaParser API fix(deps): update dependency org.javassist:javassist to v3.30.2-ga chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.12.1 Revert "Refactoring: Move cache features to javaparser-core" Fix: issue 4270 Exception when resolving ObjectCreationExpr with nested varargs ...
jmltoolkit · Jan 26, 2024 · 4944354 · 4944354
2 parents 2589bfb + d408fc5
commit 4944354
Show file tree

Hide file tree

Showing 1,279 changed files with 12,996 additions and 3,332 deletions.
diff --git a/.github/workflows/prepare_release_changelog.yml b/.github/workflows/prepare_release_changelog.yml
@@ -21,7 +21,7 @@ jobs:
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 11

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # 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.5/apache-maven-3.9.5-bin.zip
+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
diff --git a/changelog.md b/changelog.md
diff --git a/doc/docs/readme.md b/doc/docs/readme.md
@@ -7,7 +7,7 @@
 
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.javaparser/javaparser-core.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.javaparser%22%20AND%20a%3A%22javaparser-core%22)
 [![Build Status](https://travis-ci.org/javaparser/javaparser.svg?branch=master)](https://travis-ci.org/javaparser/javaparser)
-[![Coverage Status](https://coveralls.io/repos/javaparser/javaparser/badge.svg?branch=master&service=github)](https://coveralls.io/github/javaparser/javaparser?branch=master)
+[![Coverage Status](https://codecov.io/gh/javaparser/javaparser/branch/master/graphs/badge.svg?branch=master)](https://app.codecov.io/gh/javaparser/javaparser?branch=master)
 [![Join the chat at https://gitter.im/javaparser/javaparser](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/javaparser/javaparser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License LGPL-3/Apache-2.0](https://img.shields.io/badge/license-LGPL--3%2FApache--2.0-blue.svg)](LICENSE)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2667378.svg)](https://doi.org/10.5281/zenodo.2667378)

diff --git a/javaparser-core-generators/pom.xml b/javaparser-core-generators/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>jmlparser-parent</artifactId>
 		<groupId>io.github.jmltoolkit</groupId>
-		<version>3.25.6</version>
+		<version>3.25.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/...re-generators/src/main/java/com/github/javaparser/generator/CompilationUnitGenerator.java b/...re-generators/src/main/java/com/github/javaparser/generator/CompilationUnitGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/Generator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/Generator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -107,7 +107,7 @@ private void addMethod(
             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().orElse(existingCallable.getJavadocComment().orElse(null)));
+        callable.setJavadocComment(callable.getJavadocComment().orElseGet(() -> existingCallable.getJavadocComment().orElse(null)));
         annotateGenerated(callable);
         containingClassOrInterface.getMembers().replace(existingCallable, callable);
     }

diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/NodeGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/NodeGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...arser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java b/...arser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java b/...ser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...e-generators/src/main/java/com/github/javaparser/generator/core/node/AcceptGenerator.java b/...e-generators/src/main/java/com/github/javaparser/generator/core/node/AcceptGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...re-generators/src/main/java/com/github/javaparser/generator/core/node/CloneGenerator.java b/...re-generators/src/main/java/com/github/javaparser/generator/core/node/CloneGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rators/src/main/java/com/github/javaparser/generator/core/node/GetMetaModelGenerator.java b/...rators/src/main/java/com/github/javaparser/generator/core/node/GetMetaModelGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ors/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java b/...ors/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rators/src/main/java/com/github/javaparser/generator/core/node/NodeModifierGenerator.java b/...rators/src/main/java/com/github/javaparser/generator/core/node/NodeModifierGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java b/...generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rators/src/main/java/com/github/javaparser/generator/core/node/RemoveMethodGenerator.java b/...rators/src/main/java/com/github/javaparser/generator/core/node/RemoveMethodGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ators/src/main/java/com/github/javaparser/generator/core/node/ReplaceMethodGenerator.java b/...ators/src/main/java/com/github/javaparser/generator/core/node/ReplaceMethodGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...erators/src/main/java/com/github/javaparser/generator/core/node/TypeCastingGenerator.java b/...erators/src/main/java/com/github/javaparser/generator/core/node/TypeCastingGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ore-generators/src/main/java/com/github/javaparser/generator/core/other/BndGenerator.java b/...ore-generators/src/main/java/com/github/javaparser/generator/core/other/BndGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...tors/src/main/java/com/github/javaparser/generator/core/other/GrammarLetterGenerator.java b/...tors/src/main/java/com/github/javaparser/generator/core/other/GrammarLetterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...nerators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java b/...nerators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...nerators/src/main/java/com/github/javaparser/generator/core/quality/NotNullGenerator.java b/...nerators/src/main/java/com/github/javaparser/generator/core/quality/NotNullGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...r-core-generators/src/main/java/com/github/javaparser/generator/core/utils/CodeUtils.java b/...r-core-generators/src/main/java/com/github/javaparser/generator/core/utils/CodeUtils.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ors/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java b/...ors/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rs/src/main/java/com/github/javaparser/generator/core/visitor/EqualsVisitorGenerator.java b/...rs/src/main/java/com/github/javaparser/generator/core/visitor/EqualsVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...java/com/github/javaparser/generator/core/visitor/GenericListVisitorAdapterGenerator.java b/...java/com/github/javaparser/generator/core/visitor/GenericListVisitorAdapterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ain/java/com/github/javaparser/generator/core/visitor/GenericVisitorAdapterGenerator.java b/...ain/java/com/github/javaparser/generator/core/visitor/GenericVisitorAdapterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...s/src/main/java/com/github/javaparser/generator/core/visitor/GenericVisitorGenerator.java b/...s/src/main/java/com/github/javaparser/generator/core/visitor/GenericVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ava/com/github/javaparser/generator/core/visitor/GenericVisitorWithDefaultsGenerator.java b/...ava/com/github/javaparser/generator/core/visitor/GenericVisitorWithDefaultsGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../src/main/java/com/github/javaparser/generator/core/visitor/HashCodeVisitorGenerator.java b/.../src/main/java/com/github/javaparser/generator/core/visitor/HashCodeVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../src/main/java/com/github/javaparser/generator/core/visitor/ModifierVisitorGenerator.java b/.../src/main/java/com/github/javaparser/generator/core/visitor/ModifierVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...in/java/com/github/javaparser/generator/core/visitor/NoCommentEqualsVisitorGenerator.java b/...in/java/com/github/javaparser/generator/core/visitor/NoCommentEqualsVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../java/com/github/javaparser/generator/core/visitor/NoCommentHashCodeVisitorGenerator.java b/.../java/com/github/javaparser/generator/core/visitor/NoCommentHashCodeVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...va/com/github/javaparser/generator/core/visitor/ObjectIdentityEqualsVisitorGenerator.java b/...va/com/github/javaparser/generator/core/visitor/ObjectIdentityEqualsVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../com/github/javaparser/generator/core/visitor/ObjectIdentityHashCodeVisitorGenerator.java b/.../com/github/javaparser/generator/core/visitor/ObjectIdentityHashCodeVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...c/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorAdapterGenerator.java b/...c/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorAdapterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...tors/src/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorGenerator.java b/...tors/src/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...n/java/com/github/javaparser/generator/core/visitor/VoidVisitorWithDefaultsGenerator.java b/...n/java/com/github/javaparser/generator/core/visitor/VoidVisitorWithDefaultsGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...tors/src/test/java/com/github/javaparser/generator/core/quality/NotNullGeneratorTest.java b/...tors/src/test/java/com/github/javaparser/generator/core/quality/NotNullGeneratorTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...re-generators/src/test/java/com/github/javaparser/generator/core/utils/CodeUtilsTest.java b/...re-generators/src/test/java/com/github/javaparser/generator/core/utils/CodeUtilsTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/javaparser-core-metamodel-generator/pom.xml b/javaparser-core-metamodel-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>jmlparser-parent</artifactId>
 		<groupId>io.github.jmltoolkit</groupId>
-		<version>3.25.6</version>
+		<version>3.25.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/...-metamodel-generator/src/main/java/com/github/javaparser/generator/AbstractGenerator.java b/...-metamodel-generator/src/main/java/com/github/javaparser/generator/AbstractGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -56,7 +56,7 @@ public abstract class AbstractGenerator {
 
     protected static final String COPYRIGHT_NOTICE_JP_CORE = "\n" +
             " * Copyright (C) 2007-2010 Júlio Vilmar Gesser.\n" +
-            " * Copyright (C) 2011, 2013-2023 The JavaParser Team.\n" +
+            " * Copyright (C) 2011, 2013-2024 The JavaParser Team.\n" +
             " *\n" +
             " * This file is part of JavaParser.\n" +
             " *\n" +
@@ -77,7 +77,7 @@ public abstract class AbstractGenerator {
 
     protected static final String COPYRIGHT_NOTICE_JP_SS = "\n" +
             " * Copyright (C) 2015-2016 Federico Tomassetti\n" +
-            " * Copyright (C) 2017-2023 The JavaParser Team.\n" +
+            " * Copyright (C) 2017-2024 The JavaParser Team.\n" +
             " *\n" +
             " * This file is part of JavaParser.\n" +
             " *\n" +
@@ -128,7 +128,7 @@ private void addOrReplaceMethod(
             Optional<Comment> callableComment = callable.getComment();
             Optional<Comment> existingCallableComment = existingCallable.getComment();
 
-            callable.setComment(callableComment.orElse(existingCallable.getComment().orElse(null)));
+            callable.setComment(callableComment.orElseGet(() -> existingCallable.getComment().orElse(null)));
 //            callable.setJavadocComment(callableJavadocComment.orElse(existingCallableJavadocComment.orElse(null)));
 
             // Mark the method as having been fully/partially generated.

diff --git a/...el-generator/src/main/java/com/github/javaparser/generator/metamodel/AstTypeAnalysis.java b/...el-generator/src/main/java/com/github/javaparser/generator/metamodel/AstTypeAnalysis.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ub/javaparser/generator/metamodel/InitializeConstructorParametersStatementsGenerator.java b/...ub/javaparser/generator/metamodel/InitializeConstructorParametersStatementsGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ithub/javaparser/generator/metamodel/InitializePropertyMetaModelsStatementsGenerator.java b/...ithub/javaparser/generator/metamodel/InitializePropertyMetaModelsStatementsGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *