diff --git a/akka-http-core/src/main/java/akka/http/model/japi/Host.java b/akka-http-core/src/main/java/akka/http/model/japi/Host.java index b00387286b..d225a9fdba 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/Host.java +++ b/akka-http-core/src/main/java/akka/http/model/japi/Host.java @@ -34,7 +34,7 @@ public abstract class Host { /** * The constant representing an empty Host. */ - public static final Host EMPTY = akka.http.model.Uri.getHostEmpty(); + public static final Host EMPTY = akka.http.model.Uri$Host$Empty$.MODULE$; /** * Parse the given Host string using the default charset and parsing-mode. diff --git a/akka-http-core/src/main/java/akka/http/model/japi/Uri.java b/akka-http-core/src/main/java/akka/http/model/japi/Uri.java index e57f2f23ad..5960aa887d 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/Uri.java +++ b/akka-http-core/src/main/java/akka/http/model/japi/Uri.java @@ -156,9 +156,9 @@ public abstract class Uri { */ public abstract Uri fragment(Option fragment); - public static final akka.http.model.Uri.ParsingMode STRICT = akka.http.model.Uri.getParsingModeStrict(); - public static final akka.http.model.Uri.ParsingMode RELAXED = akka.http.model.Uri.getParsingModeRelaxed(); - public static final akka.http.model.Uri.ParsingMode RELAXED_WITH_RAW_QUERY = akka.http.model.Uri.getParsingModeRelaxedWithRawQuery(); + public static final akka.http.model.Uri.ParsingMode STRICT = akka.http.model.Uri$ParsingMode$Strict$.MODULE$; + public static final akka.http.model.Uri.ParsingMode RELAXED = akka.http.model.Uri$ParsingMode$Relaxed$.MODULE$; + public static final akka.http.model.Uri.ParsingMode RELAXED_WITH_RAW_QUERY = akka.http.model.Uri$ParsingMode$RelaxedWithRawQuery$.MODULE$; /** * Creates a default Uri to be modified using the modification methods. diff --git a/akka-http-core/src/main/scala/akka/http/model/Uri.scala b/akka-http-core/src/main/scala/akka/http/model/Uri.scala index fc98e5ced2..1e411eae3a 100644 --- a/akka-http-core/src/main/scala/akka/http/model/Uri.scala +++ b/akka-http-core/src/main/scala/akka/http/model/Uri.scala @@ -346,9 +346,6 @@ object Uri { def apply(address: Inet6Address): IPv6Host = IPv6Host(address.getAddress, address.getHostAddress) } - /** Java API */ - def getHostEmpty: Host = Host.Empty - sealed abstract class NonEmptyHost extends Host { def isEmpty = false def toOption = Some(this) @@ -600,13 +597,6 @@ object Uri { } } - /** Java API */ - def getParsingModeStrict: ParsingMode = ParsingMode.Strict - /** Java API */ - def getParsingModeRelaxed: ParsingMode = ParsingMode.Relaxed - /** Java API */ - def getParsingModeRelaxedWithRawQuery: ParsingMode = ParsingMode.RelaxedWithRawQuery - // http://tools.ietf.org/html/rfc3986#section-5.2.2 private[http] def resolve(scheme: String, userinfo: String, host: Host, port: Int, path: Path, query: Query, fragment: Option[String], base: Uri): Uri = {