From 551c2cc1787db9fbffca982c2c38e706defdc961 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Fri, 1 Sep 2017 23:29:47 +0200
Subject: [PATCH] Replace delete profile field ajax page with Kotlin version

---
 .../sone/web/ajax/DeleteProfileFieldAjaxPage.java  | 66 ----------------------
 .../sone/web/ajax/DeleteProfileFieldAjaxPage.kt    | 27 +++++++++
 2 files changed, 27 insertions(+), 66 deletions(-)
 delete mode 100644 src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
 create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
deleted file mode 100644
index 7d937b5..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Sone - DeleteProfileFieldAjaxPage.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 static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
-
-import net.pterodactylus.sone.data.Profile;
-import net.pterodactylus.sone.data.Profile.Field;
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
-
-/**
- * AJAX page that lets the user delete a profile field.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class DeleteProfileFieldAjaxPage extends JsonPage {
-
-	/**
-	 * Creates a new “delete profile field” AJAX page.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public DeleteProfileFieldAjaxPage(WebInterface webInterface) {
-		super("deleteProfileField.ajax", webInterface);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JsonReturnObject createJsonObject(FreenetRequest request) {
-		String fieldId = request.getHttpRequest().getParam("field");
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		Profile profile = currentSone.getProfile();
-		Field field = profile.getFieldById(fieldId);
-		if (field == null) {
-			return createErrorJsonObject("invalid-field-id");
-		}
-		profile.removeField(field);
-		currentSone.setProfile(profile);
-		webInterface.getCore().touchConfiguration();
-		return createSuccessJsonObject().put("field", new ObjectNode(instance).put("id", new TextNode(field.getId())));
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt
new file mode 100644
index 0000000..5e7c901
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt
@@ -0,0 +1,27 @@
+package net.pterodactylus.sone.web.ajax
+
+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 delete a profile field.
+ */
+class DeleteProfileFieldAjaxPage(webInterface: WebInterface) : JsonPage("deleteProfileField.ajax", webInterface) {
+
+	override fun createJsonObject(request: FreenetRequest) =
+			getCurrentSone(request.toadletContext)!!.let { currentSone ->
+				currentSone.profile.let { profile ->
+					request.parameters["field"]
+							?.let(profile::getFieldById)
+							?.let { field ->
+								createSuccessJsonObject().also {
+									profile.removeField(field)
+									currentSone.profile = profile
+									webInterface.core.touchConfiguration()
+								}
+							} ?: createErrorJsonObject("invalid-field-id")
+				}
+			}
+
+}
-- 
2.7.4