@@ -700,9 +700,9 @@ NonResumableParallelUploadState::Create(Client client,
700700 std::vector<ObjectWriteStream> streams;
701701
702702 auto upload_options = StaticTupleFilter<
703- Among<ContentEncoding, ContentType,
704- UploadChecksumValidationOption, EncryptionKey, KmsKeyName,
705- PredefinedAcl, UserProject, WithObjectMetadata>::TPred>(
703+ Among<ContentEncoding, ContentType, UploadChecksumValidationOption,
704+ EncryptionKey, KmsKeyName, PredefinedAcl, UserProject ,
705+ WithObjectMetadata>::TPred>(
706706 std::move (options));
707707 for (std::size_t i = 0 ; i < num_shards; ++i) {
708708 ResumableUploadRequest request (
@@ -806,9 +806,8 @@ StatusOr<ResumableParallelUploadState> ResumableParallelUploadState::CreateNew(
806806
807807 auto upload_options = std::tuple_cat (
808808 StaticTupleFilter<
809- Among<ContentEncoding, ContentType,
810- UploadChecksumValidationOption, EncryptionKey,
811- KmsKeyName, PredefinedAcl, UserProject,
809+ Among<ContentEncoding, ContentType, UploadChecksumValidationOption,
810+ EncryptionKey, KmsKeyName, PredefinedAcl, UserProject,
812811 WithObjectMetadata>::TPred>(options),
813812 std::make_tuple (UseResumableUploadSession (" " )));
814813 for (std::size_t i = 0 ; i < num_shards; ++i) {
@@ -865,8 +864,7 @@ StatusOr<ResumableParallelUploadState> ResumableParallelUploadState::Resume(
865864 }
866865
867866 auto read_options = std::tuple_cat (
868- StaticTupleFilter<Among<
869- UploadChecksumValidationOption, EncryptionKey,
867+ StaticTupleFilter<Among<UploadChecksumValidationOption, EncryptionKey,
870868 Generation, UserProject>::TPred>(options),
871869 std::make_tuple (IfGenerationMatch (state_and_gen->second )));
872870
@@ -916,9 +914,9 @@ StatusOr<ResumableParallelUploadState> ResumableParallelUploadState::Resume(
916914 std::vector<ObjectWriteStream> streams;
917915
918916 auto upload_options = StaticTupleFilter<
919- Among<ContentEncoding, ContentType,
920- UploadChecksumValidationOption, EncryptionKey, KmsKeyName,
921- PredefinedAcl, UserProject, WithObjectMetadata>::TPred>(
917+ Among<ContentEncoding, ContentType, UploadChecksumValidationOption,
918+ EncryptionKey, KmsKeyName, PredefinedAcl, UserProject ,
919+ WithObjectMetadata>::TPred>(
922920 std::move (options));
923921 for (auto & stream_desc : persistent_state->streams ) {
924922 ResumableUploadRequest request (bucket_name,
0 commit comments