refactor: Consolidate AsyncWriter creation logic and reuse ResumeAppendableObjectUpload overload.

Author: rajeevpodar

google/cloud/storage/async/client.cc

@@ -153,16 +153,7 @@ AsyncClient::ResumeAppendableObjectUpload(BucketName const& bucket_name,
   append_object_spec.set_object(std::move(object_name));
   append_object_spec.set_generation(generation);
 
-  return connection_
-      ->ResumeAppendableObjectUpload(
-          {std::move(request),
-           internal::MergeOptions(std::move(opts), connection_->options())})
-      .then([](auto f) -> StatusOr<std::pair<AsyncWriter, AsyncToken>> {
-        auto w = f.get();
-        if (!w) return std::move(w).status();
-        auto t = storage_internal::MakeAsyncToken(w->get());
-        return std::make_pair(AsyncWriter(*std::move(w)), std::move(t));
-      });
+  return ResumeAppendableObjectUpload(std::move(request), std::move(opts));
 }
 
 future<StatusOr<std::pair<AsyncWriter, AsyncToken>>>

google/cloud/storage/async/client.h

@@ -432,7 +432,7 @@ class AsyncClient {
    * @param bucket_name the name of the bucket that contains the object.
    * @param object_name the name of the object to be uploaded.
    * @param generation the object generation to be uploaded.
-   * @param opts options controlling the behaviour of this RPC, for example the
+   * @param opts options controlling the behavior of this RPC, for example the
    * application may change the retry policy.
    */
   future<StatusOr<std::pair<AsyncWriter, AsyncToken>>>
@@ -446,7 +446,7 @@ class AsyncClient {
    *
    * @param request the request contents, it must include the bucket name,
    *     object name, and generation. Many other fields are optional.
-   * @param opts options controlling the behaviour of this RPC, for example the
+   * @param opts options controlling the behavior of this RPC, for example the
    * application may change the retry policy.
    */
   future<StatusOr<std::pair<AsyncWriter, AsyncToken>>>