Add default constructor arguments to AndroidBuildApi

Makes AndroidBuildUrl a required non-const reference argument passed
before CredentialSource and defaults every other argument besides
http_client.

Assisted-by: Jetski:Gemini Next

Author: Databean

base/cvd/cuttlefish/host/commands/cvd/fetch/downloaders.cc

@@ -89,8 +89,8 @@ Result<Downloaders> Downloaders::Create(const BuildApiFlags& flags,
   }
 
   impl->android_build_api_ = std::make_unique<AndroidBuildApi>(
-      *impl->retrying_http_client_, impl->android_creds_.get(),
-      impl->android_build_url_.get(), flags.wait_retry_period,
+      *impl->retrying_http_client_, *impl->android_build_url_,
+      impl->android_creds_.get(), flags.wait_retry_period,
       impl->cas_downloader_.get());
 
   if (flags.enable_caching && CanCache(target_directory, cache_base_path)) {

base/cvd/cuttlefish/host/libs/web/android_build_api.cpp

@@ -87,13 +87,13 @@ Result<Json::Value> GetResponseJson(const HttpResponse<Json::Value>& response,
 }  // namespace
 
 AndroidBuildApi::AndroidBuildApi(HttpClient& http_client,
+                                 AndroidBuildUrl& android_build_url,
                                  CredentialSource* credential_source,
-                                 AndroidBuildUrl* android_build_url,
                                  const std::chrono::seconds retry_period,
                                  CasDownloader* cas_downloader)
     : http_client_(http_client),
-      credential_source_(credential_source),
       android_build_url_(android_build_url),
+      credential_source_(credential_source),
       retry_period_(retry_period),
       cas_downloader_(cas_downloader) {}
 
@@ -189,7 +189,7 @@ Result<SeekableZipSource> AndroidBuildApi::FileReader(
 
 Result<AndroidBuildApi::BuildInfo> AndroidBuildApi::GetBuildInfo(
     std::string_view build_id, std::string_view target) {
-  const std::string url = android_build_url_->GetBuildUrl(build_id, target);
+  const std::string url = android_build_url_.GetBuildUrl(build_id, target);
   auto response =
       CF_EXPECT(HttpGetToJson(http_client_, url, CF_EXPECT(Headers())));
 
@@ -233,7 +233,7 @@ Result<AndroidBuildApi::BuildInfo> AndroidBuildApi::GetBuildInfo(
 Result<bool> AndroidBuildApi::BlockUntilTerminalStatus(
     std::string_view initial_status, std::string_view build_id,
     std::string_view target) {
-  const std::string url = android_build_url_->GetBuildUrl(build_id, target);
+  const std::string url = android_build_url_.GetBuildUrl(build_id, target);
   CF_EXPECTF(!initial_status.empty(),
              "\"{}\" is not a valid branch or build id.", build_id);
 
@@ -276,7 +276,7 @@ Result<std::vector<std::string>> AndroidBuildApi::Headers() {
 Result<std::optional<std::string>> AndroidBuildApi::LatestBuildId(
     const std::string& branch, const std::string& target) {
   const std::string url =
-      android_build_url_->GetLatestBuildIdUrl(branch, target);
+      android_build_url_.GetLatestBuildIdUrl(branch, target);
   auto response =
       CF_EXPECT(HttpGetToJson(http_client_, url, CF_EXPECT(Headers())));
 
@@ -303,7 +303,7 @@ Result<std::unordered_set<std::string>> AndroidBuildApi::Artifacts(
   std::unordered_set<std::string> artifacts;
 
   do {
-    const std::string url = android_build_url_->GetArtifactUrl(
+    const std::string url = android_build_url_.GetArtifactUrl(
         build.id, build.target, artifact_filenames, page_token);
     auto response =
         CF_EXPECT(HttpGetToJson(http_client_, url, CF_EXPECT(Headers())));
@@ -352,7 +352,7 @@ Result<std::unordered_set<std::string>> AndroidBuildApi::Artifacts(
 Result<std::string> AndroidBuildApi::GetArtifactDownloadUrl(
     const DeviceBuild& build, const std::string& artifact) {
   const std::string download_url_endpoint =
-      android_build_url_->GetArtifactDownloadUrl(build.id, build.target,
+      android_build_url_.GetArtifactDownloadUrl(build.id, build.target,
                                                  artifact);
   auto response = CF_EXPECT(
       HttpGetToJson(http_client_, download_url_endpoint, CF_EXPECT(Headers())));

base/cvd/cuttlefish/host/libs/web/android_build_api.h

@@ -40,10 +40,11 @@ class AndroidBuildApi : public BuildApi {
   AndroidBuildApi() = delete;
   AndroidBuildApi(AndroidBuildApi&&) = delete;
   virtual ~AndroidBuildApi() = default;
-  AndroidBuildApi(HttpClient& http_client, CredentialSource* credential_source,
-                  AndroidBuildUrl* android_build_url,
-                  std::chrono::seconds retry_period,
-                  CasDownloader* cas_downloader = nullptr);
+  AndroidBuildApi(
+      HttpClient& http_client, AndroidBuildUrl& android_build_url,
+      CredentialSource* credential_source = nullptr,
+      std::chrono::seconds retry_period = std::chrono::seconds::zero(),
+      CasDownloader* cas_downloader = nullptr);
 
   Result<Build> GetBuild(const BuildString& build_string) override;
 
@@ -117,8 +118,8 @@ class AndroidBuildApi : public BuildApi {
                                        const std::string& artifact_name);
 
   HttpClient& http_client_;
+  AndroidBuildUrl& android_build_url_;
   CredentialSource* credential_source_;
-  AndroidBuildUrl* android_build_url_;
   std::chrono::seconds retry_period_;
   CasDownloader* cas_downloader_;
 };