summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-05-22 17:31:42 +0200
committerPeter Wu <peter@lekensteyn.nl>2014-05-22 17:31:42 +0200
commite70eebea5575a5447432a2e3a99f9e9e71a23019 (patch)
tree44a01b1994773bc2b77b47ad956e725b31fff0f0
parent6c7590faf9d0689fedbc45752cf14467f6c7830a (diff)
downloadTwitterDataAnalytics-e70eebea5575a5447432a2e3a99f9e9e71a23019.tar.gz
Rename getResp to getJson
-rw-r--r--src/io/BearerRequester.java2
-rw-r--r--src/io/OAuthRequester.java4
-rw-r--r--src/io/Response.java22
-rw-r--r--src/main/Main.java4
4 files changed, 16 insertions, 16 deletions
diff --git a/src/io/BearerRequester.java b/src/io/BearerRequester.java
index 8af38f8..e778a4f 100644
--- a/src/io/BearerRequester.java
+++ b/src/io/BearerRequester.java
@@ -91,7 +91,7 @@ public class BearerRequester extends AbstractRequester {
// NOTE: this actually contributes to the ratelimit (12/minute)
// TODO: find alternative that does not hit the ratelimit
Response obj = getJSON("application/rate_limit_status");
- return obj.getResp().getAsJsonObject().has("errors");
+ return obj.getJson().getAsJsonObject().has("errors");
} catch (RateLimitException ex) {
return false;
}
diff --git a/src/io/OAuthRequester.java b/src/io/OAuthRequester.java
index cefb199..2bf2f31 100644
--- a/src/io/OAuthRequester.java
+++ b/src/io/OAuthRequester.java
@@ -82,7 +82,7 @@ public class OAuthRequester extends AbstractRequester {
/**
* Gets access tokens from a PIN (out-of-band method). The PIN can be
- * retrieved by visiting the URL from {@code getAuthURL()}. See
+ * retrieved by visiting the URL from {@literal getAuthURL()}. See
* https://dev.twitter.com/docs/auth/pin-based-authorization
*
* @param pin The PIN as found on the page.
@@ -138,7 +138,7 @@ public class OAuthRequester extends AbstractRequester {
Response obj;
try {
obj = getJSON("application/rate_limit_status");
- return !obj.getResp().getAsJsonObject().has("errors");
+ return !obj.getJson().getAsJsonObject().has("errors");
} catch (RateLimitException ex) {
return false;
}
diff --git a/src/io/Response.java b/src/io/Response.java
index 5cc36e1..92b0f0c 100644
--- a/src/io/Response.java
+++ b/src/io/Response.java
@@ -4,38 +4,38 @@ import com.google.gson.JsonElement;
/**
* A response object with the Jsonelement and rate limit values.
- *
+ *
* @author Maurice Laveaux
*/
public class Response {
-
+
private final JsonElement element;
-
+
private final int rateLimitReset;
-
+
private final int rateLimitRemaining;
-
+
private final int rateLimit;
-
+
public Response(JsonElement resp, int rateLimit, int rateLimitRemaining, int rateLimitReset) {
this.element = resp;
this.rateLimit = rateLimit;
this.rateLimitRemaining = rateLimitRemaining;
this.rateLimitReset = rateLimitReset;
}
-
- public JsonElement getResp() {
+
+ public JsonElement getJson() {
return element;
}
-
+
public int getRateLimit() {
return this.rateLimit;
}
-
+
public int getRateLimitRemaining() {
return this.rateLimitRemaining;
}
-
+
public int getRateLimitReset() {
return this.rateLimitReset;
}
diff --git a/src/main/Main.java b/src/main/Main.java
index 913646e..5ab8809 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -123,7 +123,7 @@ public class Main {
req.param("count", "100"); // max number of tweets, cannot be higher
req.param("lang", "en");
Response resp = req.request();
- JsonArray statuses = resp.getResp().getAsJsonObject().get("statuses").getAsJsonArray();
+ JsonArray statuses = resp.getJson().getAsJsonObject().get("statuses").getAsJsonArray();
for (int i = 0; i < statuses.size(); i++) {
JsonObject tweet = statuses.get(i).getAsJsonObject();
System.out.println(tweet);
@@ -189,7 +189,7 @@ public class Main {
try {
System.err.println("Executing: " + req.toString());
Response result = req.request();
- System.out.println(result.getResp().toString());
+ System.out.println(result.getJson().toString());
} catch (RateLimitException ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
}