Use correct JSON library

the-obsidian · Dec 14, 2015 · a6d6c45 · a6d6c45
1 parent 0637f6e
commit a6d6c45
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,6 +57,12 @@
             <version>1.5</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20151123</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/kotlin/gg/obsidian/discoursegroupsync/UUIDHelper.kt b/src/main/kotlin/gg/obsidian/discoursegroupsync/UUIDHelper.kt
@@ -2,8 +2,7 @@ package gg.obsidian.discoursegroupsync
 
 import com.squareup.okhttp.OkHttpClient
 import com.squareup.okhttp.Request
-import org.json.simple.JSONObject
-import org.json.simple.JSONValue
+import org.json.JSONObject
 import java.util.*
 
 object UUIDHelper {
@@ -15,12 +14,12 @@ object UUIDHelper {
         val url = PROFILE_URL + uuid.toString().replace("-", "")
         val request = Request.Builder().url(url).get().build();
         val response = httpClient.newCall(request).execute()
-        val body = JSONValue.parse(response.body().string()) as JSONObject
+        val body = JSONObject(response.body().string())
 
-        if (body.containsKeyRaw("error")) {
+        if (body.has("error")) {
             return ""
         }
 
-        return body.get("name") as String
+        return body.getString("name")
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discoursegroupsync/UserManger.kt b/src/main/kotlin/gg/obsidian/discoursegroupsync/UserManger.kt
@@ -3,9 +3,7 @@ package gg.obsidian.discoursegroupsync
 import com.squareup.okhttp.OkHttpClient
 import com.squareup.okhttp.Request
 import org.bukkit.entity.Player
-import org.json.simple.JSONArray
-import org.json.simple.JSONObject
-import org.json.simple.JSONValue
+import org.json.JSONObject
 import java.util.*
 
 class UserManager(val plugin: DiscourseGroupSync) {
@@ -32,19 +30,19 @@ class UserManager(val plugin: DiscourseGroupSync) {
         }
 
         val bodyString = response.body().string()
-        val body = JSONValue.parse(bodyString) as JSONObject
-        val user = body.getRaw("user") as JSONObject
-        val customGroups = user.getRaw("custom_groups") as JSONArray
+        val body = JSONObject(bodyString)
+        val user = body.getJSONObject("user")
+        val customGroups = user.getJSONArray("custom_groups")
 
         val discourseGroups = HashSet<Int>()
 
         for (g in customGroups) {
             val group = g as JSONObject
-            val id = group.getRaw("id") as Long
+            val id = group.getLong("id")
             discourseGroups.add(id.toInt())
         }
 
-        if (customGroups.size == 0) {
+        if (customGroups.length() == 0) {
             discourseGroups.add(0)
         }