refactor: use record classes

casid · May 7, 2024 · ee7bda8 · ee7bda8
1 parent da958b4
commit ee7bda8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 35 deletions.
diff --git a/jte-kotlin/src/main/java/gg/jte/compiler/kotlin/KotlinCodeGenerator.java b/jte-kotlin/src/main/java/gg/jte/compiler/kotlin/KotlinCodeGenerator.java
@@ -255,13 +255,13 @@ private void writeBinaryTextPartsConstants(StringBuilder fields) {
     @Override
     public void onError( String message ) {
         DebugInfo debugInfo = getCurrentDebugInfo();
-        throw new TemplateException("Failed to compile " + debugInfo.name + ", error at line " + debugInfo.line + ": " + message);
+        throw new TemplateException("Failed to compile " + debugInfo.name() + ", error at line " + debugInfo.line() + ": " + message);
     }
 
     @Override
     public void onError(String message, int templateLine) {
         DebugInfo debugInfo = getDebugInfo(templateLine);
-        throw new TemplateException("Failed to compile " + debugInfo.name + ", error at line " + debugInfo.line + ": " + message);
+        throw new TemplateException("Failed to compile " + debugInfo.name() + ", error at line " + debugInfo.line() + ": " + message);
     }
 
     @Override

diff --git a/jte-models/src/main/java/gg/jte/models/runtime/StaticJteModel.java b/jte-models/src/main/java/gg/jte/models/runtime/StaticJteModel.java
@@ -48,7 +48,7 @@ private TemplateException handleException(Exception e) {
         DebugInfo debugInfo = loader.resolveDebugInfo(null, stackTrace);
         String message = "Failed to render " + loader.name;
         if (debugInfo != null) {
-            message += ", error at " + debugInfo.name + ":" + debugInfo.line;
+            message += ", error at " + debugInfo.name() + ":" + debugInfo.line();
 
             loader.rewriteStackTrace(e, null, stackTrace);
         }

diff --git a/jte-runtime/src/main/java/gg/jte/TemplateEngine.java b/jte-runtime/src/main/java/gg/jte/TemplateEngine.java
@@ -251,7 +251,7 @@ private TemplateException handleRenderException(String name, Template template,
         DebugInfo debugInfo = templateLoader.resolveDebugInfo(classLoader, stackTrace);
         String message = "Failed to render " + name;
         if (debugInfo != null) {
-            message += ", error at " + debugInfo.name + ":" + debugInfo.line;
+            message += ", error at " + debugInfo.name() + ":" + debugInfo.line();
 
             templateLoader.rewriteStackTrace(e, classLoader, stackTrace);
         }

diff --git a/jte-runtime/src/main/java/gg/jte/runtime/DebugInfo.java b/jte-runtime/src/main/java/gg/jte/runtime/DebugInfo.java
@@ -1,11 +1,3 @@
 package gg.jte.runtime;
 
-public class DebugInfo {
-    public final String name;
-    public final int line;
-
-    public DebugInfo(String name, int line) {
-        this.name = name;
-        this.line = line;
-    }
-}
+public record DebugInfo(String name, int line) {}
diff --git a/jte-watcher/src/main/java/gg/jte/watcher/DirectoryWatcher.java b/jte-watcher/src/main/java/gg/jte/watcher/DirectoryWatcher.java
@@ -18,7 +18,7 @@ public class DirectoryWatcher {
     private io.methvin.watcher.DirectoryWatcher watcher;
 
     public DirectoryWatcher(TemplateEngine templateEngine, DirectoryCodeResolver codeResolver) {
-        this(templateEngine, codeResolver.getRoot());
+        this(templateEngine, codeResolver.root());
     }
 
     public DirectoryWatcher(TemplateEngine templateEngine, Path root) {

diff --git a/jte/src/main/java/gg/jte/compiler/TemplateParser.java b/jte/src/main/java/gg/jte/compiler/TemplateParser.java
@@ -1109,15 +1109,7 @@ public int getTemplateLine() {
         }
     }
 
-    private static class Indent {
-        public final Mode mode;
-        public final int amount;
-
-        public Indent(Mode mode, int amount) {
-            this.mode = mode;
-            this.amount = amount;
-        }
-    }
+    private record Indent(Mode mode, int amount) {}
 
     public static class HtmlTag implements gg.jte.html.HtmlTag {
 

diff --git a/jte/src/main/java/gg/jte/compiler/java/JavaCodeGenerator.java b/jte/src/main/java/gg/jte/compiler/java/JavaCodeGenerator.java
@@ -224,13 +224,13 @@ private void writeBinaryTextPartsConstants(StringBuilder fields) {
     @Override
     public void onError( String message ) {
         DebugInfo debugInfo = getCurrentDebugInfo();
-        throw new TemplateException("Failed to compile " + debugInfo.name + ", error at line " + debugInfo.line + ": " + message);
+        throw new TemplateException("Failed to compile " + debugInfo.name() + ", error at line " + debugInfo.line() + ": " + message);
     }
 
     @Override
     public void onError(String message, int templateLine) {
         DebugInfo debugInfo = getDebugInfo(templateLine);
-        throw new TemplateException("Failed to compile " + debugInfo.name + ", error at line " + debugInfo.line + ": " + message);
+        throw new TemplateException("Failed to compile " + debugInfo.name() + ", error at line " + debugInfo.line() + ": " + message);
     }
 
     @Override

diff --git a/jte/src/main/java/gg/jte/resolve/DirectoryCodeResolver.java b/jte/src/main/java/gg/jte/resolve/DirectoryCodeResolver.java
@@ -14,12 +14,7 @@
 /**
  * Resolves template code within a given root directory.
  */
-public class DirectoryCodeResolver implements CodeResolver {
-    private final Path root;
-
-    public DirectoryCodeResolver(Path root) {
-        this.root = root;
-    }
+public record DirectoryCodeResolver(Path root) implements CodeResolver {
 
     @Override
     public String resolve(String name) {
@@ -70,8 +65,4 @@ public List<String> resolveAllTemplateNames() {
             throw new UncheckedIOException("Failed to resolve all templates in " + root, e);
         }
     }
-
-    public Path getRoot() {
-        return root;
-    }
 }