Replace follow Sone page with Kotlin version

diff --git a/src/main/java/net/pterodactylus/sone/web/pages/FollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/pages/FollowSonePage.java
deleted file mode 100644 (file)
index 9bfb790..0000000
--- a/src/main/java/net/pterodactylus/sone/web/pages/FollowSonePage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Sone - FollowSonePage.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 <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web.pages;
-
-import com.google.common.base.Optional;
-
-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;
-import net.pterodactylus.util.web.Method;
-
-/**
- * This page lets the user follow another Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class FollowSonePage extends SoneTemplatePage {
-
-       /**
-        * @param template
-        *            The template to render
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public FollowSonePage(Template template, WebInterface webInterface) {
-               super("followSone.html", template, "Page.FollowSone.Title", webInterface, true);
-       }
-
-       //
-       // TEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               if (request.getMethod() == Method.POST) {
-                       String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
-                       Sone currentSone = getCurrentSone(request.getToadletContext());
-                       String soneIds = request.getHttpRequest().getPartAsStringFailsafe("sone", 1200);
-                       for (String soneId : soneIds.split("[ ,]+")) {
-                               Optional<Sone> sone = webInterface.getCore().getSone(soneId);
-                               if (sone.isPresent()) {
-                                       webInterface.getCore().followSone(currentSone, soneId);
-                                       webInterface.getCore().markSoneKnown(sone.get());
-                               }
-                       }
-                       throw new RedirectException(returnPage);
-               }
-       }
-
-}

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
new file mode 100644 (file)
index 0000000..75ce7f8
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
@@ -0,0 +1,31 @@
+package net.pterodactylus.sone.web.pages
+
+import net.pterodactylus.sone.utils.isPOST
+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 follow another Sone.
+ */
+class FollowSonePage(template: Template, webInterface: WebInterface):
+               SoneTemplatePage("followSone.html", template, "Page.FollowSone.Title", webInterface, true) {
+
+       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+               if (request.isPOST) {
+                       request.httpRequest.getPartAsStringFailsafe("sone", 1200).split(Regex("[ ,]+"))
+                                       .map { it to webInterface.core.getSone(it) }
+                                       .filter { it.second.isPresent }
+                                       .map { it.first to it.second.get() }
+                                       .forEach { sone ->
+                                               webInterface.core.followSone(request.currentSone, sone.first)
+                                               webInterface.core.markSoneKnown(sone.second)
+                                       }
+                       throw RedirectException(request.httpRequest.getPartAsStringFailsafe("returnPage", 256))
+               }
+       }
+
+       private val FreenetRequest.currentSone get() = sessionProvider.getCurrentSone(toadletContext)
+
+}

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
index df65727..0cd8444 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
@@ -42,7 +42,7 @@ class FollowSonePageTest : WebPageTest() {
        @Test
        fun `get request does not redirect`() {
                request("", GET)
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
        }
 
        @Test