From 588879b266af7507b76df65f4ede5d5e6c3d984c Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 23 May 2017 20:25:21 +0200 Subject: [PATCH] Replace lock Sone page with Kotlin version --- .../pterodactylus/sone/web/pages/LockSonePage.java | 64 ---------------------- .../pterodactylus/sone/web/pages/LockSonePage.kt | 24 ++++++++ .../sone/web/pages/LockSonePageTest.kt | 3 + 3 files changed, 27 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/LockSonePage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/pages/LockSonePage.java b/src/main/java/net/pterodactylus/sone/web/pages/LockSonePage.java deleted file mode 100644 index 8300711..0000000 --- a/src/main/java/net/pterodactylus/sone/web/pages/LockSonePage.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Sone - LockSonePage.java - Copyright © 2010–2016 David Roden - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.web.pages; - -import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.web.WebInterface; -import net.pterodactylus.sone.web.page.FreenetRequest; -import net.pterodactylus.util.template.Template; -import net.pterodactylus.util.template.TemplateContext; - -/** - * This page lets the user lock a {@link Sone} to prevent it from being - * inserted. - * - * @author David ‘Bombe’ Roden - */ -public class LockSonePage extends SoneTemplatePage { - - /** - * Creates a new “lock Sone” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public LockSonePage(Template template, WebInterface webInterface) { - super("lockSone.html", template, "Page.LockSone.Title", webInterface); - } - - // - // TEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44); - Sone sone = webInterface.getCore().getLocalSone(soneId); - if (sone != null) { - webInterface.getCore().lockSone(sone); - } - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); - throw new RedirectException(returnPage); - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt new file mode 100644 index 0000000..ca70301 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt @@ -0,0 +1,24 @@ +package net.pterodactylus.sone.web.pages + +import net.pterodactylus.sone.utils.parameters +import net.pterodactylus.sone.web.WebInterface +import net.pterodactylus.sone.web.page.FreenetRequest +import net.pterodactylus.util.template.Template +import net.pterodactylus.util.template.TemplateContext + +/** + * This page lets the user lock a [net.pterodactylus.sone.data.Sone] to prevent it from being inserted. + */ +class LockSonePage(template: Template, webInterface: WebInterface): + SoneTemplatePage("lockSone.html", template, "Page.LockSone.Title", webInterface, false) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + request.parameters["returnPage", 256]!!.let { returnPage -> + request.parameters["sone", 44]!! + .let { webInterface.core.getLocalSone(it) } + ?.let { webInterface.core.lockSone(it) } + throw RedirectException(returnPage) + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/LockSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/LockSonePageTest.kt index 25678ca..6311f34 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/LockSonePageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/LockSonePageTest.kt @@ -2,6 +2,7 @@ package net.pterodactylus.sone.web.pages import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.test.mock +import net.pterodactylus.util.web.Method.POST import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.equalTo import org.junit.Test @@ -36,6 +37,7 @@ class LockSonePageTest : WebPageTest() { @Test fun `locking an invalid local sone redirects to return page`() { + setMethod(POST) addHttpRequestPart("returnPage", "return.html") verifyRedirect("return.html") { verify(core, never()).lockSone(any()) @@ -44,6 +46,7 @@ class LockSonePageTest : WebPageTest() { @Test fun `locking an valid local sone locks the sone and redirects to return page`() { + setMethod(POST) addHttpRequestPart("sone", "sone-id") val sone = mock() addLocalSone("sone-id", sone) -- 2.7.4