opprop · wmdietl · Feb 1, 2024 · Dec 12, 2022 · Dec 12, 2022 · Dec 12, 2022
diff --git a/.github/workflows/create_github_release.yml b/.github/workflows/create_github_release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@v3.3.0
 
       - name: Create Release
         id: create_release

diff --git a/.github/workflows/maven_tests.yml b/.github/workflows/maven_tests.yml
@@ -18,6 +18,12 @@ on:
   # Enable manual triggering (important for contributors to enable a check on their fork)
   workflow_dispatch:
 
+# If a build is running in the current branch, and the branch is updated, we cancel the previous build and start
+# a new one with the updated changes.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   maven_test:
     strategy:
@@ -29,7 +35,8 @@ jobs:
         ## Different JDK versions have different implementations etc. -- test on all combinations (ideally 8 to latest).
         ### exclude pre-8 (min development version jdk8)
         ### exclude post-12 (changes to jdk causes reflection tests to fail due to added methods #1701 )
-        jdk: [ 8,9,10,11,12,13,14,15,16 ]
+        # typetools: Exclude 10 because of crashes in the compiler
+        jdk: [ 8,9,11,12,13,14,15,16 ]
     env:
       OS: ${{ matrix.os }}
       JDK: ${{ matrix.jdk }}
@@ -39,7 +46,7 @@ jobs:
     steps:
       ## Checkout the current version of the code from the repo.
       - name: Checkout latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.3.0
         with:
           fetch-depth: "0"
 
@@ -82,7 +89,7 @@ jobs:
         timeout-minutes: 10
         with:
           files: javaparser-core-testing/target/site/jacoco/jacoco.xml,javaparser-core-testing-bdd/target/site/jacoco/jacoco.xml
-          fail_ci_if_error: false # optional (default = false)
+          fail_ci_if_error: false # optional (default = false) -- fail the build if upload to codecov.io fails
           verbose: false # optional (default = false):
           flags: javaparser-core,AlsoSlowTests,${{ matrix.os }},jdk-${{ matrix.jdk }}
           env_vars: OS,JDK
@@ -92,7 +99,24 @@ jobs:
         timeout-minutes: 10
         with:
           file: javaparser-symbol-solver-testing/target/site/jacoco/jacoco.xml
-          fail_ci_if_error: false # optional (default = false)
+          fail_ci_if_error: false # optional (default = false) -- fail the build if upload to codecov.io fails
           verbose: false # optional (default = false):
           flags: javaparser-symbol-solver,AlsoSlowTests,${{ matrix.os }},jdk-${{ matrix.jdk }}
           env_vars: OS,JDK
+
+  # Run checkstyle validations for pipeline
+  checkstyle_check:
+    name: Validate checkstyle
+    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@v3
+        with:
+          java-version: '11'
+          distribution: 'zulu'
+      - name: Validate Project Checkstyle
+        run: ./mvnw -B checkstyle:check
diff --git a/.github/workflows/prepare_release_changelog.yml b/.github/workflows/prepare_release_changelog.yml
@@ -15,7 +15,7 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.3.0
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -5,14 +5,14 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # 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.8.5/apache-maven-3.8.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/changelog.md b/changelog.md
diff --git a/dev-files/JavaParser-CheckStyle.xml b/dev-files/JavaParser-CheckStyle.xml
@@ -0,0 +1,46 @@
+<!DOCTYPE module PUBLIC
+		"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+
+	<!-- Based on documentation: https://github.com/javaparser/javaparser/wiki/Coding-Guidelines -->
+
+	<property name="fileExtensions" value="java"/>
+
+	<!-- Wrap lines at 120 characters -->
+	<module name="LineLength">
+		<property name="max" value="120"/>
+		<property name="severity" value="warning" />
+	</module>
+
+	<module name="TreeWalker">
+
+		<!-- Indent with four spaces  -->
+		<module name="Indentation">
+			<property name="severity" value="warning" />
+		</module>
+
+		<!-- Type and Method annotations go on a separate line -->
+		<module name="AnnotationLocation">
+			<property name="allowSamelineMultipleAnnotations" value="false"/>
+			<property name="allowSamelineSingleParameterlessAnnotation" value="false"/>
+			<property name="allowSamelineParameterizedAnnotation" value="false"/>
+			<property name="severity" value="warning" />
+		</module>
+
+		<!-- Import order -->
+		<module name="CustomImportOrder">
+			<property name="customImportOrderRules"
+			          value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+			<property name="specialImportsRegExp" value="^javax\."/>
+			<property name="standardPackageRegExp" value="^java\."/>
+			<property name="sortImportsInGroupAlphabetically" value="false"/>
+			<property name="separateLineBetweenGroups" value="false"/>
+			<property name="severity" value="warning" />
+		</module>
+
+		<!-- Imports that are not used, should be removed -->
+		<module name="UnusedImports"/>
+
+	</module>
+</module>
diff --git a/fixup.sh b/fixup.sh
diff --git a/javaparser-core-generators/pom.xml b/javaparser-core-generators/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>javaparser-parent</artifactId>
         <groupId>com.github.javaparser</groupId>
-        <version>3.24.7</version>
+        <version>3.25.1</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
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2023 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.generator;
+
+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 abstract void generateCompilationUnit(CompilationUnit compilationUnit);
+
+}
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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -21,14 +21,14 @@
 
 package com.github.javaparser.generator;
 
+import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.CallableDeclaration;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.StringLiteralExpr;
 import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
-import com.github.javaparser.ast.Generated;
 import com.github.javaparser.utils.SourceRoot;
 
 import java.util.List;

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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -26,6 +26,7 @@
 import com.github.javaparser.generator.core.node.*;
 import com.github.javaparser.generator.core.other.BndGenerator;
 import com.github.javaparser.generator.core.other.TokenKindGenerator;
+import com.github.javaparser.generator.core.quality.NotNullGenerator;
 import com.github.javaparser.generator.core.visitor.*;
 import com.github.javaparser.utils.Log;
 import com.github.javaparser.utils.SourceRoot;
@@ -97,5 +98,7 @@ private void run(SourceRoot sourceRoot, SourceRoot generatedJavaCcSourceRoot) th
         new AcceptGenerator(sourceRoot).generate();
         new TokenKindGenerator(sourceRoot, generatedJavaCcSourceRoot).generate();
         new BndGenerator(sourceRoot).generate();
+
+        new NotNullGenerator(sourceRoot).generate();
     }
 }
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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 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-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2023 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *