Prepare for breaking change in package:http

The `url` argument is changing from `Object`, accepting either `String`
or `Uri` at runtime, to `Uri` for better static help.
dart-lang/http#507

- Switch to using `Uri` for requests. Where sensible push this type into
  the signature of the surrounding method.
- Make some updated method private where they were unnecessarily public
  which makes it harder to have confidence when looking for usages.
  Rename a method with an unnecessary `get` name.

Change-Id: Ibf075741d6b9d292349b15f1dc84004981729aca
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/179368
Auto-Submit: Nate Bosch <[email protected]>
Commit-Queue: Jake Macdonald <[email protected]>
Reviewed-by: Jake Macdonald <[email protected]>

Author: natebosch

pkg/analysis_server/tool/code_completion/corpus.dart

@@ -91,8 +91,9 @@ Future<CloneResult> _clone(String repo) async {
 
 Future<String> _getBody(String url) async => (await _getResponse(url)).body;
 
-Future<http.Response> _getResponse(String url) async => _client
-    .get(url, headers: const {'User-Agent': 'dart.pkg.completion_metrics'});
+Future<http.Response> _getResponse(String url) async =>
+    _client.get(Uri.parse(url),
+        headers: const {'User-Agent': 'dart.pkg.completion_metrics'});
 
 bool _hasPubspec(FileSystemEntity f) =>
     f is Directory && File(path.join(f.path, 'pubspec.yaml')).existsSync();

pkg/compiler/test/sourcemaps/tools/translate_dart2js_stacktrace.dart

@@ -29,7 +29,7 @@ main(List<String> arguments) async {
   String url = options.rest[0];
   String data;
   if (url.startsWith("http://") || url.startsWith("https://")) {
-    data = (await http.get(url)).body;
+    data = (await http.get(Uri.parse(url))).body;
   } else {
     data = new File(url).readAsStringSync();
   }

pkg/nnbd_migration/test/migration_cli_test.dart

@@ -297,7 +297,7 @@ mixin _MigrationCliTestMethods on _MigrationCliTestBase {
   }
 
   Future assertPreviewServerResponsive(String url) async {
-    var response = await httpGet(url);
+    var response = await httpGet(Uri.parse(url));
     assertHttpSuccess(response);
   }
 
@@ -372,13 +372,13 @@ mixin _MigrationCliTestMethods on _MigrationCliTestBase {
 
   /// Performs an HTTP get, verifying that the response received (if any) is
   /// reasonable.
-  Future<http.Response> httpGet(dynamic url, {Map<String, String> headers}) {
+  Future<http.Response> httpGet(Uri url, {Map<String, String> headers}) {
     return checkHttpResponse(http.get(url, headers: headers));
   }
 
   /// Performs an HTTP post, verifying that the response received (if any) is
   /// reasonable.
-  Future<http.Response> httpPost(dynamic url,
+  Future<http.Response> httpPost(Uri url,
       {Map<String, String> headers, dynamic body, Encoding encoding}) {
     return checkHttpResponse(
         http.post(url, headers: headers, body: body, encoding: encoding));
@@ -399,7 +399,7 @@ mixin _MigrationCliTestMethods on _MigrationCliTestBase {
         await callback(url);
       });
       // Server should be stopped now
-      expect(httpGet(url), throwsA(anything));
+      expect(httpGet(Uri.parse(url)), throwsA(anything));
       assertNormalExit(cliRunner);
     }
   }

tests/standalone/io/shared_socket_test.dart

@@ -82,7 +82,7 @@ class ServerWorker {
   }
 }
 
-Future<String> get(String url) async {
+Future<String> get(Uri url) async {
   while (true) {
     try {
       await http.get(url);
@@ -96,7 +96,7 @@ void client(int port) async {
     final futures = <Future>[];
     final numAtOnce = 16; // enough to keep the server busy
     for (int i = 0; i < numAtOnce; ++i) {
-      futures.add(get('http://localhost:$port').then((_) {}));
+      futures.add(get(Uri.http('localhost:$port', '')).then((_) {}));
     }
     await Future.wait(futures);
   }

tests/standalone_2/io/shared_socket_test.dart

@@ -84,7 +84,7 @@ class ServerWorker {
   }
 }
 
-Future<String> get(String url) async {
+Future<String> get(Uri url) async {
   while (true) {
     try {
       await http.get(url);
@@ -98,7 +98,7 @@ void client(int port) async {
     final futures = <Future>[];
     final numAtOnce = 16; // enough to keep the server busy
     for (int i = 0; i < numAtOnce; ++i) {
-      futures.add(get('http://localhost:$port').then((_) {}));
+      futures.add(get(Uri.http('localhost:$port', '')).then((_) {}));
     }
     await Future.wait(futures);
   }

tools/bots/get_builder_status.dart

@@ -22,10 +22,10 @@ const failuresPerConfiguration = 20;
 
 /*late*/ bool useStagingDatabase;
 
-String get queryUrl {
-  var project = useStagingDatabase ? "dart-ci-staging" : "dart-ci";
-  return 'https://firestore.googleapis.com/v1/'
-      'projects/$project/databases/(default)/documents:runQuery';
+Uri get _queryUrl {
+  var project = useStagingDatabase ? 'dart-ci-staging' : 'dart-ci';
+  return Uri.https('firestore.googleapis.com',
+      '/v1/projects/$project/databases/(default)/documents:runQuery');
 }
 
 /*late*/ String builder;
@@ -226,7 +226,7 @@ Future<http.Response> runFirestoreQuery(String query) {
     'Accept': 'application/json',
     'Content-Type': 'application/json'
   };
-  return client.post(queryUrl, headers: headers, body: query);
+  return client.post(_queryUrl, headers: headers, body: query);
 }
 
 String buildQuery() => jsonEncode({

tools/bots/post_results_to_pubsub.dart

@@ -30,10 +30,8 @@ ${parser.usage}''');
 
 const resultsPerMessage = 100;
 
-String getPostUrl(String project) {
-  return 'https://pubsub.googleapis.com/v1/projects/$project'
-      '/topics/results:publish';
-}
+Uri _postUrl(String project) => Uri.https(
+    'pubsub.googleapis.com', 'v1/projects/$project/topics/results:publish');
 
 main(List<String> args) async {
   final parser = new ArgParser();
@@ -114,7 +112,7 @@ main(List<String> args) async {
       ]
     });
     final headers = {'Authorization': 'Bearer $token'};
-    final postUrl = getPostUrl(project);
+    final postUrl = _postUrl(project);
     final response =
         await client.post(postUrl, headers: headers, body: jsonMessage);