Address Kai's feedback

Author: lfkellogg

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiHttpClient.java

@@ -39,7 +39,6 @@
 class TesterApiHttpClient {
 
   private static final String APP_TESTERS_HOST = "firebaseapptesters.googleapis.com";
-  private static final String APP_TESTERS_UPLOAD_HOST = "firebaseapptesters.clients6.google.com";
   private static final String REQUEST_METHOD_GET = "GET";
   private static final String REQUEST_METHOD_POST = "POST";
   private static final String CONTENT_TYPE_HEADER_KEY = "Content-Type";
@@ -85,7 +84,7 @@ JSONObject makeGetRequest(String tag, String path, String token)
       throws FirebaseAppDistributionException {
     HttpsURLConnection connection = null;
     try {
-      connection = openHttpsUrlConnection(getTesterApiUrl(APP_TESTERS_HOST, path), token);
+      connection = openHttpsUrlConnection(getTesterApiUrl(path), token);
       return readResponse(tag, connection);
     } catch (IOException e) {
       throw getException(tag, ErrorMessages.NETWORK_ERROR, Status.NETWORK_FAILURE, e);
@@ -110,7 +109,7 @@ JSONObject makePostRequest(String tag, String path, String token, String request
       throw new FirebaseAppDistributionException(
           "Unsupported encoding: " + UTF_8, Status.UNKNOWN, e);
     }
-    return makePostRequest(tag, APP_TESTERS_HOST, path, token, bytes, new HashMap<>());
+    return makePostRequest(tag, path, token, bytes, new HashMap<>());
   }
 
   /**
@@ -125,20 +124,19 @@ JSONObject makeUploadRequest(String tag, String path, String token, byte[] reque
     Map<String, String> extraHeaders = new HashMap<>();
     extraHeaders.put(X_GOOG_UPLOAD_PROTOCOL_HEADER, X_GOOG_UPLOAD_PROTOCOL_RAW);
     extraHeaders.put(X_GOOG_UPLOAD_FILE_NAME_HEADER, X_GOOG_UPLOAD_FILE_NAME);
-    return makePostRequest(tag, APP_TESTERS_UPLOAD_HOST, path, token, requestBody, extraHeaders);
+    return makePostRequest(tag, path, token, requestBody, extraHeaders);
   }
 
   private JSONObject makePostRequest(
       String tag,
-      String host,
       String path,
       String token,
       byte[] requestBody,
       Map<String, String> extraHeaders)
       throws FirebaseAppDistributionException {
     HttpsURLConnection connection = null;
     try {
-      connection = openHttpsUrlConnection(getTesterApiUrl(host, path), token);
+      connection = openHttpsUrlConnection(getTesterApiUrl(path), token);
       connection.setDoOutput(true);
       connection.setRequestMethod(REQUEST_METHOD_POST);
       connection.addRequestProperty(CONTENT_TYPE_HEADER_KEY, JSON_CONTENT_TYPE);
@@ -164,8 +162,8 @@ private JSONObject makePostRequest(
     }
   }
 
-  private static String getTesterApiUrl(String host, String path) {
-    return String.format("https://%s/%s", host, path);
+  private static String getTesterApiUrl(String path) {
+    return String.format("https://%s/%s", APP_TESTERS_HOST, path);
   }
 
   private static JSONObject readResponse(String tag, HttpsURLConnection connection)

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiHttpClientTest.java

@@ -53,8 +53,6 @@ public class TesterApiHttpClientTest {
   private static final String TEST_PATH = "some/url/path";
   private static final String TEST_URL =
       String.format("https://firebaseapptesters.googleapis.com/%s", TEST_PATH);
-  private static final String TEST_UPLOAD_URL =
-      String.format("https://firebaseapptesters.clients6.google.com/%s", TEST_PATH);
   private static final String TAG = "Test Tag";
   private static final String TEST_POST_BODY = "Post body";
 
@@ -76,12 +74,13 @@ public void setup() throws Exception {
                 .setApiKey(TEST_API_KEY)
                 .build());
 
+    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
+
     testerApiHttpClient = new TesterApiHttpClient(firebaseApp, mockHttpsURLConnectionFactory);
   }
 
   @Test
   public void makeGetRequest_whenResponseSuccessful_returnsJsonResponse() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     String responseJson = readTestFile("testSimpleResponse.json");
     InputStream responseInputStream =
         new ByteArrayInputStream(responseJson.getBytes(UTF_8));
@@ -97,7 +96,6 @@ public void makeGetRequest_whenResponseSuccessful_returnsJsonResponse() throws E
 
   @Test
   public void makeGetRequest_whenConnectionFails_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     IOException caughtException = new IOException("error");
     when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenThrow(caughtException);
 
@@ -113,7 +111,6 @@ public void makeGetRequest_whenConnectionFails_throwsError() throws Exception {
 
   @Test
   public void makeGetRequest_whenInvalidJson_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     InputStream response =
         new ByteArrayInputStream(INVALID_RESPONSE.getBytes(UTF_8));
     when(mockHttpsURLConnection.getInputStream()).thenReturn(response);
@@ -132,7 +129,6 @@ public void makeGetRequest_whenInvalidJson_throwsError() throws Exception {
 
   @Test
   public void makeGetRequest_whenResponseFailsWith401_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     when(mockHttpsURLConnection.getResponseCode()).thenReturn(401);
     when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
 
@@ -149,7 +145,6 @@ public void makeGetRequest_whenResponseFailsWith401_throwsError() throws Excepti
 
   @Test
   public void makeGetRequest_whenResponseFailsWith403_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     when(mockHttpsURLConnection.getResponseCode()).thenReturn(403);
     when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
 
@@ -166,7 +161,6 @@ public void makeGetRequest_whenResponseFailsWith403_throwsError() throws Excepti
 
   @Test
   public void makeGetRequest_whenResponseFailsWith404_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     when(mockHttpsURLConnection.getResponseCode()).thenReturn(404);
     when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
 
@@ -183,7 +177,6 @@ public void makeGetRequest_whenResponseFailsWith404_throwsError() throws Excepti
 
   @Test
   public void makeGetRequest_whenResponseFailsWithUnknownCode_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     when(mockHttpsURLConnection.getResponseCode()).thenReturn(409);
     when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
 
@@ -200,7 +193,6 @@ public void makeGetRequest_whenResponseFailsWithUnknownCode_throwsError() throws
 
   @Test
   public void makePostRequest_zipsRequestBodyAndSetsCorrectHeaders() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     String responseJson = readTestFile("testSimpleResponse.json");
     InputStream responseInputStream =
         new ByteArrayInputStream(responseJson.getBytes(UTF_8));
@@ -224,7 +216,6 @@ public void makePostRequest_zipsRequestBodyAndSetsCorrectHeaders() throws Except
 
   @Test
   public void makePostRequest_whenConnectionFails_throwsError() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
     IOException caughtException = new IOException("error");
     when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenThrow(caughtException);
 
@@ -240,7 +231,6 @@ public void makePostRequest_whenConnectionFails_throwsError() throws Exception {
 
   @Test
   public void makeUploadRequest_zipsRequestBodyAndSetsCorrectHeaders() throws Exception {
-    when(mockHttpsURLConnectionFactory.openConnection(TEST_UPLOAD_URL)).thenReturn(mockHttpsURLConnection);
     String responseJson = readTestFile("testSimpleResponse.json");
     InputStream responseInputStream =
         new ByteArrayInputStream(responseJson.getBytes(UTF_8));