From e9d69f2b45a079e2800f655ebd38e79e415dd08d Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Sun, 23 Jan 2022 18:42:27 -0800
Subject: [PATCH] [java] javaparser 3.24.0 (#11382)

---
 modules/openapi-generator/pom.xml               |  2 +-
 .../org/openapitools/codegen/TestUtils.java     | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index 2efa246d044..e7fd2c138e9 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -338,7 +338,7 @@
         <dependency>
             <groupId>com.github.javaparser</groupId>
             <artifactId>javaparser-core</artifactId>
-            <version>3.14.11</version>
+            <version>3.24.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
index 7c7ee64361d..337f0c73a82 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
@@ -5,8 +5,9 @@ import static org.testng.Assert.fail;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.assertFalse;
 
-import com.github.javaparser.ParseProblemException;
-import com.github.javaparser.StaticJavaParser;
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.ParseResult;
 import com.github.javaparser.ast.CompilationUnit;
 import io.swagger.parser.OpenAPIParser;
 import io.swagger.v3.oas.models.Components;
@@ -150,13 +151,11 @@ public class TestUtils {
     }
 
     public static void assertValidJavaSourceCode(String javaSourceCode, String filename) {
-        try {
-            CompilationUnit compilation = StaticJavaParser.parse(javaSourceCode);
-            assertTrue(compilation.getTypes().size() > 0, "File: " + filename);
-        }
-        catch (ParseProblemException ex) {
-            fail("Java parse problem: " + filename, ex);
-        }
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_11);
+        JavaParser parser = new JavaParser(config);
+        ParseResult<CompilationUnit> parseResult = parser.parse(javaSourceCode);
+        assertTrue(parseResult.isSuccessful(), String.valueOf(parseResult.getProblems()));
     }
 
     public static void assertFileContains(Path path, String... lines) {