X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Futils%2FJson.kt;h=ef3c95db0179ae7d2252bcae02ee34d8f8377655;hb=f98ec5222b0611a7e473c01cb6ef3a4ef73bc294;hp=7a09a4db5d4397d038ac74a69163738f6869d1dc;hpb=ccc17ddce331a6c70e3e6a14df34ca73c05ed012;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/utils/Json.kt b/src/main/kotlin/net/pterodactylus/sone/utils/Json.kt
index 7a09a4d..ef3c95d 100644
--- a/src/main/kotlin/net/pterodactylus/sone/utils/Json.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/utils/Json.kt
@@ -1,9 +1,27 @@
 package net.pterodactylus.sone.utils
 
+import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ArrayNode
 import com.fasterxml.jackson.databind.node.JsonNodeFactory.instance
 import com.fasterxml.jackson.databind.node.ObjectNode
 
 fun jsonObject(block: ObjectNode.() -> Unit): ObjectNode = ObjectNode(instance).apply(block)
 
+fun jsonObject(vararg properties: Pair<String, Any?>) = jsonObject {
+	properties.forEach {
+		it.second.let { value ->
+			when (value) {
+				is String -> put(it.first, value)
+				is Int -> put(it.first, value)
+				is Long -> put(it.first, value)
+				is Boolean -> put(it.first, value)
+				else -> Unit
+			}
+		}
+	}
+}
+
+fun jsonArray(vararg objects: String?): ArrayNode = objects.fold(ArrayNode(instance), ArrayNode::add)
+fun jsonArray(vararg objects: JsonNode?): ArrayNode = objects.fold(ArrayNode(instance), ArrayNode::add)
+
 fun Iterable<ObjectNode>.toArray(): ArrayNode = fold(ArrayNode(instance), ArrayNode::add)