Add test for DI constructability of TrustAjaxPage

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / ajax / MarkAsKnownAjaxPage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
index beec718..4ab6d18 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
@@ -1,30 +1,30 @@
 package net.pterodactylus.sone.web.ajax
 
-import com.google.common.base.Optional
-import net.pterodactylus.sone.utils.mapPresent
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
+import javax.inject.Inject
 
 /**
  * AJAX page that lets the user mark a number of [net.pterodactylus.sone.data.Sone]s,
  * [net.pterodactylus.sone.data.Post]s, or [net.pterodactylus.sone.data.Reply]s as known.
  */
-class MarkAsKnownAjaxPage(webInterface: WebInterface) : JsonPage("markAsKnown.ajax", webInterface) {
+class MarkAsKnownAjaxPage @Inject constructor(webInterface: WebInterface) :
+               JsonPage("markAsKnown.ajax", webInterface) {
 
-       override fun requiresLogin() = false
+       override val requiresLogin = false
 
        override fun createJsonObject(request: FreenetRequest) = when (request.parameters["type"]) {
-               "sone" -> processIds(request, webInterface.core::getSone, webInterface.core::markSoneKnown)
-               "post" -> processIds(request, webInterface.core::getPost, webInterface.core::markPostKnown)
-               "reply" -> processIds(request, webInterface.core::getPostReply, webInterface.core::markReplyKnown)
+               "sone" -> processIds(request, core::getSone, core::markSoneKnown)
+               "post" -> processIds(request, core::getPost, core::markPostKnown)
+               "reply" -> processIds(request, core::getPostReply, core::markReplyKnown)
                else -> createErrorJsonObject("invalid-type")
        }
 
-       private fun <T> processIds(request: FreenetRequest, getter: (String) -> Optional<T>, marker: (T) -> Unit) =
+       private fun <T : Any> processIds(request: FreenetRequest, getter: (String) -> T?, marker: (T) -> Unit) =
                        request.parameters["id"]
                                        ?.split(Regex(" +"))
-                                       ?.mapPresent(getter)
+                                       ?.mapNotNull(getter)
                                        ?.onEach(marker)
                                        .let { createSuccessJsonObject() }