From 24f76bf190a4b606bd0474e995e424f73d32f7c3 Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <git@noties.io>
Date: Wed, 1 Nov 2023 16:34:42 +0100
Subject: [PATCH] Update writer

---
 .../io/noties/enhance/EnhanceWriterImpl.java  | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/noties/enhance/EnhanceWriterImpl.java b/src/main/java/io/noties/enhance/EnhanceWriterImpl.java
index 7b6f888..5ff78a7 100644
--- a/src/main/java/io/noties/enhance/EnhanceWriterImpl.java
+++ b/src/main/java/io/noties/enhance/EnhanceWriterImpl.java
@@ -166,23 +166,6 @@ private String processJavaFile(@Nonnull File file) {
         return out;
     }
 
-    @Nonnull
-    private static CompilationUnit compile(@Nonnull JavaParser javaParser, @Nonnull File file) {
-        final CompilationUnit unit;
-        try {
-            final ParseResult<CompilationUnit> result = javaParser.parse(file);
-            if (result.isSuccessful()) {
-                //noinspection OptionalGetWithoutIsPresent
-                unit = result.getResult().get();
-            } else {
-                throw new RuntimeException(result.toString());
-            }
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-        return unit;
-    }
-
     private static class ApiInfoVisitor extends VoidVisitorAdapter<ApiInfoStore> {
 
         private final ApiVersionFormatter formatter;
@@ -337,9 +320,14 @@ private static class Parser11 implements Parser {
         @Nonnull
         @Override
         public CompilationUnit parse(@Nonnull File file) {
+            return parse(javaParser11, file);
+        }
+
+        @Nonnull
+        protected static CompilationUnit parse(@Nonnull JavaParser javaParser, @Nonnull File file) {
             final CompilationUnit unit;
             try {
-                final ParseResult<CompilationUnit> result = javaParser11.parse(file);
+                final ParseResult<CompilationUnit> result = javaParser.parse(file);
                 if (result.isSuccessful()) {
                     //noinspection OptionalGetWithoutIsPresent
                     unit = result.getResult().get();
@@ -368,7 +356,7 @@ public CompilationUnit parse(@Nonnull File file) {
             //  there are classes that contain illegal variable names: `sealed` and `permits`
             CompilationUnit compilationUnit = null;
             try {
-                compilationUnit = compile(javaParser17, file);
+                compilationUnit = parse(javaParser17, file);
             } catch (Throwable t) {
                 log("[Enhance] Exception parsing with java-17");
                 //noinspection CallToPrintStackTrace