Replace bookmark ajax page with Kotlin version

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java
deleted file mode 100644 (file)
index ce5276b..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Sone - BookmarkAjaxPage.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.ajax;
-
-import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-import com.google.common.base.Optional;
-
-/**
- * AJAX page that lets the user bookmark a post.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BookmarkAjaxPage extends JsonPage {
-
-       /**
-        * Creates a new bookmark AJAX page.
-        *
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public BookmarkAjaxPage(WebInterface webInterface) {
-               super("bookmark.ajax", webInterface);
-       }
-
-       //
-       // JSONPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected JsonReturnObject createJsonObject(FreenetRequest request) {
-               String id = request.getHttpRequest().getParam("post", null);
-               if ((id == null) || (id.length() == 0)) {
-                       return createErrorJsonObject("invalid-post-id");
-               }
-               Optional<Post> post = webInterface.getCore().getPost(id);
-               if (post.isPresent()) {
-                       webInterface.getCore().bookmarkPost(post.get());
-               }
-               return createSuccessJsonObject();
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return false;
-       }
-
-}

diff --git a/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt b/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt
index c8167b9..326db9d 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/utils/Optionals.kt
@@ -3,7 +3,7 @@ package net.pterodactylus.sone.utils
 import com.google.common.base.Optional
 
 fun <T, R> Optional<T>.let(block: (T) -> R): R? = if (isPresent) block(get()) else null
-fun <T> Optional<T>.also(block: (T) -> Unit) = if (isPresent) block(get()) else Unit
+fun <T> Optional<T>.also(block: (T) -> Unit): Optional<T> { if (isPresent) block(get()); return this }
 
 fun <T> T?.asOptional(): Optional<T> = this?.let { Optional.of(it) } ?: Optional.absent<T>()
 

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt
new file mode 100644 (file)
index 0000000..fd22f06
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt
@@ -0,0 +1,23 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.utils.also
+import net.pterodactylus.sone.utils.emptyToNull
+import net.pterodactylus.sone.utils.parameters
+import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.web.page.FreenetRequest
+
+/**
+ * AJAX page that lets the user bookmark a post.
+ */
+class BookmarkAjaxPage(webInterface: WebInterface) : JsonPage("bookmark.ajax", webInterface) {
+
+       override fun requiresLogin() = false
+
+       override fun createJsonObject(request: FreenetRequest) =
+                       request.parameters["post"].emptyToNull
+                                       ?.let(webInterface.core::getPost)
+                                       ?.also(webInterface.core::bookmarkPost)
+                                       ?.let { createSuccessJsonObject() }
+                                       ?: createErrorJsonObject("invalid-post-id")
+
+}

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
index b5f17cf..b4d897c 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
@@ -19,6 +19,7 @@ import net.pterodactylus.sone.utils.asOptional
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.notify.Notification
+import net.pterodactylus.util.web.Method.GET
 import org.junit.Before
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyString
@@ -82,11 +83,13 @@ open class JsonPageTest(pageSupplier: (WebInterface) -> JsonPage = { _ -> mock<J
        @Before
        fun setupFreenetRequest() {
                whenever(freenetRequest.toadletContext).thenReturn(toadletContext)
+               whenever(freenetRequest.method).thenReturn(GET)
                whenever(freenetRequest.httpRequest).thenReturn(httpRequest)
        }
 
        @Before
        fun setupHttpRequest() {
+               whenever(httpRequest.method).thenReturn("GET")
                whenever(httpRequest.getParam(anyString())).thenAnswer { requestParameters[it.getArgument(0)] ?: "" }
                whenever(httpRequest.getParam(anyString(), anyString())).thenAnswer { requestParameters[it.getArgument(0)] ?: it.getArgument(1) }
                whenever(httpRequest.getParam(anyString(), isNull())).thenAnswer { requestParameters[it.getArgument(0)] }