rename in order to accommodate page blob header akka#3253

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

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/StorageHeaders.scala b/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/StorageHeaders.scala
@@ -8,7 +8,7 @@ package storage
 
 import akka.http.scaladsl.model.headers.{ByteRange, RawHeader, Range => RangeHeader}
 import akka.http.scaladsl.model.{ContentType, HttpHeader}
-import headers.{BlobTypeHeader, CustomContentLengthHeader, CustomContentTypeHeader, FileWriteTypeHeader}
+import headers.{BlobTypeHeader, CustomContentLengthHeader, CustomContentTypeHeader, RangeWriteTypeHeader}
 
 import java.util.Objects
 
@@ -53,7 +53,7 @@ private[storage] class StorageHeaders private (val contentLengthHeader: Option[H
   private[storage] def withLeaseIdHeader(leaseId: Option[String]): StorageHeaders =
     copy(leaseIdHeader = leaseId.map(value => RawHeader(LeaseIdHeaderKey, value)))
 
-  private[storage] def withFileWriteTypeHeader(fileWriteTypeHeader: FileWriteTypeHeader): StorageHeaders =
+  private[storage] def withFileWriteTypeHeader(fileWriteTypeHeader: RangeWriteTypeHeader): StorageHeaders =
     copy(fileWriteTypeHeader = Some(fileWriteTypeHeader.header))
 
   private[storage] def withFileTypeHeader(): StorageHeaders =

diff --git a/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/headers/headers.scala b/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/headers/headers.scala
@@ -41,11 +41,11 @@ object BlobTypeHeader {
   private[storage] val AppendBlobHeader = new BlobTypeHeader(AppendBlobType)
 }
 
-private[storage] case class FileWriteTypeHeader(writeType: String) {
-  @InternalApi private[storage] def header: HttpHeader = RawHeader(FileWriteTypeHeaderKey, writeType)
+private[storage] case class RangeWriteTypeHeader(headerName: String, writeType: String) {
+  @InternalApi private[storage] def header: HttpHeader = RawHeader(headerName, writeType)
 }
 
-object FileWriteTypeHeader {
-  private[storage] val UpdateFileHeader = new FileWriteTypeHeader("update")
-  private[storage] val ClearFileHeader = new FileWriteTypeHeader("clear")
+object RangeWriteTypeHeader {
+  private[storage] val UpdateFileHeader = new RangeWriteTypeHeader(FileWriteTypeHeaderKey, "update")
+  private[storage] val ClearFileHeader = new RangeWriteTypeHeader(FileWriteTypeHeaderKey, "clear")
 }
diff --git a/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/javadsl/FileService.scala b/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/javadsl/FileService.scala
@@ -13,7 +13,7 @@ import akka.http.javadsl.model.headers.ByteRange
 import akka.http.scaladsl.model.headers.ByteRange.Slice
 import akka.http.scaladsl.model.headers.{ByteRange => ScalaByteRange}
 import akka.http.scaladsl.model.{HttpEntity, ContentType => ScalaContentType}
-import akka.stream.alpakka.azure.storage.headers.FileWriteTypeHeader
+import akka.stream.alpakka.azure.storage.headers.RangeWriteTypeHeader
 import akka.stream.alpakka.azure.storage.impl.AzureStorageStream
 import akka.stream.javadsl.Source
 import akka.stream.scaladsl.SourceToCompletionStage
@@ -178,7 +178,7 @@ object FileService {
           .withContentTypeHeader(contentType.asInstanceOf[ScalaContentType])
           .withRangeHeader(range)
           .withLeaseIdHeader(Option(leaseId.orElse(null)))
-          .withFileWriteTypeHeader(FileWriteTypeHeader.UpdateFileHeader)
+          .withFileWriteTypeHeader(RangeWriteTypeHeader.UpdateFileHeader)
           .headers
       )
       .map(opt => Optional.ofNullable(opt.orNull))
@@ -205,7 +205,7 @@ object FileService {
           .withContentLengthHeader(0L)
           .withRangeHeader(range)
           .withLeaseIdHeader(Option(leaseId.orElse(null)))
-          .withFileWriteTypeHeader(FileWriteTypeHeader.ClearFileHeader)
+          .withFileWriteTypeHeader(RangeWriteTypeHeader.ClearFileHeader)
           .headers
       )
       .map(opt => Optional.ofNullable(opt.orNull))

diff --git a/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/scaladsl/FileService.scala b/azure-storage/src/main/scala/akka/stream/alpakka/azure/storage/scaladsl/FileService.scala
@@ -10,7 +10,7 @@ package scaladsl
 import akka.NotUsed
 import akka.http.scaladsl.model.{ContentType, ContentTypes, HttpEntity}
 import akka.http.scaladsl.model.headers.ByteRange
-import akka.stream.alpakka.azure.storage.headers.FileWriteTypeHeader
+import akka.stream.alpakka.azure.storage.headers.RangeWriteTypeHeader
 import akka.stream.alpakka.azure.storage.impl.AzureStorageStream
 import akka.stream.scaladsl.Source
 import akka.util.ByteString
@@ -124,7 +124,7 @@ object FileService {
         .withContentTypeHeader(contentType)
         .withRangeHeader(range)
         .withLeaseIdHeader(leaseId)
-        .withFileWriteTypeHeader(FileWriteTypeHeader.UpdateFileHeader)
+        .withFileWriteTypeHeader(RangeWriteTypeHeader.UpdateFileHeader)
         .headers
     )
   }
@@ -147,7 +147,7 @@ object FileService {
         .withContentLengthHeader(0L)
         .withRangeHeader(range)
         .withLeaseIdHeader(leaseId)
-        .withFileWriteTypeHeader(FileWriteTypeHeader.ClearFileHeader)
+        .withFileWriteTypeHeader(RangeWriteTypeHeader.ClearFileHeader)
         .headers
     )
 }