From c4f143ae02f20f00af04fd959121f59d30d10dcf Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 4 Jul 2024 20:35:28 -0700
Subject: [PATCH] Cleaned up template builder and related tests

---
 README.md                                              |  4 ++--
 src/main/java/rife/bld/extension/GeneratedVersion.java |  6 ++----
 .../{version.txt => default_generated_version.txt}     |  0
 .../java/rife/bld/extension/GeneratedVersionTest.java  | 10 ++++++++--
 .../{other_version_test.txt => foo/version_test.txt}   |  0
 5 files changed, 12 insertions(+), 8 deletions(-)
 rename src/main/resources/templates/{version.txt => default_generated_version.txt} (100%)
 rename src/test/resources/{other_version_test.txt => foo/version_test.txt} (100%)

diff --git a/README.md b/README.md
index 734cee4..bf89ce1 100755
--- a/README.md
+++ b/README.md
@@ -66,12 +66,12 @@ public void genver() throws Exception {
         .projectName("My App")
         .packageName("com.example.myapp")
         .className("MyAppVersion")
-        .classTemplate("myversion.txt")
+        .classTemplate("my_app_version.txt")
         .execute();
 }
 ```
 ```java
-// myversion.txt
+// my_app_version.txt
 
 package {{v packageName/}};
 
diff --git a/src/main/java/rife/bld/extension/GeneratedVersion.java b/src/main/java/rife/bld/extension/GeneratedVersion.java
index 9a79e86..3a79c9d 100644
--- a/src/main/java/rife/bld/extension/GeneratedVersion.java
+++ b/src/main/java/rife/bld/extension/GeneratedVersion.java
@@ -19,7 +19,6 @@ package rife.bld.extension;
 import rife.bld.BaseProject;
 import rife.resources.ResourceFinderDirectories;
 import rife.template.Template;
-import rife.template.TemplateConfig;
 import rife.template.TemplateFactory;
 import rife.tools.FileUtils;
 
@@ -61,7 +60,7 @@ public class GeneratedVersion {
         Template template;
         var version = project_.version();
         if (template_ == null) {
-            template = TemplateFactory.TXT.get("version.txt");
+            template = TemplateFactory.TXT.get("default_generated_version");
         } else {
             File parent;
             if (template_.getParentFile() != null) {
@@ -70,8 +69,7 @@ public class GeneratedVersion {
                 parent = new File(template_.getAbsolutePath()).getParentFile();
             }
             var dirs = new ResourceFinderDirectories(parent);
-            template = new TemplateFactory(TemplateConfig.TXT, "txt", TemplateFactory.TXT)
-                    .setResourceFinder(dirs).get(template_.getName());
+            template = TemplateFactory.TXT.setResourceFinder(dirs).get(template_.getName());
         }
 
         if (packageName_ == null) {
diff --git a/src/main/resources/templates/version.txt b/src/main/resources/templates/default_generated_version.txt
similarity index 100%
rename from src/main/resources/templates/version.txt
rename to src/main/resources/templates/default_generated_version.txt
diff --git a/src/test/java/rife/bld/extension/GeneratedVersionTest.java b/src/test/java/rife/bld/extension/GeneratedVersionTest.java
index 7b9ded5..af7e864 100644
--- a/src/test/java/rife/bld/extension/GeneratedVersionTest.java
+++ b/src/test/java/rife/bld/extension/GeneratedVersionTest.java
@@ -134,14 +134,20 @@ class GeneratedVersionTest {
                 .fromProject(PROJECT)
                 .directory(tmpDir.getAbsolutePath())
                 .extension(".java")
-                .classTemplate("src/test/resources/other_version_test.txt")
+                .classTemplate("src/test/resources/foo/version_test.txt")
                 .packageName("")
                 .className("MyVersion")
                 .execute();
 
         deleteOnExit(tmpDir);
 
-        assertThat(new File(tmpDir, "MyVersion.java")).exists();
+        var template = new File(tmpDir, "MyVersion.java");
+        assertThat(template).exists();
+
+        var content = Files.readString(template.toPath());
+        assertThat(content).contains("class MyVersion")
+                .contains("PROJECT = \"MyExample\";").contains("MAJOR = 2").contains("MINOR = 1")
+                .contains("REVISION = 3").contains("QUALIFIER = \"\"").contains("private MyVersion");
     }
 
     @Test
diff --git a/src/test/resources/other_version_test.txt b/src/test/resources/foo/version_test.txt
similarity index 100%
rename from src/test/resources/other_version_test.txt
rename to src/test/resources/foo/version_test.txt