nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 80f0e89a: Remove UsedForTesting tags from BlockingHttpClient 

* commit '80f0e89aaf1a3e7063bb4e9c3b930b6d7e460a6c':
  Remove UsedForTesting tags from BlockingHttpClient
main
Sandeep Siddhartha 2014-10-10 00:18:35 +00:00 committed by Android Git Automerger
parent d00ef4f691 80f0e89aaf
commit c4521eb19f
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
java/src/com/android/inputmethod/latin/network/BlockingHttpClient.java
View File

@ -18,8 +18,6 @@ package com.android.inputmethod.latin.network;
import android.util.Log; import android.util.Log;
import com.android.inputmethod.annotations.UsedForTesting;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -32,10 +30,7 @@ import javax.annotation.Nullable;
/** /**
* A client for executing HTTP requests synchronously. * A client for executing HTTP requests synchronously.
* This must never be called from the main thread. * This must never be called from the main thread.
*
* TODO: Remove @UsedForTesting after this is actually used.
*/ */
@UsedForTesting
public class BlockingHttpClient { public class BlockingHttpClient {
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final String TAG = BlockingHttpClient.class.getSimpleName(); private static final String TAG = BlockingHttpClient.class.getSimpleName();
@ -56,10 +51,6 @@ public class BlockingHttpClient {
T onSuccess(InputStream response) throws IOException; T onSuccess(InputStream response) throws IOException;
} }
/**
* TODO: Remove @UsedForTesting after this is actually used.
*/
@UsedForTesting
public BlockingHttpClient(HttpURLConnection connection) { public BlockingHttpClient(HttpURLConnection connection) {
mConnection = connection; mConnection = connection;
} }
@ -67,16 +58,19 @@ public class BlockingHttpClient {
/** /**
* Executes the request on the underlying {@link HttpURLConnection}. * Executes the request on the underlying {@link HttpURLConnection}.
* *
* TODO: Remove @UsedForTesting after this is actually used.
*
* @param request The request payload, if any, or null. * @param request The request payload, if any, or null.
* @param responseProcessor A processor for the HTTP response. * @param responseProcessor A processor for the HTTP response.
*/ */
@UsedForTesting
public <T> T execute(@Nullable byte[] request, @Nonnull ResponseProcessor<T> responseProcessor) public <T> T execute(@Nullable byte[] request, @Nonnull ResponseProcessor<T> responseProcessor)
throws IOException, AuthException, HttpException { throws IOException, AuthException, HttpException {
if (DEBUG) {
Log.d(TAG, "execute: " + mConnection.getURL());
}
try { try {
if (request != null) { if (request != null) {
if (DEBUG) {
Log.d(TAG, "request size: " + request.length);
}
OutputStream out = new BufferedOutputStream(mConnection.getOutputStream()); OutputStream out = new BufferedOutputStream(mConnection.getOutputStream());
out.write(request); out.write(request);
out.flush(); out.flush();
@ -85,15 +79,16 @@ public class BlockingHttpClient {
final int responseCode = mConnection.getResponseCode(); final int responseCode = mConnection.getResponseCode();
if (responseCode != HttpURLConnection.HTTP_OK) { if (responseCode != HttpURLConnection.HTTP_OK) {
if (DEBUG) { Log.w(TAG, "Response error: " + responseCode + ", Message: "
Log.d(TAG, "Response error: " + responseCode + ", Message: " + mConnection.getResponseMessage());
+ mConnection.getResponseMessage());
}
if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) { if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) {
throw new AuthException(mConnection.getResponseMessage()); throw new AuthException(mConnection.getResponseMessage());
} }
throw new HttpException(responseCode); throw new HttpException(responseCode);
} else { } else {
if (DEBUG) {
Log.d(TAG, "request executed successfully");
}
return responseProcessor.onSuccess(mConnection.getInputStream()); return responseProcessor.onSuccess(mConnection.getInputStream());
} }
} finally { } finally {