greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #397 from BigBotNetwork/greg-dev

Browse source 
Fix
This commit is contained in:
Skidder 2020-03-09 20:07:04 +01:00 • committed by GitHub
commit ae815985fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.rethinkdb</groupId> <groupId>com.rethinkdb</groupId>
<artifactId>rethinkdb-driver</artifactId> <artifactId>rethinkdb-driver</artifactId>
<version>2.4.1.1</version> <version>2.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

4
src/main/java/com/bbn/hadder/Rethink.java
View file

@ -53,7 +53,7 @@ public class Rethink {
private JSONArray getAsArray(String table, String where, String value) { private JSONArray getAsArray(String table, String where, String value) {
try { 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); return new JSONArray(string);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
return null; return null;
@ -77,7 +77,7 @@ public class Rethink {
} }
public JSONObject getObjectByID(String table, String id) { 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); return new JSONObject(response);
} }