Fixing some compiler warnings (#245)

Author: hiranya911

src/test/java/com/google/firebase/database/OnDisconnectTest.java

@@ -24,21 +24,23 @@
 import com.google.firebase.database.DatabaseReference.CompletionListener;
 import com.google.firebase.database.core.Path;
 import com.google.firebase.database.core.Repo;
+import com.google.firebase.database.snapshot.Node;
 import com.google.firebase.database.snapshot.NodeUtilities;
 import java.util.Map;
 import org.junit.Test;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
 public class OnDisconnectTest {
 
   private static final Path path = new Path("foo");
 
   @Test
-  public void testSetValue() throws Exception {
+  public void testSetValue() {
     Repo repo = mockRepo();
     OnDisconnect reference = new OnDisconnect(repo, path);
     reference.setValueAsync("value");
-    reference.setValue("value", (CompletionListener) null);
+    reference.setValue("value", null);
     Mockito.verify(repo, times(2))
         .scheduleNow(Mockito.any(Runnable.class));
     Mockito.verify(repo, times(2))
@@ -49,7 +51,7 @@ public void testSetValue() throws Exception {
   }
 
   @Test
-  public void testSetValueWithPriority() throws Exception {
+  public void testSetValueWithPriority() {
     Repo repo = mockRepo();
     OnDisconnect reference = new OnDisconnect(repo, path);
     reference.setValueAsync("value", 10);
@@ -89,7 +91,7 @@ public void testSetValueWithPriority() throws Exception {
   }
 
   @Test
-  public void testUpdateChildren() throws Exception {
+  public void testUpdateChildren() {
     Repo repo = mockRepo();
     OnDisconnect reference = new OnDisconnect(repo, path);
     try {
@@ -107,13 +109,13 @@ public void testUpdateChildren() throws Exception {
     Mockito.verify(repo, times(2))
         .onDisconnectUpdate(
             Mockito.same(path),
-            Mockito.any(Map.class),
+            ArgumentMatchers.<Map<Path, Node>>any(),
             Mockito.any(CompletionListener.class),
             Mockito.same(update));
   }
 
   @Test
-  public void testRemoveValue() throws Exception {
+  public void testRemoveValue() {
     Repo repo = mockRepo();
     OnDisconnect reference = new OnDisconnect(repo, path);
     reference.removeValueAsync();
@@ -129,7 +131,7 @@ public void testRemoveValue() throws Exception {
   }
 
   @Test
-  public void testCancel() throws Exception {
+  public void testCancel() {
     Repo repo = mockRepo();
     OnDisconnect reference = new OnDisconnect(repo, path);
     reference.cancelAsync();

src/test/java/com/google/firebase/database/core/utilities/ChildKeyGenerator.java

@@ -23,6 +23,7 @@
 import com.google.api.core.ApiFutures;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.database.DataSnapshot;
@@ -169,7 +170,7 @@ public void onSuccess(Void result) {
         success.compareAndSet(false, true);
         lock.countDown();
       }
-    });
+    }, MoreExecutors.directExecutor());
     boolean finished = lock.await(TestUtils.TEST_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
     if (shouldTimeout) {
       assertTrue("Write finished (expected to timeout).", !finished);

src/test/java/com/google/firebase/database/integration/FirebaseDatabaseAuthTestIT.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import com.google.api.client.json.GenericJson;
 import com.google.common.collect.ImmutableList;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.ChildEventListener;
@@ -82,7 +83,7 @@ private static String formatRules(DatabaseReference ref, String rules) {
     return String.format(
         "{\"rules\": {\".read\": true, \".write\": true, \"%s\": %s}}", ref.getKey(), rules);
   }
-  
+
   private static void uploadRules(FirebaseApp app, String rules) throws IOException {
     IntegrationTestUtils.AppHttpClient client = new IntegrationTestUtils.AppHttpClient(app);
     IntegrationTestUtils.ResponseInfo response = client.put("/.settings/rules.json", rules);

src/test/java/com/google/firebase/database/integration/OrderByTestIT.java

@@ -19,13 +19,18 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.googleapis.util.Utils;
+import com.google.api.client.http.ByteArrayContent;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpResponse;
 import com.google.api.client.json.GenericJson;
 import com.google.cloud.firestore.FirestoreOptions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.FirebaseOptions.Builder;
 import com.google.firebase.TestOnlyImplFirebaseTrampolines;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
@@ -35,13 +40,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
 
 public class IntegrationTestUtils {
 
@@ -151,26 +149,34 @@ public static List<DatabaseReference> getRandomNode(FirebaseApp app, int count)
   }
 
   public static class AppHttpClient {
-    
+
     private final FirebaseApp app;
+    private final FirebaseOptions options;
+    private final HttpRequestFactory requestFactory;
 
     public AppHttpClient() {
       this(FirebaseApp.getInstance());
     }
 
     public AppHttpClient(FirebaseApp app) {
       this.app = checkNotNull(app);
+      this.options = app.getOptions();
+      this.requestFactory = this.options.getHttpTransport().createRequestFactory();
     }
 
-    public ResponseInfo put(String path, String data) throws IOException {
-      String url = app.getOptions().getDatabaseUrl() + path + "?access_token=" + getToken();
-      HttpPut put = new HttpPut(url);
-      HttpEntity entity = new StringEntity(data, "UTF-8");
-      put.setEntity(entity);
-      
-      HttpClient httpClient = new DefaultHttpClient();
-      HttpResponse response = httpClient.execute(put);
-      return new ResponseInfo(response);
+    public ResponseInfo put(String path, String json) throws IOException {
+      String url = options.getDatabaseUrl() + path + "?access_token=" + getToken();
+      HttpRequest request = requestFactory.buildPutRequest(new GenericUrl(url),
+          ByteArrayContent.fromString("application/json", json));
+      HttpResponse response = null;
+      try {
+        response = request.execute();
+        return new ResponseInfo(response);
+      } finally {
+        if (response != null) {
+          response.disconnect();
+        }
+      }
     }
 
     private String getToken() {
@@ -185,8 +191,8 @@ public static class ResponseInfo {
     private final byte[] payload;
 
     private ResponseInfo(HttpResponse response) throws IOException {
-      this.status = response.getStatusLine().getStatusCode();
-      this.payload = EntityUtils.toByteArray(response.getEntity());
+      this.status = response.getStatusCode();
+      this.payload = ByteStreams.toByteArray(response.getContent());
     }
 
     public int getStatus() {