From 80f0e89aaf1a3e7063bb4e9c3b930b6d7e460a6c Mon Sep 17 00:00:00 2001
From: Sandeep Siddhartha <sansid@google.com>
Date: Thu, 9 Oct 2014 14:27:52 -0700
Subject: [PATCH] Remove UsedForTesting tags from BlockingHttpClient

Bug: 17464069
Change-Id: I45aa6da0e339ffb56de613c2a0a43fe37fb2defd
---
 .../latin/network/BlockingHttpClient.java     | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

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