Add modeled header for Content-Location

akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentLocation.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package akka.http.javadsl.model.headers;
+
+import akka.http.javadsl.model.Uri;
+
+/**
+ *  Model for the `ContentLocation` header.
+ *  Specification: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
+ */
+public abstract class ContentLocation extends akka.http.scaladsl.model.HttpHeader {
+    public abstract Uri getUri();
+
+    public static ContentLocation create(Uri uri) {
+        return new akka.http.scaladsl.model.headers.Content$minusLocation(uri.asScala());
+    }
+    public static ContentLocation create(String uri) {
+        return create(Uri.create(uri));
+    }
+}

akka-http-core/src/main/mima-filters/10.1.9.backwards.excludes/pr-2540-add-content-location-header-model.excludes

@@ -0,0 +1,2 @@
+# change to internal class, only needed for Scala 2.11
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.impl.model.parser.SimpleHeaders.content-location")

akka-http-core/src/main/scala/akka/http/impl/model/parser/HeaderParser.scala

@@ -146,6 +146,7 @@ private[http] object HeaderParser {
     "content-disposition",
     "content-encoding",
     "content-length",
+    "content-location",
     "content-range",
     "content-type",
     "cookie",

akka-http-core/src/main/scala/akka/http/impl/model/parser/SimpleHeaders.scala

@@ -91,6 +91,13 @@ private[parser] trait SimpleHeaders { this: Parser with CommonRules with CommonA
     longNumberCapped ~> (`Content-Length`(_)) ~ EOI
   }
 
+  // https://tools.ietf.org/html/rfc7231#section-3.1.4.2
+  def `content-location` = rule {
+    // we are bit more relaxed than the spec here by also parsing a potential fragment
+    // but catch it in the `Content-Location` instance validation (with a `require` in the constructor)
+    uriReference ~ EOI ~> (`Content-Location`(_))
+  }
+
   // http://tools.ietf.org/html/rfc7233#section-4.2
   def `content-range` = rule {
     (`byte-content-range` | `other-content-range`) ~ EOI ~> (`Content-Range`(_, _))

akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/headers.scala

@@ -436,6 +436,19 @@ final case class `Content-Length` private[http] (length: Long) extends jm.header
   protected def companion = `Content-Length`
 }
 
+// https://tools.ietf.org/html/rfc7231#section-3.1.4.2
+object `Content-Location` extends ModeledCompanion[`Content-Location`]
+final case class `Content-Location`(uri: Uri) extends jm.headers.ContentLocation with ResponseHeader {
+  require(uri.fragment.isEmpty, "Content-Location header URI must not contain a fragment")
+  require(uri.authority.userinfo.isEmpty, "Content-Location header URI must not contain a userinfo component")
+
+  def renderValue[R <: Rendering](r: R): r.type = { import UriRendering.UriRenderer; r ~~ uri }
+  protected def companion = `Content-Location`
+
+  /** Java API */
+  def getUri: akka.http.javadsl.model.Uri = uri.asJava
+}
+
 /**
  * Document http://tools.ietf.org/html/rfc6266 updates document https://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html. Between these
  * two there is slight but important difference regarding how parameter values are formatted. In RFC6266 parameters values are without quotes and

akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala

@@ -208,6 +208,14 @@ class HttpHeaderSpec extends FreeSpec with Matchers {
         .renderedTo("999999999999999999")
     }
 
+    "Content-Location" in {
+      "Content-Location: https://spray.io/secure" =!= `Content-Location`(Uri("https://spray.io/secure"))
+      "Content-Location: /en-us/default.aspx?foo=bar" =!= `Content-Location`(Uri("/en-us/default.aspx?foo=bar"))
+      "Content-Location: https://akka.io/#sec" =!= ErrorInfo(
+        "Illegal HTTP header 'Content-Location': requirement failed",
+        "Content-Location header URI must not contain a fragment")
+    }
+
     "Content-Type" in {
       "Content-Type: application/pdf" =!=
         `Content-Type`(`application/pdf`)