Skip to content

Fix connection leak #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zoriot wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −43
Open

Fix connection leak #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 50 additions & 43 deletions src/main/java/net/buildtheearth/modules/network/api/API.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import okhttp3.RequestBody;
import okhttp3.Response;
import okio.Buffer;
import org.jetbrains.annotations.NotNull;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
Expand All @@ -20,7 +21,7 @@
*/
public class API {

private static OkHttpClient httpClient = new OkHttpClient();
private static final OkHttpClient httpClient = new OkHttpClient();

/**
* A callback function to be able to handle the result of an API request
Expand Down Expand Up @@ -50,8 +51,6 @@ public static String get(String url) throws IOException {
/**
* Sends an asynchronous get request to an API
* @param url The URL to perform a get request on
* @return The result of the get request as a string
* @throws IOException When something went wrong performing the get request
*/
public static void getAsync(String url, ApiResponseCallback callback) {
Request request = new Request.Builder()
Expand All @@ -60,18 +59,20 @@ public static void getAsync(String url, ApiResponseCallback callback) {

httpClient.newCall(request).enqueue(new Callback() {
@Override
public void onResponse(Call call, Response response) throws IOException {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else if(BuildTeamTools.getInstance().isDebug())
callback.onFailure(new IOException("\nUnexpected code: \n" + response + "\n Response Body:\n" + response.body().string()));
else
callback.onFailure(new IOException("Unexpected code " + response.code()));
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (response) {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else if(BuildTeamTools.getInstance().isDebug())
callback.onFailure(new IOException("\nUnexpected code: \n" + response + "\n Response Body:\n" + response.body().string()));
else
callback.onFailure(new IOException("Unexpected code " + response.code()));
}
}

@Override
public void onFailure(Call call, IOException e) {
public void onFailure(@NotNull Call call, @NotNull IOException e) {
callback.onFailure(e);
}
});
Expand Down Expand Up @@ -110,21 +111,23 @@ public static void putAsync(String url, RequestBody requestBody, ApiResponseCall

httpClient.newCall(request).enqueue(new Callback() {
@Override
public void onResponse(Call call, Response response) throws IOException {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else if(BuildTeamTools.getInstance().isDebug()) {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
callback.onFailure(new IOException("\nUnexpected code: \n" + response + "\n Request Body:\n" + buffer.readUtf8() +"\n Response Body:\n" + response.body().string()));
}else {
callback.onFailure(new IOException("Unexpected code " + response.code()));
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (response) {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else if(BuildTeamTools.getInstance().isDebug()) {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
callback.onFailure(new IOException("\nUnexpected code: \n" + response + "\n Request Body:\n" + buffer.readUtf8() +"\n Response Body:\n" + response.body().string()));
}else {
callback.onFailure(new IOException("Unexpected code " + response.code()));
}
}
}

@Override
public void onFailure(Call call, IOException e) {
public void onFailure(@NotNull Call call, @NotNull IOException e) {
callback.onFailure(e);
}
});
Expand Down Expand Up @@ -162,20 +165,22 @@ public static void postAsync(String url, RequestBody requestBody, ApiResponseCal

httpClient.newCall(request).enqueue(new Callback() {
@Override
public void onResponse(Call call, Response response) throws IOException {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else if(BuildTeamTools.getInstance().isDebug()) {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
callback.onFailure(new IOException("\nUnexpected code: \n" + response + "\n Request Body:\n" + buffer.readUtf8() +"\n Response Body:\n" + response.body().string()));
}else
callback.onFailure(new IOException("Unexpected code: " + response.code()));
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (response) {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else if(BuildTeamTools.getInstance().isDebug()) {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
callback.onFailure(new IOException("\nUnexpected code: \n" + response + "\n Request Body:\n" + buffer.readUtf8() +"\n Response Body:\n" + response.body().string()));
}else
callback.onFailure(new IOException("Unexpected code: " + response.code()));
}
}

@Override
public void onFailure(Call call, IOException e) {
public void onFailure(@NotNull Call call, @NotNull IOException e) {
callback.onFailure(e);
}
});
Expand Down Expand Up @@ -213,17 +218,19 @@ public static void deleteAsync(String url, RequestBody requestBody, ApiResponseC

httpClient.newCall(request).enqueue(new Callback() {
@Override
public void onResponse(Call call, Response response) throws IOException {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else {
callback.onFailure(new IOException("Unexpected code " + response));
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (response) {
if (response.isSuccessful()) {
String responseBody = response.body().string();
callback.onResponse(responseBody);
} else {
callback.onFailure(new IOException("Unexpected code " + response));
}
}
}

@Override
public void onFailure(Call call, IOException e) {
public void onFailure(@NotNull Call call, @NotNull IOException e) {
callback.onFailure(e);
}
});
Expand All @@ -238,7 +245,7 @@ public static JSONArray createJSONArray(String jsonString) {
try {
jsonArray = (JSONArray) jsonParser.parse(jsonString);
} catch (ParseException e) {
e.printStackTrace();
BuildTeamTools.getInstance().getComponentLogger().error("Failed to parse JSON Array.", e);
}
}
return jsonArray;
Expand All @@ -251,7 +258,7 @@ public static JSONObject createJSONObject(String jsonString) {
try {
jsonObject = (JSONObject) jsonParser.parse(jsonString);
} catch (ParseException e) {
e.printStackTrace();
BuildTeamTools.getInstance().getComponentLogger().error("Failed to parse JSON Object.", e);
}
}
return jsonObject;
Expand Down