From 4e6842bcd352fd72822d361601f0a4f10082a932 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:26:53 +0100 Subject: [PATCH 1/3] Revert "v1.1.2" --- pom.xml | 4 ++-- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8cb9b8d..0e927f3 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.1.1 + 2.4.0 org.slf4j @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.108 + 1.107 com.sedmelluq diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index d1e3c3f..aeaaf58 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn).toString(); + String response = r.table(table).get(id).toJson().run(conn); return new JSONObject(response); } -- 2.45.3 From 841821abe3af7e450073d88a77fc4a7e114518c6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:31:05 +0100 Subject: [PATCH 2/3] Revert "Revert "v1.1.2"" --- pom.xml | 4 ++-- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0e927f3..8cb9b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.1.1 org.slf4j @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.107 + 1.108 com.sedmelluq diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index aeaaf58..d1e3c3f 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn); + String response = r.table(table).get(id).toJson().run(conn).toString(); return new JSONObject(response); } -- 2.45.3 From 304c588dbb6805ee244e3d6c00c55a231dc6f74f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Mar 2020 20:05:47 +0100 Subject: [PATCH 3/3] Fix --- pom.xml | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 45289ec..c77db22 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.1.1 + 2.4.0 org.slf4j diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index d1e3c3f..aeaaf58 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn).toString(); + String response = r.table(table).get(id).toJson().run(conn); return new JSONObject(response); } -- 2.45.3