From b8c5dfe4e47780586c8dd77619a09ffe43d33011 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Thu, 2 Feb 2017 21:41:33 +0100
Subject: [PATCH] Replace bookmark page with Kotlin version

---
 .../net/pterodactylus/sone/web/BookmarkPage.java   | 65 ----------------------
 .../net/pterodactylus/sone/web/BookmarkPage.kt     | 25 +++++++++
 .../net/pterodactylus/sone/web/BookmarkPageTest.kt |  2 +-
 3 files changed, 26 insertions(+), 66 deletions(-)
 delete mode 100644 src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
 create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/BookmarkPage.kt

diff --git a/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java b/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
deleted file mode 100644
index 7602230..0000000
--- a/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Sone - BookmarkPage.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 <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web;
-
-import net.pterodactylus.sone.data.Post;
-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 bookmark a post.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BookmarkPage extends SoneTemplatePage {
-
-	/**
-	 * @param template
-	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public BookmarkPage(Template template, WebInterface webInterface) {
-		super("bookmark.html", template, "Page.Bookmark.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> post = webInterface.getCore().getPost(id);
-			if (post.isPresent()) {
-				webInterface.getCore().bookmarkPost(post.get());
-			}
-			throw new RedirectException(returnPage);
-		}
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/BookmarkPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/BookmarkPage.kt
new file mode 100644
index 0000000..3eac0aa
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/BookmarkPage.kt
@@ -0,0 +1,25 @@
+package net.pterodactylus.sone.web
+
+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.POST
+
+/**
+ * Page that lets the user bookmark a post.
+ */
+class BookmarkPage(template: Template, webInterface: WebInterface)
+	: SoneTemplatePage("bookmark.html", template, "Page.Bookmark.Title", webInterface) {
+
+	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		if (freenetRequest.method == POST) {
+			val returnPage = freenetRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)
+			val postId = freenetRequest.httpRequest.getPartAsStringFailsafe("post", 36)
+			webInterface.core.getPost(postId).orNull()?.let {
+				webInterface.core.bookmarkPost(it)
+			}
+			throw RedirectException(returnPage)
+		}
+	}
+
+}
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/BookmarkPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/BookmarkPageTest.kt
index 2a2c816..bebe10c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/BookmarkPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/BookmarkPageTest.kt
@@ -25,7 +25,7 @@ class BookmarkPageTest : WebPageTest() {
 
 	@Test
 	fun `get request does not bookmark anything and does not redirect`() {
-		page.handleRequest(freenetRequest, templateContext)
+		page.processTemplate(freenetRequest, templateContext)
 		verify(core, never()).bookmarkPost(any())
 	}
 
-- 
2.7.4