From 5b9d7d47f2e3ba720a3d5a5b94146904e5e10632 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Fri, 17 May 2019 20:19:44 +0200
Subject: [PATCH] =?utf8?q?=E2=9C=A8=20Use=20@TemplatePath=20in=20FreenetTe?=
 =?utf8?q?mplatePage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../sone/web/page/FreenetTemplatePage.kt              |  6 ++++--
 .../sone/web/page/FreenetTemplatePageTest.kt          | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
index d93e7d1..792c0ba 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
@@ -34,8 +34,8 @@ import java.util.logging.Logger.*
 open class FreenetTemplatePage(
 		private val path: String,
 		private val templateContextFactory: TemplateContextFactory,
-		private val loaders: Loaders,
-		private val template: Template,
+		loaders: Loaders,
+		template: Template,
 		private val invalidFormPasswordRedirectTarget: String
 ) : FreenetPage, LinkEnabledCallback {
 
@@ -57,6 +57,8 @@ open class FreenetTemplatePage(
 
 	override fun isEnabled(toadletContext: ToadletContext) = !isFullAccessOnly
 
+	private val template = templatePath?.let(loaders::loadTemplate) ?: template
+
 	override fun handleRequest(request: FreenetRequest, response: Response): Response {
 		getRedirectTarget(request)?.let { redirectTarget -> return RedirectResponse(redirectTarget) }
 
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt
index d992b30..def7410 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt
@@ -8,11 +8,11 @@ import net.pterodactylus.util.web.Method.*
 import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
 import org.junit.*
-import org.mockito.ArgumentMatchers.*
+import org.mockito.Mockito.*
 
 class FreenetTemplatePageTest {
 
-	private val templateContextFactory = mock<TemplateContextFactory>()
+	private val templateContextFactory = deepMock<TemplateContextFactory>()
 	private val loaders = mock<Loaders>()
 	private val template = mock<Template>()
 	private val page = FreenetTemplatePage("/test/path", templateContextFactory, loaders, template, "invalid-form-password")
@@ -122,4 +122,19 @@ class FreenetTemplatePageTest {
 		assertThat(pageResponse.headers, contains(hasHeader("location", "invalid-form-password")))
 	}
 
+	@Test
+	fun `template from annotation is loaded`() {
+		val template = deepMock<Template>()
+		whenever(loaders.loadTemplate("template-path")).thenReturn(template)
+		TestPage(templateContextFactory, loaders)
+		verify(loaders).loadTemplate("template-path")
+	}
+
+	@TemplatePath("template-path")
+	private class TestPage(templateContextFactory: TemplateContextFactory, loaders: Loaders) : FreenetTemplatePage("/", templateContextFactory, loaders, Template(), "") {
+		override fun getPath() = ""
+		override fun isPrefixPage() = false
+		override fun handleRequest(request: FreenetRequest, response: Response) = response
+	}
+
 }
-- 
2.7.4