Replace dismiss notification ajax page with Kotlin version
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 5 Sep 2017 06:11:44 +0000 (08:11 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 5 Sep 2017 06:11:44 +0000 (08:11 +0200)
src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java [deleted file]
src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt [new file with mode: 0644]

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
deleted file mode 100644 (file)
index 4661851..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Sone - DismissNotificationAjaxPage.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.ajax;
-
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.notify.Notification;
-
-import com.google.common.base.Optional;
-
-/**
- * AJAX page that lets the user dismiss a notification.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class DismissNotificationAjaxPage extends JsonPage {
-
-       /**
-        * Creates a new “dismiss notification” AJAX handler.
-        *
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public DismissNotificationAjaxPage(WebInterface webInterface) {
-               super("dismissNotification.ajax", webInterface);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected JsonReturnObject createJsonObject(FreenetRequest request) {
-               String notificationId = request.getHttpRequest().getParam("notification");
-               Optional<Notification> notification = webInterface.getNotification(notificationId);
-               if (!notification.isPresent()) {
-                       return createErrorJsonObject("invalid-notification-id");
-               }
-               if (!notification.get().isDismissable()) {
-                       return createErrorJsonObject("not-dismissable");
-               }
-               notification.get().dismiss();
-               return createSuccessJsonObject();
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return false;
-       }
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt
new file mode 100644 (file)
index 0000000..d9a354f
--- /dev/null
@@ -0,0 +1,27 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.utils.ifTrue
+import net.pterodactylus.sone.utils.let
+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 dismiss a notification.
+ */
+class DismissNotificationAjaxPage(webInterface: WebInterface) : JsonPage("dismissNotification.ajax", webInterface) {
+
+       override fun requiresLogin() = false
+
+       override fun createJsonObject(request: FreenetRequest): JsonReturnObject =
+                       request.parameters["notification"]!!
+                                       .let(webInterface::getNotification)
+                                       .let { notification ->
+                                               notification.isDismissable.ifTrue {
+                                                       createSuccessJsonObject().also {
+                                                               notification.dismiss()
+                                                       }
+                                               } ?: createErrorJsonObject("not-dismissable")
+                                       } ?: createErrorJsonObject("invalid-notification-id")
+
+}