Major fixes in the code

peter-szrnka · Jul 20, 2023 · 4f38537 · 4f38537
1 parent 9da6f5a
commit 4f38537
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ hs_err_pid*
 /.settings/org.eclipse.m2e.core.prefs
 /.settings/org.eclipse.wst.common.project.facet.core.xml
 /out.html
+.vscode/settings.json
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
+		<java.version>11</java.version>
 
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
 			<artifactId>velocity-engine-core</artifactId>
-			<version>2.2</version>
+			<version>2.3</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/hu/szrnkapeter/rendertheme/service/OutputBuilderService.java b/src/main/java/hu/szrnkapeter/rendertheme/service/OutputBuilderService.java
@@ -13,6 +13,8 @@ public interface OutputBuilderService {
 
 	public static String buildOutput(List<RuleData> ruleDataList, String template) {
 		VelocityEngine velocityEngine = new VelocityEngine();
+		velocityEngine.setProperty("resource.loader", "class");
+		velocityEngine.setProperty("class.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
 		velocityEngine.init();
 
 		Template t = velocityEngine.getTemplate(template);

diff --git a/src/test/java/hu/szrnkapeter/rendertheme/service/OutputBuilderServiceTest.java b/src/test/java/hu/szrnkapeter/rendertheme/service/OutputBuilderServiceTest.java
@@ -20,7 +20,7 @@ class OutputBuilderServiceTest {
 	@Test
 	void testEmptyRuleDataList() throws IOException {
 		List<RuleData> ruleDataList = new ArrayList<>();
-		String result = OutputBuilderService.buildOutput(ruleDataList, "src/main/resources/output-template.html");
+		String result = OutputBuilderService.buildOutput(ruleDataList, "output-template.tpl");
 
 		assertNotNull(result);
 		assertEquals(TestUtils.getFileContent("src/test/resources/empty-resultlist.html"), result);

diff --git a/src/test/resources/empty-resultlist.html b/src/test/resources/empty-resultlist.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+	<title>Rendertheme color map</title>
 	<meta charset="utf-8">
 	<style type="text/css">
 		* {
@@ -28,6 +29,7 @@
 </head>
 <body>
 	<table>
+		<caption>Rendertheme rule data</caption>
 		<tr>
 			<th width="5%">E</th>
 			<th width="20%">K</th>