From aab46ff18650e49e9c812ec61cf80cf62af82f49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 4 Jun 2017 00:52:49 +0200 Subject: [PATCH] Replace unbookmark page with Kotlin version --- .../sone/web/pages/UnbookmarkPage.java | 78 ---------------------- .../net/pterodactylus/sone/utils/Optionals.kt | 1 + .../pterodactylus/sone/web/pages/UnbookmarkPage.kt | 36 ++++++++++ .../net/pterodactylus/sone/utils/OptionalsTest.kt | 15 +++++ .../sone/web/pages/UnbookmarkPageTest.kt | 10 +-- 5 files changed, 58 insertions(+), 82 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/UnbookmarkPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/pages/UnbookmarkPage.java b/src/main/java/net/pterodactylus/sone/web/pages/UnbookmarkPage.java deleted file mode 100644 index 6fa037f..0000000 --- a/src/main/java/net/pterodactylus/sone/web/pages/UnbookmarkPage.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Sone - UnbookmarkPage.java - Copyright © 2011–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 java.util.Set; - -import net.pterodactylus.sone.data.Post; -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; -import net.pterodactylus.util.web.Method; - -import com.google.common.base.Optional; - -/** - * Page that lets the user unbookmark a post. - * - * @author David ‘Bombe’ Roden - */ -public class UnbookmarkPage extends SoneTemplatePage { - - /** - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public UnbookmarkPage(Template template, WebInterface webInterface) { - super("unbookmark.html", template, "Page.Unbookmark.Title", webInterface); - } - - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - if (request.getMethod() == Method.POST) { - String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36); - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); - Optional post = webInterface.getCore().getPost(id); - if (post.isPresent()) { - webInterface.getCore().unbookmarkPost(post.get()); - } - throw new RedirectException(returnPage); - } - String id = request.getHttpRequest().getParam("post"); - if (id.equals("allNotLoaded")) { - Set posts = webInterface.getCore().getBookmarkedPosts(); - for (Post post : posts) { - if (!post.isLoaded()) { - webInterface.getCore().unbookmarkPost(post); - } - } - throw new RedirectException("bookmarks.html"); - } - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt b/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt index 35487ed..5f53ed0 100644 --- a/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt +++ b/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt @@ -3,5 +3,6 @@ package net.pterodactylus.sone.utils import com.google.common.base.Optional fun Optional.let(block: (T) -> R): R? = if (isPresent) block(get()) else null +fun Optional.also(block: (T) -> Unit) = if (isPresent) block(get()) else Unit fun T?.asOptional(): Optional = this?.let { Optional.of(it) } ?: Optional.absent() diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt new file mode 100644 index 0000000..6af1bcf --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt @@ -0,0 +1,36 @@ +package net.pterodactylus.sone.web.pages + +import net.pterodactylus.sone.data.Post +import net.pterodactylus.sone.utils.also +import net.pterodactylus.sone.utils.isGET +import net.pterodactylus.sone.utils.isPOST +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 + +/** + * Page that lets the user unbookmark a post. + */ +class UnbookmarkPage(template: Template, webInterface: WebInterface): + SoneTemplatePage("unbookmark.html", template, "Page.Unbookmark.Title", webInterface, false) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + when { + request.isGET && (request.parameters["post"] == "allNotLoaded") -> { + webInterface.core.bookmarkedPosts + .filterNot(Post::isLoaded) + .forEach(webInterface.core::unbookmarkPost) + throw RedirectException("bookmarks.html") + } + request.isPOST -> { + request.parameters["post", 36] + .let(webInterface.core::getPost) + .also(webInterface.core::unbookmarkPost) + throw RedirectException(request.parameters["returnPage", 256]) + } + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/utils/OptionalsTest.kt b/src/test/kotlin/net/pterodactylus/sone/utils/OptionalsTest.kt index 2a49db0..6d35509 100644 --- a/src/test/kotlin/net/pterodactylus/sone/utils/OptionalsTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/utils/OptionalsTest.kt @@ -5,6 +5,7 @@ import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.nullValue import org.junit.Test +import java.util.concurrent.atomic.AtomicBoolean /** * Test for [Optional] utils. @@ -24,6 +25,20 @@ class OptionalsTest { } @Test + fun `present optional can be processed with also`() { + val called = AtomicBoolean(false) + Optional.of(1).also { if (it == 1) called.set(true) } + assertThat(called.get(), equalTo(true)) + } + + @Test + fun `absent optional is not processed with also`() { + val called = AtomicBoolean(false) + Optional.absent().also { called.set(true) } + assertThat(called.get(), equalTo(false)) + } + + @Test fun `1 as optional is correct optional`() { val optional = 1.asOptional() assertThat(optional.get(), equalTo(1)) diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt index 1123ec8..fddc9a3 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt @@ -1,14 +1,17 @@ package net.pterodactylus.sone.web.pages import net.pterodactylus.sone.data.Post +import net.pterodactylus.sone.test.capture import net.pterodactylus.sone.test.mock import net.pterodactylus.sone.test.whenever import net.pterodactylus.util.web.Method.POST import org.hamcrest.MatcherAssert.assertThat +import org.hamcrest.Matchers.contains import org.hamcrest.Matchers.equalTo import org.junit.Test import org.mockito.Mockito.any import org.mockito.Mockito.never +import org.mockito.Mockito.times import org.mockito.Mockito.verify /** @@ -50,10 +53,9 @@ class UnbookmarkPageTest: WebPageTest() { val notLoadedPost2 = mock() whenever(core.bookmarkedPosts).thenReturn(setOf(loadedPost1, loadedPost2, notLoadedPost1, notLoadedPost2)) verifyRedirect("bookmarks.html") { - verify(core).unbookmarkPost(notLoadedPost1) - verify(core).unbookmarkPost(notLoadedPost2) - verify(core, never()).unbookmarkPost(loadedPost1) - verify(core, never()).unbookmarkPost(loadedPost2) + val postCaptor = capture() + verify(core, times(2)).unbookmarkPost(postCaptor.capture()) + assertThat(postCaptor.allValues, contains(notLoadedPost1, notLoadedPost2)) } } -- 2.7.4