From c141e4c4a691323f83c209ffa0df927e989aa2ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Mon, 2 Oct 2017 12:39:05 +0200
Subject: [PATCH] Replace move profile field ajax page with Kotlin version

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java
deleted file mode 100644
index d4685e9..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Sone - MoveProfileFieldAjaxPage.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 javax.annotation.Nonnull;
-
-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;
-
-/**
- * AJAX page that lets the user move a profile field up or down.
- *
- * @see Profile#moveFieldUp(Field)
- * @see Profile#moveFieldDown(Field)
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class MoveProfileFieldAjaxPage extends LoggedInJsonPage {
-
-	/**
-	 * Creates a new “move profile field” AJAX page.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public MoveProfileFieldAjaxPage(WebInterface webInterface) {
-		super("moveProfileField.ajax", webInterface);
-	}
-
-	//
-	// JSONPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Nonnull
-	@Override
-	protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) {
-		Profile profile = currentSone.getProfile();
-		String fieldId = request.getHttpRequest().getParam("field");
-		Field field = profile.getFieldById(fieldId);
-		if (field == null) {
-			return createErrorJsonObject("invalid-field-id");
-		}
-		String direction = request.getHttpRequest().getParam("direction");
-		try {
-			if ("up".equals(direction)) {
-				profile.moveFieldUp(field);
-			} else if ("down".equals(direction)) {
-				profile.moveFieldDown(field);
-			} else {
-				return createErrorJsonObject("invalid-direction");
-			}
-		} catch (IllegalArgumentException iae1) {
-			return createErrorJsonObject("not-possible");
-		}
-		currentSone.setProfile(profile);
-		webInterface.getCore().touchConfiguration();
-		return createSuccessJsonObject();
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt
new file mode 100644
index 0000000..e2b039b
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt
@@ -0,0 +1,41 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.data.Profile
+import net.pterodactylus.sone.data.Profile.Field
+import net.pterodactylus.sone.data.Sone
+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 move a profile field up or down.
+ *
+ * @see net.pterodactylus.sone.data.Profile#moveFieldUp(Field)
+ * @see net.pterodactylus.sone.data.Profile#moveFieldDown(Field)
+ */
+class MoveProfileFieldAjaxPage(webInterface: WebInterface) : LoggedInJsonPage("moveProfileField.ajax", webInterface) {
+
+	override fun createJsonObject(currentSone: Sone, request: FreenetRequest) =
+			currentSone.profile.let { profile ->
+				request.parameters["field"]
+						?.let(profile::getFieldById)
+						?.let { processField(currentSone, profile, it, request.parameters["direction"]) }
+						?: createErrorJsonObject("invalid-field-id")
+			}
+
+	private fun processField(currentSone: Sone, profile: Profile, field: Field, direction: String?) =
+			try {
+				when (direction) {
+					"up" -> profile.moveFieldUp(field)
+					"down" -> profile.moveFieldDown(field)
+					else -> null
+				}?.let {
+					currentSone.profile = profile
+					webInterface.core.touchConfiguration()
+					createSuccessJsonObject()
+				} ?: createErrorJsonObject("invalid-direction")
+			} catch (e: IllegalArgumentException) {
+				createErrorJsonObject("not-possible")
+			}
+
+}
-- 
2.7.4