fix return types akka#3253

sfali · Aug 29, 2024 · dc22e08 · dc22e08
1 parent a4e0687
commit dc22e08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/impl/AzureStorageStream.scala b/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/impl/AzureStorageStream.scala
@@ -160,7 +160,8 @@ object AzureStorageStream {
       .mapMaterializedValue(_ => NotUsed)
   }
 
-  private[storage] def putPageOrAppendBlock(objectPath: String, headers: Seq[HttpHeader]) = {
+  private[storage] def putPageOrAppendBlock(objectPath: String,
+                                            headers: Seq[HttpHeader]): Source[Option[ObjectMetadata], NotUsed] = {
     Source
       .fromMaterializer { (mat, attr) =>
         implicit val system: ActorSystem = mat.system

diff --git a/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/javadsl/BlobService.scala b/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/javadsl/BlobService.scala
@@ -165,18 +165,19 @@ object BlobService {
   def putPageBlock(objectPath: String,
                    contentType: ContentType,
                    maxBlockSize: Long,
-                   blobSequenceNumber: Option[Int],
-                   leaseId: Optional[String]): Source[Optional[ObjectMetadata], NotUsed.type] =
+                   blobSequenceNumber: Optional[Int],
+                   leaseId: Optional[String]): Source[Optional[ObjectMetadata], NotUsed] =
     AzureStorageStream
       .putPageOrAppendBlock(
         objectPath,
         StorageHeaders
           .create()
-          .withContentLengthHeader(0L)
           .withContentTypeHeader(contentType.asInstanceOf[ScalaContentType])
           .withBlobTypeHeader(BlobTypeHeader.PageBlobHeader)
           .withPageBlobContentLengthHeader(maxBlockSize)
-          .withPageBlobSequenceNumberHeader(blobSequenceNumber)
+          .withPageBlobSequenceNumberHeader(
+            Option(blobSequenceNumber.map(i => Integer.getInteger(i.toString)).orElse(null))
+          )
           .withLeaseIdHeader(Option(leaseId.orElse(null)))
           .headers
       )
@@ -194,13 +195,12 @@ object BlobService {
    */
   def putAppendBlock(objectPath: String,
                      contentType: ContentType,
-                     leaseId: Optional[String]): Source[Optional[ObjectMetadata], NotUsed.type] =
+                     leaseId: Optional[String]): Source[Optional[ObjectMetadata], NotUsed] =
     AzureStorageStream
       .putPageOrAppendBlock(
         objectPath,
         StorageHeaders
           .create()
-          .withContentLengthHeader(0L)
           .withContentTypeHeader(contentType.asInstanceOf[ScalaContentType])
           .withBlobTypeHeader(BlobTypeHeader.AppendBlobHeader)
           .withLeaseIdHeader(Option(leaseId.orElse(null)))