#76 throw error if template engines does not match (#78)

* #76 throw error if template engines does not match

* next release version

---------

cms-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>cms-api</artifactId>
 	<packaging>jar</packaging>

cms-api/src/main/java/com/github/thmarx/cms/api/SiteProperties.java

@@ -37,7 +37,7 @@ public String hostname () {
 	}
 
 	public String markdownEngine () {
-		return (String)getSubMap("markdown").getOrDefault("engine", "flexmark");
+		return (String)getSubMap("markdown").get("engine");
 	}
 
 	public String theme () {

cms-api/src/main/java/com/github/thmarx/cms/api/ThemeProperties.java

@@ -36,7 +36,7 @@ public ThemeProperties (final Map<String, Object> properties) {
 	}
 
 	public String templateEngine () {
-		return (String)getSubMap("template").getOrDefault("engine", "freemarker");
+		return (String)getSubMap("template").get("engine");
 	}
 
 	public List<String> activeModules () {

cms-filesystem/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>cms-filesystem</artifactId>
 	<packaging>jar</packaging>

cms-server/hosts/demo/site.yaml

@@ -1,8 +1,6 @@
 hostname: localhost
 baseurl: "http://localhost:1010"
 language: en
-template:
-  engine: thymeleaf
 markdown:
   engine: markedjs
 theme: default

cms-server/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>cms-server</artifactId>
 	<packaging>jar</packaging>

cms-server/src/main/java/com/github/thmarx/cms/server/VHost.java

@@ -74,7 +74,7 @@ public class VHost {
 
 	@Getter
 	private String hostname;
-	
+
 	@Getter
 	private Theme theme;
 
@@ -88,9 +88,9 @@ public class VHost {
 	protected final ServerProperties serverProperties;
 
 	protected RequestContextFactory requestContextFactory;
-	
+
 	private final Path hostBase;
-	
+
 	public VHost(final Path hostBase, final ServerProperties serverProperties) {
 		this.hostBase = hostBase;
 		this.eventBus = new DefaultEventBus();
@@ -117,9 +117,9 @@ private Theme loadTheme() throws IOException {
 	}
 
 	public void init(Path modules) throws IOException {
-
-		contentParser = new ContentParser();
 
+		contentParser = new ContentParser();
+
 		this.fileSystem = new FileSystem(hostBase, eventBus, (file) -> {
 			try {
 				return contentParser.parseMeta(file);
@@ -135,6 +135,14 @@ public void init(Path modules) throws IOException {
 
 		theme = loadTheme();
 
+		try {
+			getTemplateEngine();
+		} catch (Exception e) {
+			log.error(null , e);
+			fileSystem.shutdown();
+			throw e;
+		}
+
 		var classLoader = new ModuleAPIClassLoader(ClassLoader.getSystemClassLoader(),
 				List.of(
 						"org.slf4j",
@@ -168,15 +176,15 @@ public void init(Path modules) throws IOException {
 		contentResolver = new ContentResolver(contentBase, contentRenderer, fileSystem);
 
 		this.requestContextFactory = new RequestContextFactory(() -> resolveMarkdownRenderer(), extensionManager, getTheme());
-		
+
 		this.moduleManager.initModules();
-		
+
 		List<String> activeModules = new ArrayList<>();
 		activeModules.addAll(siteProperties.activeModules());
 		if (!theme.empty()) {
-			activeModules.addAll(theme.properties().activeModules());	
+			activeModules.addAll(theme.properties().activeModules());
 		}
-		
+
 		activeModules.stream()
 				.filter(module_id -> moduleManager.getModuleIds().contains(module_id))
 				.forEach(module_id -> {
@@ -209,9 +217,20 @@ public void init(Path modules) throws IOException {
 		});
 	}
 
+	private String getTemplateEngine() {
+		var engine = this.siteProperties.templateEngine();
+
+		var theme_engine = getTheme().properties().templateEngine();
+		if (theme_engine != null && engine != null && !theme_engine.equals(engine)) {
+			throw new RuntimeException("site template engine does not match theme template engine");
+		}
+
+		return theme_engine != null ? theme_engine : engine;
+	}
+
 	protected TemplateEngine resolveTemplateEngine() {
 		if (this.templateEngine == null) {
-			var engine = this.siteProperties.templateEngine();
+			var engine = getTemplateEngine();
 
 			List<TemplateEngineProviderExtentionPoint> extensions = moduleManager.extensions(TemplateEngineProviderExtentionPoint.class);
 			Optional<TemplateEngineProviderExtentionPoint> extOpt = extensions.stream().filter((ext) -> ext.getName().equals(engine)).findFirst();

cms-server/src/main/java/com/github/thmarx/cms/server/jetty/JettyVHost.java

@@ -21,7 +21,6 @@
  */
 import com.github.thmarx.cms.api.ServerProperties;
 import com.github.thmarx.cms.api.ThemeProperties;
-import com.github.thmarx.cms.request.RequestContextFactory;
 import com.github.thmarx.cms.server.jetty.handler.JettyDefaultHandler;
 import com.github.thmarx.cms.server.jetty.handler.JettyExtensionHandler;
 import com.github.thmarx.cms.server.VHost;

cms-server/src/main/java/com/github/thmarx/cms/theme/DefaultTheme.java

@@ -27,6 +27,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +41,7 @@
 @RequiredArgsConstructor
 public class DefaultTheme implements Theme {
 
-	public static final Theme EMPTY = new DefaultTheme(null, null, true);
+	public static final Theme EMPTY = new DefaultTheme(null, new ThemeProperties(Collections.emptyMap()), true);
 
 	private final Path themePath;
 	private final ThemeProperties properties;

modules/example-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>example-module</artifactId>
 	<packaging>jar</packaging>

modules/flexmark-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>flexmark-module</artifactId>
 	<packaging>jar</packaging>

modules/freemarker-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>freemarker-module</artifactId>
 	<packaging>jar</packaging>

modules/markedjs-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>markedjs-module</artifactId>
 	<packaging>jar</packaging>

modules/pebble-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>pebble-module</artifactId>
 	<packaging>jar</packaging>

modules/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<groupId>com.github.thmarx.cms.modules</groupId>
 	<artifactId>cms-modules</artifactId>

modules/pug-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>pug-module</artifactId>
 	<packaging>jar</packaging>

modules/search-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>search-module</artifactId>
 	<packaging>jar</packaging>

modules/thymeleaf-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.9.0-SNAPSHOT</version>
+		<version>2.9.0</version>
 	</parent>
 	<artifactId>thymeleaf-module</artifactId>
 	<packaging>jar</packaging>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.thmarx.cms</groupId>
 	<artifactId>cms-parent</artifactId>
-	<version>2.9.0-SNAPSHOT</version>
+	<version>2.9.0</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>