WIP

jonas · Oct 24, 2016 · 14b744a · 14b744a
1 parent f32dd65
commit 14b744a
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 56 deletions.
diff --git a/akka-http-core/src/main/scala/akka/http/impl/util/JavaAccessors.scala b/akka-http-core/src/main/scala/akka/http/impl/util/JavaAccessors.scala
@@ -28,7 +28,7 @@ object JavaAccessors {
 
   /** INTERNAL API */
   def HttpEntity(contentType: ContentType, file: File): UniversalEntity =
-    model.HttpEntity(contentType.asScala, file)
+    model.HttpEntity.fromPath(contentType.asScala, file.toPath)
 
   /** INTERNAL API */
   def HttpEntity(contentType: ContentType, file: Path): UniversalEntity =

diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala
@@ -57,7 +57,7 @@ sealed trait HttpEntity extends jm.HttpEntity {
    *
    * In many cases it's dangerous to rely on the (non-)existence of a content-length.
    * HTTP intermediaries like (transparent) proxies are allowed to change the transfer-encoding
-   * which can result in the entity being delivered as another type as expected.
+   * which can result in the entity being delivered as another type than expected.
    */
   def contentLengthOption: Option[Long]
 

diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala
@@ -29,8 +29,6 @@ import akka.http.impl.util.JavaMapping.Implicits._
 import scala.compat.java8.FutureConverters._
 import java.util.concurrent.CompletionStage
 
-import akka.http.javadsl.model.RequestEntity
-
 /**
  * The model of multipart content for media-types `multipart/\*` (general multipart content),
  * `multipart/form-data` and `multipart/byteranges`.