diff --git a/akka-http-core/src/main/java/akka/http/model/japi/Util.java b/akka-http-core/src/main/java/akka/http/impl/util/Util.java similarity index 95% rename from akka-http-core/src/main/java/akka/http/model/japi/Util.java rename to akka-http-core/src/main/java/akka/http/impl/util/Util.java index d03e50d3f4..3c0d8b06b8 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/Util.java +++ b/akka-http-core/src/main/java/akka/http/impl/util/Util.java @@ -2,9 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.impl.util; -import akka.http.util.ObjectRegistry; +import akka.http.impl.model.JavaUri; +import akka.http.javadsl.model.Uri; import akka.japi.Option; import scala.None$; import scala.collection.immutable.Map$; @@ -61,7 +62,7 @@ public abstract class Util { return Util.convertIterable(Arrays.asList(els)); } - public static akka.http.model.Uri convertUriToScala(Uri uri) { + public static akka.http.scaladsl.model.Uri convertUriToScala(Uri uri) { return ((JavaUri) uri).uri(); } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/BodyPartEntity.java b/akka-http-core/src/main/java/akka/http/javadsl/model/BodyPartEntity.java similarity index 86% rename from akka-http-core/src/main/java/akka/http/model/japi/BodyPartEntity.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/BodyPartEntity.java index 791983fa43..50349b6661 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/BodyPartEntity.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/BodyPartEntity.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** Marker-interface for entity types that can be used in a body part */ public interface BodyPartEntity extends HttpEntity {} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/ChunkStreamPart.java b/akka-http-core/src/main/java/akka/http/javadsl/model/ChunkStreamPart.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/ChunkStreamPart.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/ChunkStreamPart.java index ace0b4817d..0593af6e56 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/ChunkStreamPart.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/ChunkStreamPart.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.util.ByteString; diff --git a/akka-http-core/src/main/java/akka/http/model/japi/ContentRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/ContentRange.java similarity index 83% rename from akka-http-core/src/main/java/akka/http/model/japi/ContentRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/ContentRange.java index d1b031c79a..26d5ecc1ef 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/ContentRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/ContentRange.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; -import akka.http.model.ContentRange$; +import akka.http.scaladsl.model.ContentRange$; import akka.japi.Option; public abstract class ContentRange { @@ -30,9 +30,9 @@ public abstract class ContentRange { return ContentRange$.MODULE$.apply(first, last, ((Option) (Option) instanceLength).asScala()); } public static ContentRange createUnsatisfiable(long length) { - return new akka.http.model.ContentRange.Unsatisfiable(length); + return new akka.http.scaladsl.model.ContentRange.Unsatisfiable(length); } public static ContentRange createOther(String value) { - return new akka.http.model.ContentRange.Other(value); + return new akka.http.scaladsl.model.ContentRange.Other(value); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/ContentType.java b/akka-http-core/src/main/java/akka/http/javadsl/model/ContentType.java similarity index 76% rename from akka-http-core/src/main/java/akka/http/model/japi/ContentType.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/ContentType.java index c8b3bbb5c0..b6178c88d1 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/ContentType.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/ContentType.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.japi.Option; @@ -29,13 +29,13 @@ public abstract class ContentType { * Creates a content-type from a media-type and a charset. */ public static ContentType create(MediaType mediaType, HttpCharset charset) { - return akka.http.model.ContentType.apply((akka.http.model.MediaType) mediaType, (akka.http.model.HttpCharset) charset); + return akka.http.scaladsl.model.ContentType.apply((akka.http.scaladsl.model.MediaType) mediaType, (akka.http.scaladsl.model.HttpCharset) charset); } /** * Creates a content-type from a media-type without specifying a charset. */ public static ContentType create(MediaType mediaType) { - return akka.http.model.ContentType.apply((akka.http.model.MediaType) mediaType); + return akka.http.scaladsl.model.ContentType.apply((akka.http.scaladsl.model.MediaType) mediaType); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/DateTime.java b/akka-http-core/src/main/java/akka/http/javadsl/model/DateTime.java similarity index 88% rename from akka-http-core/src/main/java/akka/http/model/japi/DateTime.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/DateTime.java index 87468f92da..a1a8277a1d 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/DateTime.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/DateTime.java @@ -2,9 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.japi.Option; +import akka.http.impl.util.Util; /** * Immutable, fast and efficient Date + Time implementation without any dependencies. @@ -93,7 +94,7 @@ public abstract class DateTime { * Returns a new DateTime instance representing the current instant. */ public static DateTime now() { - return akka.http.util.DateTime.now(); + return akka.http.scaladsl.model.DateTime.now(); } /** @@ -101,7 +102,7 @@ public abstract class DateTime { * parsing has failed. */ public static Option fromIsoDateTimeString(String isoDateTimeString) { - return Util.convertOption(akka.http.util.DateTime.fromIsoDateTimeString(isoDateTimeString)); + return Util.convertOption(akka.http.scaladsl.model.DateTime.fromIsoDateTimeString(isoDateTimeString)); } /** @@ -111,13 +112,13 @@ public abstract class DateTime { * Note that this implementation discards milliseconds (i.e. rounds down to full seconds). */ public static DateTime create(long clicks) { - return akka.http.util.DateTime.apply(clicks); + return akka.http.scaladsl.model.DateTime.apply(clicks); } /** * Returns a new DateTime instance by interpreting the given date/time components as an instant in GMT. */ public static DateTime create(int year, int month, int day, int hour, int minute, int second) { - return akka.http.util.DateTime.apply(year, month, day, hour, minute, second); + return akka.http.scaladsl.model.DateTime.apply(year, month, day, hour, minute, second); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/Host.java b/akka-http-core/src/main/java/akka/http/javadsl/model/Host.java similarity index 93% rename from akka-http-core/src/main/java/akka/http/model/japi/Host.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/Host.java index 8f5bbadc9e..bdfc094965 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/Host.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/Host.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; -import akka.http.model.Uri; -import akka.http.model.UriJavaAccessor; +import akka.http.scaladsl.model.Uri; +import akka.http.scaladsl.model.UriJavaAccessor; import java.net.InetAddress; import java.nio.charset.Charset; diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharset.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharset.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpCharset.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharset.java index 52e705005d..5b8e38740c 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharset.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharset.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents a charset in Http. See {@link HttpCharsets} for a set of predefined charsets and diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsetRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsetRange.java similarity index 95% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpCharsetRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsetRange.java index 85fb4d8d3d..6dd777c9b5 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsetRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsetRange.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an Http charset range. This can either be `*` which matches all charsets or a specific diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsetRanges.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsetRanges.java similarity index 68% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpCharsetRanges.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsetRanges.java index 76b4b3a678..98a78a20f6 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsetRanges.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsetRanges.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Contains constructors to create a HttpCharsetRange. @@ -13,5 +13,5 @@ public final class HttpCharsetRanges { /** * A constant representing the range that matches all charsets. */ - public static final HttpCharsetRange ALL = akka.http.model.HttpCharsetRange.$times$.MODULE$; + public static final HttpCharsetRange ALL = akka.http.scaladsl.model.HttpCharsetRange.$times$.MODULE$; } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsets.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsets.java new file mode 100644 index 0000000000..d6eac41a16 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpCharsets.java @@ -0,0 +1,37 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +import akka.http.impl.util.Util; +import akka.http.scaladsl.model.HttpCharsets$; +import akka.japi.Option; + +/** + * Contains a set of predefined charsets. + */ +public final class HttpCharsets { + private HttpCharsets() {} + + public static final HttpCharset US_ASCII = akka.http.scaladsl.model.HttpCharsets.US$minusASCII(); + public static final HttpCharset ISO_8859_1 = akka.http.scaladsl.model.HttpCharsets.ISO$minus8859$minus1(); + public static final HttpCharset UTF_8 = akka.http.scaladsl.model.HttpCharsets.UTF$minus8(); + public static final HttpCharset UTF_16 = akka.http.scaladsl.model.HttpCharsets.UTF$minus16(); + public static final HttpCharset UTF_16BE = akka.http.scaladsl.model.HttpCharsets.UTF$minus16BE(); + public static final HttpCharset UTF_16LE = akka.http.scaladsl.model.HttpCharsets.UTF$minus16LE(); + + /** + * Create and return a custom charset. + */ + public static HttpCharset custom(String value, String... aliases) { + return akka.http.scaladsl.model.HttpCharset.custom(value, Util.convertArray(aliases)); + } + + /** + * Returns Some(charset) if the charset with the given name was found and None otherwise. + */ + public static Option lookup(String name) { + return Util.lookupInRegistry(HttpCharsets$.MODULE$, name); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntities.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntities.java similarity index 59% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntities.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntities.java index e3d9ce49a4..2a3e67f81a 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntities.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntities.java @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import java.io.File; import akka.util.ByteString; import akka.stream.javadsl.Source; -import akka.http.model.HttpEntity$; +import akka.http.scaladsl.model.HttpEntity$; /** Constructors for HttpEntity instances */ public final class HttpEntities { @@ -27,36 +27,36 @@ public final class HttpEntities { } public static HttpEntityStrict create(ContentType contentType, String string) { - return HttpEntity$.MODULE$.apply((akka.http.model.ContentType) contentType, string); + return HttpEntity$.MODULE$.apply((akka.http.scaladsl.model.ContentType) contentType, string); } public static HttpEntityStrict create(ContentType contentType, byte[] bytes) { - return HttpEntity$.MODULE$.apply((akka.http.model.ContentType) contentType, bytes); + return HttpEntity$.MODULE$.apply((akka.http.scaladsl.model.ContentType) contentType, bytes); } public static HttpEntityStrict create(ContentType contentType, ByteString bytes) { - return HttpEntity$.MODULE$.apply((akka.http.model.ContentType) contentType, bytes); + return HttpEntity$.MODULE$.apply((akka.http.scaladsl.model.ContentType) contentType, bytes); } public static UniversalEntity create(ContentType contentType, File file) { - return HttpEntity$.MODULE$.apply((akka.http.model.ContentType) contentType, file); + return HttpEntity$.MODULE$.apply((akka.http.scaladsl.model.ContentType) contentType, file); } public static HttpEntityDefault create(ContentType contentType, long contentLength, Source data) { - return new akka.http.model.HttpEntity.Default((akka.http.model.ContentType) contentType, contentLength, data.asScala()); + return new akka.http.scaladsl.model.HttpEntity.Default((akka.http.scaladsl.model.ContentType) contentType, contentLength, data.asScala()); } public static HttpEntityCloseDelimited createCloseDelimited(ContentType contentType, Source data) { - return new akka.http.model.HttpEntity.CloseDelimited((akka.http.model.ContentType) contentType, data.asScala()); + return new akka.http.scaladsl.model.HttpEntity.CloseDelimited((akka.http.scaladsl.model.ContentType) contentType, data.asScala()); } public static HttpEntityIndefiniteLength createIndefiniteLength(ContentType contentType, Source data) { - return new akka.http.model.HttpEntity.IndefiniteLength((akka.http.model.ContentType) contentType, data.asScala()); + return new akka.http.scaladsl.model.HttpEntity.IndefiniteLength((akka.http.scaladsl.model.ContentType) contentType, data.asScala()); } public static HttpEntityChunked createChunked(ContentType contentType, Source data) { - return akka.http.model.HttpEntity.Chunked$.MODULE$.fromData( - (akka.http.model.ContentType) contentType, + return akka.http.scaladsl.model.HttpEntity.Chunked$.MODULE$.fromData( + (akka.http.scaladsl.model.ContentType) contentType, data.asScala()); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntity.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntity.java similarity index 97% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntity.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntity.java index 75361129b1..4b750e3d0e 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntity.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntity.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; -import akka.http.model.HttpEntity$; +import akka.http.scaladsl.model.HttpEntity$; import akka.stream.javadsl.Source; import akka.util.ByteString; diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityChunked.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityChunked.java similarity index 92% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntityChunked.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityChunked.java index a506353e86..bb35028801 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityChunked.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityChunked.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.stream.javadsl.Source; diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityCloseDelimited.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityCloseDelimited.java similarity index 91% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntityCloseDelimited.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityCloseDelimited.java index 40913ad811..6357ee5470 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityCloseDelimited.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityCloseDelimited.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an entity without a predetermined content-length. Its length is implicitly diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityDefault.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityDefault.java similarity index 90% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntityDefault.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityDefault.java index aa18204371..94f8f981ad 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityDefault.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityDefault.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * The default entity type which has a predetermined length and a stream of data bytes. diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityIndefiniteLength.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityIndefiniteLength.java similarity index 88% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntityIndefiniteLength.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityIndefiniteLength.java index 7b37b7bc5c..5f75d02159 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityIndefiniteLength.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityIndefiniteLength.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an entity without a predetermined content-length to use in a BodyParts. diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityStrict.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityStrict.java similarity index 90% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpEntityStrict.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityStrict.java index 711a7a7666..58d67951c1 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpEntityStrict.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpEntityStrict.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.util.ByteString; diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpHeader.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpHeader.java similarity index 90% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpHeader.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpHeader.java index f55dafdc8b..666dec3c87 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpHeader.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpHeader.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * The base type representing Http headers. All actual header values will be instances * of one of the subtypes defined in the `headers` packages. Unknown headers will be subtypes - * of {@link akka.http.model.japi.headers.RawHeader}. + * of {@link akka.http.javadsl.model.headers.RawHeader}. */ public abstract class HttpHeader { /** diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpMessage.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMessage.java similarity index 98% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpMessage.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpMessage.java index 1c129f6dea..6493b7bad4 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpMessage.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMessage.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.japi.Option; import akka.util.ByteString; diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpMethod.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMethod.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpMethod.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpMethod.java index a40085a624..314a23c63a 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpMethod.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMethod.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an HTTP request method. See {@link HttpMethods} for a set of predefined methods diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMethods.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMethods.java new file mode 100644 index 0000000000..859250876f --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpMethods.java @@ -0,0 +1,40 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +import akka.http.impl.util.Util; +import akka.japi.Option; +import akka.http.scaladsl.model.HttpMethods$; + +/** + * Contains static constants for predefined method types. + */ +public final class HttpMethods { + private HttpMethods() {} + + public static final HttpMethod CONNECT = akka.http.scaladsl.model.HttpMethods.CONNECT(); + public static final HttpMethod DELETE = akka.http.scaladsl.model.HttpMethods.DELETE(); + public static final HttpMethod GET = akka.http.scaladsl.model.HttpMethods.GET(); + public static final HttpMethod HEAD = akka.http.scaladsl.model.HttpMethods.HEAD(); + public static final HttpMethod OPTIONS = akka.http.scaladsl.model.HttpMethods.OPTIONS(); + public static final HttpMethod PATCH = akka.http.scaladsl.model.HttpMethods.PATCH(); + public static final HttpMethod POST = akka.http.scaladsl.model.HttpMethods.POST(); + public static final HttpMethod PUT = akka.http.scaladsl.model.HttpMethods.PUT(); + public static final HttpMethod TRACE = akka.http.scaladsl.model.HttpMethods.TRACE(); + + /** + * Create a custom method type. + */ + public static HttpMethod custom(String value, boolean safe, boolean idempotent, boolean entityAccepted) { + return akka.http.scaladsl.model.HttpMethod.custom(value, safe, idempotent, entityAccepted); + } + + /** + * Looks up a predefined HTTP method with the given name. + */ + public static Option lookup(String name) { + return Util.lookupInRegistry(HttpMethods$.MODULE$, name); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpProtocol.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpProtocol.java similarity index 92% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpProtocol.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpProtocol.java index 2d0a56d52d..e8c358d5ad 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpProtocol.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpProtocol.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an Http protocol (currently only HTTP/1.0 or HTTP/1.1). See {@link HttpProtocols} diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/HttpProtocols.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpProtocols.java new file mode 100644 index 0000000000..a1704f300a --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpProtocols.java @@ -0,0 +1,15 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +/** + * Contains constants of the supported Http protocols. + */ +public final class HttpProtocols { + private HttpProtocols() {} + + final HttpProtocol HTTP_1_0 = akka.http.scaladsl.model.HttpProtocols.HTTP$div1$u002E0(); + final HttpProtocol HTTP_1_1 = akka.http.scaladsl.model.HttpProtocols.HTTP$div1$u002E1(); +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpRequest.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpRequest.java similarity index 98% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpRequest.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpRequest.java index 5fc3a74a59..36c6d3c384 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpRequest.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpRequest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an Http request. diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpResponse.java b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpResponse.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/HttpResponse.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/HttpResponse.java index 16250cbdac..7cc92e42e9 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpResponse.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/HttpResponse.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an Http response. diff --git a/akka-http-core/src/main/java/akka/http/model/japi/MediaRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaRange.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/MediaRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/MediaRange.java index 30d576ed5d..2a0f121f20 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/MediaRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaRange.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import java.util.Map; diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/MediaRanges.java b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaRanges.java new file mode 100644 index 0000000000..dece75e105 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaRanges.java @@ -0,0 +1,46 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +import akka.http.impl.util.Util; + +import java.util.Map; + +/** + * Contains a set of predefined media-ranges and static methods to create custom ones. + */ +public final class MediaRanges { + private MediaRanges() {} + + public static final MediaRange ALL = akka.http.scaladsl.model.MediaRanges.$times$div$times(); + public static final MediaRange ALL_APPLICATION = akka.http.scaladsl.model.MediaRanges.application$div$times(); + public static final MediaRange ALL_AUDIO = akka.http.scaladsl.model.MediaRanges.audio$div$times(); + public static final MediaRange ALL_IMAGE = akka.http.scaladsl.model.MediaRanges.image$div$times(); + public static final MediaRange ALL_MESSAGE = akka.http.scaladsl.model.MediaRanges.message$div$times(); + public static final MediaRange ALL_MULTIPART = akka.http.scaladsl.model.MediaRanges.multipart$div$times(); + public static final MediaRange ALL_TEXT = akka.http.scaladsl.model.MediaRanges.text$div$times(); + public static final MediaRange ALL_VIDEO = akka.http.scaladsl.model.MediaRanges.video$div$times(); + + /** + * Creates a custom universal media-range for a given main-type. + */ + public static MediaRange create(MediaType mediaType) { + return akka.http.scaladsl.model.MediaRange.apply((akka.http.scaladsl.model.MediaType) mediaType); + } + + /** + * Creates a custom universal media-range for a given main-type and a Map of parameters. + */ + public static MediaRange custom(String mainType, Map parameters) { + return akka.http.scaladsl.model.MediaRange.custom(mainType, Util.convertMapToScala(parameters), 1.0f); + } + + /** + * Creates a custom universal media-range for a given main-type and qValue. + */ + public static MediaRange create(MediaType mediaType, float qValue) { + return akka.http.scaladsl.model.MediaRange.apply((akka.http.scaladsl.model.MediaType) mediaType, qValue); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/MediaType.java b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaType.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/MediaType.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/MediaType.java index 922f12f08f..25a6e0aba1 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/MediaType.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaType.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an Http media-type. A media-type consists of a main-type and a sub-type. diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/MediaTypes.java b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaTypes.java new file mode 100644 index 0000000000..f1d5caefd3 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/MediaTypes.java @@ -0,0 +1,201 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +import akka.http.impl.util.Util; +import akka.http.scaladsl.model.MediaTypes$; +import akka.japi.Option; + +import java.util.Map; + +/** + * Contains the set of predefined media-types. + */ +public abstract class MediaTypes { + public static final MediaType APPLICATION_ATOM_XML = akka.http.scaladsl.model.MediaTypes.application$divatom$plusxml(); + public static final MediaType APPLICATION_BASE64 = akka.http.scaladsl.model.MediaTypes.application$divbase64(); + public static final MediaType APPLICATION_EXCEL = akka.http.scaladsl.model.MediaTypes.application$divexcel(); + public static final MediaType APPLICATION_FONT_WOFF = akka.http.scaladsl.model.MediaTypes.application$divfont$minuswoff(); + public static final MediaType APPLICATION_GNUTAR = akka.http.scaladsl.model.MediaTypes.application$divgnutar(); + public static final MediaType APPLICATION_JAVA_ARCHIVE = akka.http.scaladsl.model.MediaTypes.application$divjava$minusarchive(); + public static final MediaType APPLICATION_JAVASCRIPT = akka.http.scaladsl.model.MediaTypes.application$divjavascript(); + public static final MediaType APPLICATION_JSON = akka.http.scaladsl.model.MediaTypes.application$divjson(); + public static final MediaType APPLICATION_JSON_PATCH_JSON = akka.http.scaladsl.model.MediaTypes.application$divjson$minuspatch$plusjson(); + public static final MediaType APPLICATION_LHA = akka.http.scaladsl.model.MediaTypes.application$divlha(); + public static final MediaType APPLICATION_LZX = akka.http.scaladsl.model.MediaTypes.application$divlzx(); + public static final MediaType APPLICATION_MSPOWERPOINT = akka.http.scaladsl.model.MediaTypes.application$divmspowerpoint(); + public static final MediaType APPLICATION_MSWORD = akka.http.scaladsl.model.MediaTypes.application$divmsword(); + public static final MediaType APPLICATION_OCTET_STREAM = akka.http.scaladsl.model.MediaTypes.application$divoctet$minusstream(); + public static final MediaType APPLICATION_PDF = akka.http.scaladsl.model.MediaTypes.application$divpdf(); + public static final MediaType APPLICATION_POSTSCRIPT = akka.http.scaladsl.model.MediaTypes.application$divpostscript(); + public static final MediaType APPLICATION_RSS_XML = akka.http.scaladsl.model.MediaTypes.application$divrss$plusxml(); + public static final MediaType APPLICATION_SOAP_XML = akka.http.scaladsl.model.MediaTypes.application$divsoap$plusxml(); + public static final MediaType APPLICATION_VND_API_JSON = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eapi$plusjson(); + public static final MediaType APPLICATION_VND_GOOGLE_EARTH_KML_XML = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Egoogle$minusearth$u002Ekml$plusxml(); + public static final MediaType APPLICATION_VND_GOOGLE_EARTH_KMZ = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Egoogle$minusearth$u002Ekmz(); + public static final MediaType APPLICATION_VND_MS_FONTOBJECT = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Ems$minusfontobject(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_CHART = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Echart(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_DATABASE = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Edatabase(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_FORMULA = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Eformula(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_GRAPHICS = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Egraphics(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_IMAGE = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Eimage(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_PRESENTATION = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Epresentation(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_SPREADSHEET = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Espreadsheet(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Etext(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_MASTER = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Etext$minusmaster(); + public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_WEB = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Etext$minusweb(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_PRESENTATION = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Epresentation(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_SLIDE = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Eslide(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_SLIDESHOW = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Eslideshow(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_TEMPLATE = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Etemplate(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_SPREADSHEETML_SHEET = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Espreadsheetml$u002Esheet(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_SPREADSHEETML_TEMPLATE = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Espreadsheetml$u002Etemplate(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_WORDPROCESSINGML_DOCUMENT = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Ewordprocessingml$u002Edocument(); + public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_WORDPROCESSINGML_TEMPLATE = akka.http.scaladsl.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Ewordprocessingml$u002Etemplate(); + public static final MediaType APPLICATION_X_7Z_COMPRESSED = akka.http.scaladsl.model.MediaTypes.application$divx$minus7z$minuscompressed(); + public static final MediaType APPLICATION_X_ACE_COMPRESSED = akka.http.scaladsl.model.MediaTypes.application$divx$minusace$minuscompressed(); + public static final MediaType APPLICATION_X_APPLE_DISKIMAGE = akka.http.scaladsl.model.MediaTypes.application$divx$minusapple$minusdiskimage(); + public static final MediaType APPLICATION_X_ARC_COMPRESSED = akka.http.scaladsl.model.MediaTypes.application$divx$minusarc$minuscompressed(); + public static final MediaType APPLICATION_X_BZIP = akka.http.scaladsl.model.MediaTypes.application$divx$minusbzip(); + public static final MediaType APPLICATION_X_BZIP2 = akka.http.scaladsl.model.MediaTypes.application$divx$minusbzip2(); + public static final MediaType APPLICATION_X_CHROME_EXTENSION = akka.http.scaladsl.model.MediaTypes.application$divx$minuschrome$minusextension(); + public static final MediaType APPLICATION_X_COMPRESS = akka.http.scaladsl.model.MediaTypes.application$divx$minuscompress(); + public static final MediaType APPLICATION_X_COMPRESSED = akka.http.scaladsl.model.MediaTypes.application$divx$minuscompressed(); + public static final MediaType APPLICATION_X_DEBIAN_PACKAGE = akka.http.scaladsl.model.MediaTypes.application$divx$minusdebian$minuspackage(); + public static final MediaType APPLICATION_X_DVI = akka.http.scaladsl.model.MediaTypes.application$divx$minusdvi(); + public static final MediaType APPLICATION_X_FONT_TRUETYPE = akka.http.scaladsl.model.MediaTypes.application$divx$minusfont$minustruetype(); + public static final MediaType APPLICATION_X_FONT_OPENTYPE = akka.http.scaladsl.model.MediaTypes.application$divx$minusfont$minusopentype(); + public static final MediaType APPLICATION_X_GTAR = akka.http.scaladsl.model.MediaTypes.application$divx$minusgtar(); + public static final MediaType APPLICATION_X_GZIP = akka.http.scaladsl.model.MediaTypes.application$divx$minusgzip(); + public static final MediaType APPLICATION_X_LATEX = akka.http.scaladsl.model.MediaTypes.application$divx$minuslatex(); + public static final MediaType APPLICATION_X_RAR_COMPRESSED = akka.http.scaladsl.model.MediaTypes.application$divx$minusrar$minuscompressed(); + public static final MediaType APPLICATION_X_REDHAT_PACKAGE_MANAGER = akka.http.scaladsl.model.MediaTypes.application$divx$minusredhat$minuspackage$minusmanager(); + public static final MediaType APPLICATION_X_SHOCKWAVE_FLASH = akka.http.scaladsl.model.MediaTypes.application$divx$minusshockwave$minusflash(); + public static final MediaType APPLICATION_X_TAR = akka.http.scaladsl.model.MediaTypes.application$divx$minustar(); + public static final MediaType APPLICATION_X_TEX = akka.http.scaladsl.model.MediaTypes.application$divx$minustex(); + public static final MediaType APPLICATION_X_TEXINFO = akka.http.scaladsl.model.MediaTypes.application$divx$minustexinfo(); + public static final MediaType APPLICATION_X_VRML = akka.http.scaladsl.model.MediaTypes.application$divx$minusvrml(); + public static final MediaType APPLICATION_X_WWW_FORM_URLENCODED = akka.http.scaladsl.model.MediaTypes.application$divx$minuswww$minusform$minusurlencoded(); + public static final MediaType APPLICATION_X_X509_CA_CERT = akka.http.scaladsl.model.MediaTypes.application$divx$minusx509$minusca$minuscert(); + public static final MediaType APPLICATION_X_XPINSTALL = akka.http.scaladsl.model.MediaTypes.application$divx$minusxpinstall(); + public static final MediaType APPLICATION_XHTML_XML = akka.http.scaladsl.model.MediaTypes.application$divxhtml$plusxml(); + public static final MediaType APPLICATION_XML_DTD = akka.http.scaladsl.model.MediaTypes.application$divxml$minusdtd(); + public static final MediaType APPLICATION_XML = akka.http.scaladsl.model.MediaTypes.application$divxml(); + public static final MediaType APPLICATION_ZIP = akka.http.scaladsl.model.MediaTypes.application$divzip(); + public static final MediaType AUDIO_AIFF = akka.http.scaladsl.model.MediaTypes.audio$divaiff(); + public static final MediaType AUDIO_BASIC = akka.http.scaladsl.model.MediaTypes.audio$divbasic(); + public static final MediaType AUDIO_MIDI = akka.http.scaladsl.model.MediaTypes.audio$divmidi(); + public static final MediaType AUDIO_MOD = akka.http.scaladsl.model.MediaTypes.audio$divmod(); + public static final MediaType AUDIO_MPEG = akka.http.scaladsl.model.MediaTypes.audio$divmpeg(); + public static final MediaType AUDIO_OGG = akka.http.scaladsl.model.MediaTypes.audio$divogg(); + public static final MediaType AUDIO_VOC = akka.http.scaladsl.model.MediaTypes.audio$divvoc(); + public static final MediaType AUDIO_VORBIS = akka.http.scaladsl.model.MediaTypes.audio$divvorbis(); + public static final MediaType AUDIO_VOXWARE = akka.http.scaladsl.model.MediaTypes.audio$divvoxware(); + public static final MediaType AUDIO_WAV = akka.http.scaladsl.model.MediaTypes.audio$divwav(); + public static final MediaType AUDIO_X_REALAUDIO = akka.http.scaladsl.model.MediaTypes.audio$divx$minusrealaudio(); + public static final MediaType AUDIO_X_PSID = akka.http.scaladsl.model.MediaTypes.audio$divx$minuspsid(); + public static final MediaType AUDIO_XM = akka.http.scaladsl.model.MediaTypes.audio$divxm(); + public static final MediaType AUDIO_WEBM = akka.http.scaladsl.model.MediaTypes.audio$divwebm(); + public static final MediaType IMAGE_GIF = akka.http.scaladsl.model.MediaTypes.image$divgif(); + public static final MediaType IMAGE_JPEG = akka.http.scaladsl.model.MediaTypes.image$divjpeg(); + public static final MediaType IMAGE_PICT = akka.http.scaladsl.model.MediaTypes.image$divpict(); + public static final MediaType IMAGE_PNG = akka.http.scaladsl.model.MediaTypes.image$divpng(); + public static final MediaType IMAGE_SVG_XML = akka.http.scaladsl.model.MediaTypes.image$divsvg$plusxml(); + public static final MediaType IMAGE_TIFF = akka.http.scaladsl.model.MediaTypes.image$divtiff(); + public static final MediaType IMAGE_X_ICON = akka.http.scaladsl.model.MediaTypes.image$divx$minusicon(); + public static final MediaType IMAGE_X_MS_BMP = akka.http.scaladsl.model.MediaTypes.image$divx$minusms$minusbmp(); + public static final MediaType IMAGE_X_PCX = akka.http.scaladsl.model.MediaTypes.image$divx$minuspcx(); + public static final MediaType IMAGE_X_PICT = akka.http.scaladsl.model.MediaTypes.image$divx$minuspict(); + public static final MediaType IMAGE_X_QUICKTIME = akka.http.scaladsl.model.MediaTypes.image$divx$minusquicktime(); + public static final MediaType IMAGE_X_RGB = akka.http.scaladsl.model.MediaTypes.image$divx$minusrgb(); + public static final MediaType IMAGE_X_XBITMAP = akka.http.scaladsl.model.MediaTypes.image$divx$minusxbitmap(); + public static final MediaType IMAGE_X_XPIXMAP = akka.http.scaladsl.model.MediaTypes.image$divx$minusxpixmap(); + public static final MediaType IMAGE_WEBP = akka.http.scaladsl.model.MediaTypes.image$divwebp(); + public static final MediaType MESSAGE_HTTP = akka.http.scaladsl.model.MediaTypes.message$divhttp(); + public static final MediaType MESSAGE_DELIVERY_STATUS = akka.http.scaladsl.model.MediaTypes.message$divdelivery$minusstatus(); + public static final MediaType MESSAGE_RFC822 = akka.http.scaladsl.model.MediaTypes.message$divrfc822(); + public static final MediaType MULTIPART_MIXED = akka.http.scaladsl.model.MediaTypes.multipart$divmixed(); + public static final MediaType MULTIPART_ALTERNATIVE = akka.http.scaladsl.model.MediaTypes.multipart$divalternative(); + public static final MediaType MULTIPART_RELATED = akka.http.scaladsl.model.MediaTypes.multipart$divrelated(); + public static final MediaType MULTIPART_FORM_DATA = akka.http.scaladsl.model.MediaTypes.multipart$divform$minusdata(); + public static final MediaType MULTIPART_SIGNED = akka.http.scaladsl.model.MediaTypes.multipart$divsigned(); + public static final MediaType MULTIPART_ENCRYPTED = akka.http.scaladsl.model.MediaTypes.multipart$divencrypted(); + public static final MediaType MULTIPART_BYTERANGES = akka.http.scaladsl.model.MediaTypes.multipart$divbyteranges(); + public static final MediaType TEXT_ASP = akka.http.scaladsl.model.MediaTypes.text$divasp(); + public static final MediaType TEXT_CACHE_MANIFEST = akka.http.scaladsl.model.MediaTypes.text$divcache$minusmanifest(); + public static final MediaType TEXT_CALENDAR = akka.http.scaladsl.model.MediaTypes.text$divcalendar(); + public static final MediaType TEXT_CSS = akka.http.scaladsl.model.MediaTypes.text$divcss(); + public static final MediaType TEXT_CSV = akka.http.scaladsl.model.MediaTypes.text$divcsv(); + public static final MediaType TEXT_HTML = akka.http.scaladsl.model.MediaTypes.text$divhtml(); + public static final MediaType TEXT_MCF = akka.http.scaladsl.model.MediaTypes.text$divmcf(); + public static final MediaType TEXT_PLAIN = akka.http.scaladsl.model.MediaTypes.text$divplain(); + public static final MediaType TEXT_RICHTEXT = akka.http.scaladsl.model.MediaTypes.text$divrichtext(); + public static final MediaType TEXT_TAB_SEPARATED_VALUES = akka.http.scaladsl.model.MediaTypes.text$divtab$minusseparated$minusvalues(); + public static final MediaType TEXT_URI_LIST = akka.http.scaladsl.model.MediaTypes.text$divuri$minuslist(); + public static final MediaType TEXT_VND_WAP_WML = akka.http.scaladsl.model.MediaTypes.text$divvnd$u002Ewap$u002Ewml(); + public static final MediaType TEXT_VND_WAP_WMLSCRIPT = akka.http.scaladsl.model.MediaTypes.text$divvnd$u002Ewap$u002Ewmlscript(); + public static final MediaType TEXT_X_ASM = akka.http.scaladsl.model.MediaTypes.text$divx$minusasm(); + public static final MediaType TEXT_X_C = akka.http.scaladsl.model.MediaTypes.text$divx$minusc(); + public static final MediaType TEXT_X_COMPONENT = akka.http.scaladsl.model.MediaTypes.text$divx$minuscomponent(); + public static final MediaType TEXT_X_H = akka.http.scaladsl.model.MediaTypes.text$divx$minush(); + public static final MediaType TEXT_X_JAVA_SOURCE = akka.http.scaladsl.model.MediaTypes.text$divx$minusjava$minussource(); + public static final MediaType TEXT_X_PASCAL = akka.http.scaladsl.model.MediaTypes.text$divx$minuspascal(); + public static final MediaType TEXT_X_SCRIPT = akka.http.scaladsl.model.MediaTypes.text$divx$minusscript(); + public static final MediaType TEXT_X_SCRIPTCSH = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptcsh(); + public static final MediaType TEXT_X_SCRIPTELISP = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptelisp(); + public static final MediaType TEXT_X_SCRIPTKSH = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptksh(); + public static final MediaType TEXT_X_SCRIPTLISP = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptlisp(); + public static final MediaType TEXT_X_SCRIPTPERL = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptperl(); + public static final MediaType TEXT_X_SCRIPTPERL_MODULE = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptperl$minusmodule(); + public static final MediaType TEXT_X_SCRIPTPHYTON = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptphyton(); + public static final MediaType TEXT_X_SCRIPTREXX = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptrexx(); + public static final MediaType TEXT_X_SCRIPTSCHEME = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptscheme(); + public static final MediaType TEXT_X_SCRIPTSH = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptsh(); + public static final MediaType TEXT_X_SCRIPTTCL = akka.http.scaladsl.model.MediaTypes.text$divx$minusscripttcl(); + public static final MediaType TEXT_X_SCRIPTTCSH = akka.http.scaladsl.model.MediaTypes.text$divx$minusscripttcsh(); + public static final MediaType TEXT_X_SCRIPTZSH = akka.http.scaladsl.model.MediaTypes.text$divx$minusscriptzsh(); + public static final MediaType TEXT_X_SERVER_PARSED_HTML = akka.http.scaladsl.model.MediaTypes.text$divx$minusserver$minusparsed$minushtml(); + public static final MediaType TEXT_X_SETEXT = akka.http.scaladsl.model.MediaTypes.text$divx$minussetext(); + public static final MediaType TEXT_X_SGML = akka.http.scaladsl.model.MediaTypes.text$divx$minussgml(); + public static final MediaType TEXT_X_SPEECH = akka.http.scaladsl.model.MediaTypes.text$divx$minusspeech(); + public static final MediaType TEXT_X_UUENCODE = akka.http.scaladsl.model.MediaTypes.text$divx$minusuuencode(); + public static final MediaType TEXT_X_VCALENDAR = akka.http.scaladsl.model.MediaTypes.text$divx$minusvcalendar(); + public static final MediaType TEXT_X_VCARD = akka.http.scaladsl.model.MediaTypes.text$divx$minusvcard(); + public static final MediaType TEXT_XML = akka.http.scaladsl.model.MediaTypes.text$divxml(); + public static final MediaType VIDEO_AVS_VIDEO = akka.http.scaladsl.model.MediaTypes.video$divavs$minusvideo(); + public static final MediaType VIDEO_DIVX = akka.http.scaladsl.model.MediaTypes.video$divdivx(); + public static final MediaType VIDEO_GL = akka.http.scaladsl.model.MediaTypes.video$divgl(); + public static final MediaType VIDEO_MP4 = akka.http.scaladsl.model.MediaTypes.video$divmp4(); + public static final MediaType VIDEO_MPEG = akka.http.scaladsl.model.MediaTypes.video$divmpeg(); + public static final MediaType VIDEO_OGG = akka.http.scaladsl.model.MediaTypes.video$divogg(); + public static final MediaType VIDEO_QUICKTIME = akka.http.scaladsl.model.MediaTypes.video$divquicktime(); + public static final MediaType VIDEO_X_DV = akka.http.scaladsl.model.MediaTypes.video$divx$minusdv(); + public static final MediaType VIDEO_X_FLV = akka.http.scaladsl.model.MediaTypes.video$divx$minusflv(); + public static final MediaType VIDEO_X_MOTION_JPEG = akka.http.scaladsl.model.MediaTypes.video$divx$minusmotion$minusjpeg(); + public static final MediaType VIDEO_X_MS_ASF = akka.http.scaladsl.model.MediaTypes.video$divx$minusms$minusasf(); + public static final MediaType VIDEO_X_MSVIDEO = akka.http.scaladsl.model.MediaTypes.video$divx$minusmsvideo(); + public static final MediaType VIDEO_X_SGI_MOVIE = akka.http.scaladsl.model.MediaTypes.video$divx$minussgi$minusmovie(); + public static final MediaType VIDEO_WEBM = akka.http.scaladsl.model.MediaTypes.video$divwebm(); + + /** + * Creates a custom media type. + */ + public static MediaType custom( + String mainType, + String subType, + boolean compressible, + akka.http.scaladsl.model.MediaType.Encoding encoding, + Iterable fileExtensions, + Map params) { + return akka.http.scaladsl.model.MediaType.custom(mainType, subType, encoding, compressible, Util.convertIterable(fileExtensions), Util.convertMapToScala(params), false); + } + + /** + * Looks up a media-type with the given main-type and sub-type. + */ + public static Option lookup(String mainType, String subType) { + return Util., MediaType, akka.http.scaladsl.model.MediaType>lookupInRegistry(MediaTypes$.MODULE$, new scala.Tuple2(mainType, subType)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/RemoteAddress.java b/akka-http-core/src/main/java/akka/http/javadsl/model/RemoteAddress.java similarity index 57% rename from akka-http-core/src/main/java/akka/http/model/japi/RemoteAddress.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/RemoteAddress.java index ef32317a74..c67b851b4a 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/RemoteAddress.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/RemoteAddress.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.japi.Option; @@ -13,14 +13,14 @@ public abstract class RemoteAddress { public abstract Option getAddress(); - public static final RemoteAddress UNKNOWN = akka.http.model.RemoteAddress.Unknown$.MODULE$; + public static final RemoteAddress UNKNOWN = akka.http.scaladsl.model.RemoteAddress.Unknown$.MODULE$; public static RemoteAddress create(InetAddress address) { - return akka.http.model.RemoteAddress.apply(address); + return akka.http.scaladsl.model.RemoteAddress.apply(address); } public static RemoteAddress create(String address) { - return akka.http.model.RemoteAddress.apply(address); + return akka.http.scaladsl.model.RemoteAddress.apply(address); } public static RemoteAddress create(byte[] address) { - return akka.http.model.RemoteAddress.apply(address); + return akka.http.scaladsl.model.RemoteAddress.apply(address); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/RequestEntity.java b/akka-http-core/src/main/java/akka/http/javadsl/model/RequestEntity.java similarity index 86% rename from akka-http-core/src/main/java/akka/http/model/japi/RequestEntity.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/RequestEntity.java index 3025f8c23b..e442b7e0ee 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/RequestEntity.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/RequestEntity.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** Marker-interface for entity types that can be used in a request */ public interface RequestEntity extends ResponseEntity {} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/ResponseEntity.java b/akka-http-core/src/main/java/akka/http/javadsl/model/ResponseEntity.java similarity index 85% rename from akka-http-core/src/main/java/akka/http/model/japi/ResponseEntity.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/ResponseEntity.java index dc9619ed17..877fab13d3 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/ResponseEntity.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/ResponseEntity.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** Marker-interface for entity types that can be used in a response */ public interface ResponseEntity extends HttpEntity {} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/StatusCode.java b/akka-http-core/src/main/java/akka/http/javadsl/model/StatusCode.java similarity index 96% rename from akka-http-core/src/main/java/akka/http/model/japi/StatusCode.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/StatusCode.java index d0ef2ec212..28dcb26e0b 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/StatusCode.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/StatusCode.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** * Represents an Http status-code and message. See {@link StatusCodes} for the set of predefined diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/StatusCodes.java b/akka-http-core/src/main/java/akka/http/javadsl/model/StatusCodes.java new file mode 100644 index 0000000000..74edbe89d0 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/StatusCodes.java @@ -0,0 +1,115 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +import akka.http.impl.util.Util; +import akka.http.scaladsl.model.StatusCodes$; +import akka.japi.Option; + +/** + * Contains the set of predefined status-codes along with static methods to access and create custom + * status-codes. + */ +public final class StatusCodes { + private StatusCodes() {} + + public static final StatusCode CONTINUE = akka.http.scaladsl.model.StatusCodes.Continue(); + public static final StatusCode SWITCHING_PROTOCOLS = akka.http.scaladsl.model.StatusCodes.SwitchingProtocols(); + public static final StatusCode PROCESSING = akka.http.scaladsl.model.StatusCodes.Processing(); + + public static final StatusCode OK = akka.http.scaladsl.model.StatusCodes.OK(); + public static final StatusCode CREATED = akka.http.scaladsl.model.StatusCodes.Created(); + public static final StatusCode ACCEPTED = akka.http.scaladsl.model.StatusCodes.Accepted(); + public static final StatusCode NON_AUTHORITATIVE_INFORMATION = akka.http.scaladsl.model.StatusCodes.NonAuthoritativeInformation(); + public static final StatusCode NO_CONTENT = akka.http.scaladsl.model.StatusCodes.NoContent(); + public static final StatusCode RESET_CONTENT = akka.http.scaladsl.model.StatusCodes.ResetContent(); + public static final StatusCode PARTIAL_CONTENT = akka.http.scaladsl.model.StatusCodes.PartialContent(); + public static final StatusCode MULTI_STATUS = akka.http.scaladsl.model.StatusCodes.MultiStatus(); + public static final StatusCode ALREADY_REPORTED = akka.http.scaladsl.model.StatusCodes.AlreadyReported(); + public static final StatusCode IMUSED = akka.http.scaladsl.model.StatusCodes.IMUsed(); + + public static final StatusCode MULTIPLE_CHOICES = akka.http.scaladsl.model.StatusCodes.MultipleChoices(); + public static final StatusCode MOVED_PERMANENTLY = akka.http.scaladsl.model.StatusCodes.MovedPermanently(); + public static final StatusCode FOUND = akka.http.scaladsl.model.StatusCodes.Found(); + public static final StatusCode SEE_OTHER = akka.http.scaladsl.model.StatusCodes.SeeOther(); + public static final StatusCode NOT_MODIFIED = akka.http.scaladsl.model.StatusCodes.NotModified(); + public static final StatusCode USE_PROXY = akka.http.scaladsl.model.StatusCodes.UseProxy(); + public static final StatusCode TEMPORARY_REDIRECT = akka.http.scaladsl.model.StatusCodes.TemporaryRedirect(); + public static final StatusCode PERMANENT_REDIRECT = akka.http.scaladsl.model.StatusCodes.PermanentRedirect(); + + public static final StatusCode BAD_REQUEST = akka.http.scaladsl.model.StatusCodes.BadRequest(); + public static final StatusCode UNAUTHORIZED = akka.http.scaladsl.model.StatusCodes.Unauthorized(); + public static final StatusCode PAYMENT_REQUIRED = akka.http.scaladsl.model.StatusCodes.PaymentRequired(); + public static final StatusCode FORBIDDEN = akka.http.scaladsl.model.StatusCodes.Forbidden(); + public static final StatusCode NOT_FOUND = akka.http.scaladsl.model.StatusCodes.NotFound(); + public static final StatusCode METHOD_NOT_ALLOWED = akka.http.scaladsl.model.StatusCodes.MethodNotAllowed(); + public static final StatusCode NOT_ACCEPTABLE = akka.http.scaladsl.model.StatusCodes.NotAcceptable(); + public static final StatusCode PROXY_AUTHENTICATION_REQUIRED = akka.http.scaladsl.model.StatusCodes.ProxyAuthenticationRequired(); + public static final StatusCode REQUEST_TIMEOUT = akka.http.scaladsl.model.StatusCodes.RequestTimeout(); + public static final StatusCode CONFLICT = akka.http.scaladsl.model.StatusCodes.Conflict(); + public static final StatusCode GONE = akka.http.scaladsl.model.StatusCodes.Gone(); + public static final StatusCode LENGTH_REQUIRED = akka.http.scaladsl.model.StatusCodes.LengthRequired(); + public static final StatusCode PRECONDITION_FAILED = akka.http.scaladsl.model.StatusCodes.PreconditionFailed(); + public static final StatusCode REQUEST_ENTITY_TOO_LARGE = akka.http.scaladsl.model.StatusCodes.RequestEntityTooLarge(); + public static final StatusCode REQUEST_URI_TOO_LONG = akka.http.scaladsl.model.StatusCodes.RequestUriTooLong(); + public static final StatusCode UNSUPPORTED_MEDIA_TYPE = akka.http.scaladsl.model.StatusCodes.UnsupportedMediaType(); + public static final StatusCode REQUESTED_RANGE_NOT_SATISFIABLE = akka.http.scaladsl.model.StatusCodes.RequestedRangeNotSatisfiable(); + public static final StatusCode EXPECTATION_FAILED = akka.http.scaladsl.model.StatusCodes.ExpectationFailed(); + public static final StatusCode ENHANCE_YOUR_CALM = akka.http.scaladsl.model.StatusCodes.EnhanceYourCalm(); + public static final StatusCode UNPROCESSABLE_ENTITY = akka.http.scaladsl.model.StatusCodes.UnprocessableEntity(); + public static final StatusCode LOCKED = akka.http.scaladsl.model.StatusCodes.Locked(); + public static final StatusCode FAILED_DEPENDENCY = akka.http.scaladsl.model.StatusCodes.FailedDependency(); + public static final StatusCode UNORDERED_COLLECTION = akka.http.scaladsl.model.StatusCodes.UnorderedCollection(); + public static final StatusCode UPGRADE_REQUIRED = akka.http.scaladsl.model.StatusCodes.UpgradeRequired(); + public static final StatusCode PRECONDITION_REQUIRED = akka.http.scaladsl.model.StatusCodes.PreconditionRequired(); + public static final StatusCode TOO_MANY_REQUESTS = akka.http.scaladsl.model.StatusCodes.TooManyRequests(); + public static final StatusCode REQUEST_HEADER_FIELDS_TOO_LARGE = akka.http.scaladsl.model.StatusCodes.RequestHeaderFieldsTooLarge(); + public static final StatusCode RETRY_WITH = akka.http.scaladsl.model.StatusCodes.RetryWith(); + public static final StatusCode BLOCKED_BY_PARENTAL_CONTROLS = akka.http.scaladsl.model.StatusCodes.BlockedByParentalControls(); + public static final StatusCode UNAVAILABLE_FOR_LEGAL_REASONS = akka.http.scaladsl.model.StatusCodes.UnavailableForLegalReasons(); + + public static final StatusCode INTERNAL_SERVER_ERROR = akka.http.scaladsl.model.StatusCodes.InternalServerError(); + public static final StatusCode NOT_IMPLEMENTED = akka.http.scaladsl.model.StatusCodes.NotImplemented(); + public static final StatusCode BAD_GATEWAY = akka.http.scaladsl.model.StatusCodes.BadGateway(); + public static final StatusCode SERVICE_UNAVAILABLE = akka.http.scaladsl.model.StatusCodes.ServiceUnavailable(); + public static final StatusCode GATEWAY_TIMEOUT = akka.http.scaladsl.model.StatusCodes.GatewayTimeout(); + public static final StatusCode HTTPVERSION_NOT_SUPPORTED = akka.http.scaladsl.model.StatusCodes.HTTPVersionNotSupported(); + public static final StatusCode VARIANT_ALSO_NEGOTIATES = akka.http.scaladsl.model.StatusCodes.VariantAlsoNegotiates(); + public static final StatusCode INSUFFICIENT_STORAGE = akka.http.scaladsl.model.StatusCodes.InsufficientStorage(); + public static final StatusCode LOOP_DETECTED = akka.http.scaladsl.model.StatusCodes.LoopDetected(); + public static final StatusCode BANDWIDTH_LIMIT_EXCEEDED = akka.http.scaladsl.model.StatusCodes.BandwidthLimitExceeded(); + public static final StatusCode NOT_EXTENDED = akka.http.scaladsl.model.StatusCodes.NotExtended(); + public static final StatusCode NETWORK_AUTHENTICATION_REQUIRED = akka.http.scaladsl.model.StatusCodes.NetworkAuthenticationRequired(); + public static final StatusCode NETWORK_READ_TIMEOUT = akka.http.scaladsl.model.StatusCodes.NetworkReadTimeout(); + public static final StatusCode NETWORK_CONNECT_TIMEOUT = akka.http.scaladsl.model.StatusCodes.NetworkConnectTimeout(); + + /** + * Create a custom status code. + */ + public static StatusCode custom(int intValue, String reason, String defaultMessage, boolean isSuccess, boolean allowsEntity) { + return akka.http.scaladsl.model.StatusCodes.custom(intValue, reason, defaultMessage, isSuccess, allowsEntity); + } + + /** + * Create a custom status code. + */ + public static StatusCode custom(int intValue, String reason, String defaultMessage) { + return akka.http.scaladsl.model.StatusCodes.custom(intValue, reason, defaultMessage); + } + + /** + * Looks up a status-code by numeric code. Throws an exception if no such status-code is found. + */ + public static StatusCode get(int intValue) { + return akka.http.scaladsl.model.StatusCode.int2StatusCode(intValue); + } + + /** + * Looks up a status-code by numeric code and returns Some(code). Returns None otherwise. + */ + public static Option lookup(int intValue) { + return Util.lookupInRegistry(StatusCodes$.MODULE$, intValue); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/TransferEncoding.java b/akka-http-core/src/main/java/akka/http/javadsl/model/TransferEncoding.java similarity index 59% rename from akka-http-core/src/main/java/akka/http/model/japi/TransferEncoding.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/TransferEncoding.java index 19704855d9..3940c67f8b 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/TransferEncoding.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/TransferEncoding.java @@ -2,7 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; + +import akka.http.impl.util.Util; import java.util.Map; @@ -12,9 +14,9 @@ public abstract class TransferEncoding { public abstract Map getParams(); public static TransferEncoding createExtension(String name) { - return new akka.http.model.TransferEncodings.Extension(name, Util.emptyMap); + return new akka.http.scaladsl.model.TransferEncodings.Extension(name, Util.emptyMap); } public static TransferEncoding createExtension(String name, Map params) { - return new akka.http.model.TransferEncodings.Extension(name, Util.convertMapToScala(params)); + return new akka.http.scaladsl.model.TransferEncodings.Extension(name, Util.convertMapToScala(params)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/TransferEncodings.java b/akka-http-core/src/main/java/akka/http/javadsl/model/TransferEncodings.java new file mode 100644 index 0000000000..203cf2d039 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/TransferEncodings.java @@ -0,0 +1,14 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model; + +public final class TransferEncodings { + private TransferEncodings() {} + + public static final TransferEncoding CHUNKED = akka.http.scaladsl.model.TransferEncodings.chunked$.MODULE$; + public static final TransferEncoding COMPRESS = akka.http.scaladsl.model.TransferEncodings.compress$.MODULE$; + public static final TransferEncoding DEFLATE = akka.http.scaladsl.model.TransferEncodings.deflate$.MODULE$; + public static final TransferEncoding GZIP = akka.http.scaladsl.model.TransferEncodings.gzip$.MODULE$; +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/UniversalEntity.java b/akka-http-core/src/main/java/akka/http/javadsl/model/UniversalEntity.java similarity index 87% rename from akka-http-core/src/main/java/akka/http/model/japi/UniversalEntity.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/UniversalEntity.java index 7bcf5369e7..7cb1945375 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/UniversalEntity.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/UniversalEntity.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; /** Marker-interface for entity types that can be used in any context */ public interface UniversalEntity extends RequestEntity, ResponseEntity, BodyPartEntity {} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/Uri.java b/akka-http-core/src/main/java/akka/http/javadsl/model/Uri.java similarity index 81% rename from akka-http-core/src/main/java/akka/http/model/japi/Uri.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/Uri.java index 474131eb10..46f48c10ae 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/Uri.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/Uri.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; -import akka.http.model.UriJavaAccessor; +import akka.http.scaladsl.model.UriJavaAccessor; import akka.japi.Option; import akka.parboiled2.ParserInput$; @@ -153,36 +153,36 @@ public abstract class Uri { */ public abstract Uri fragment(Option fragment); - public static final akka.http.model.Uri.ParsingMode STRICT = UriJavaAccessor.pmStrict(); - public static final akka.http.model.Uri.ParsingMode RELAXED = UriJavaAccessor.pmRelaxed(); - public static final akka.http.model.Uri.ParsingMode RELAXED_WITH_RAW_QUERY = UriJavaAccessor.pmRelaxedWithRawQuery(); + public static final akka.http.scaladsl.model.Uri.ParsingMode STRICT = UriJavaAccessor.pmStrict(); + public static final akka.http.scaladsl.model.Uri.ParsingMode RELAXED = UriJavaAccessor.pmRelaxed(); + public static final akka.http.scaladsl.model.Uri.ParsingMode RELAXED_WITH_RAW_QUERY = UriJavaAccessor.pmRelaxedWithRawQuery(); /** * Creates a default Uri to be modified using the modification methods. */ public static Uri create() { - return Accessors$.MODULE$.Uri(akka.http.model.Uri.Empty$.MODULE$); + return Accessors$.MODULE$.Uri(akka.http.scaladsl.model.Uri.Empty$.MODULE$); } /** * Returns a Uri created by parsing the given string representation. */ public static Uri create(String uri) { - return Accessors$.MODULE$.Uri(akka.http.model.Uri.apply(uri)); + return Accessors$.MODULE$.Uri(akka.http.scaladsl.model.Uri.apply(uri)); } /** * Returns a Uri created by parsing the given string representation and parsing-mode. */ - public static Uri create(String uri, akka.http.model.Uri.ParsingMode parsingMode) { - return Accessors$.MODULE$.Uri(akka.http.model.Uri.apply(ParserInput$.MODULE$.apply(uri), parsingMode)); + public static Uri create(String uri, akka.http.scaladsl.model.Uri.ParsingMode parsingMode) { + return Accessors$.MODULE$.Uri(akka.http.scaladsl.model.Uri.apply(ParserInput$.MODULE$.apply(uri), parsingMode)); } /** * Returns a Uri created by parsing the given string representation, charset, and parsing-mode. */ - public static Uri create(String uri, Charset charset, akka.http.model.Uri.ParsingMode parsingMode) { - return Accessors$.MODULE$.Uri(akka.http.model.Uri.apply(ParserInput$.MODULE$.apply(uri), charset, parsingMode)); + public static Uri create(String uri, Charset charset, akka.http.scaladsl.model.Uri.ParsingMode parsingMode) { + return Accessors$.MODULE$.Uri(akka.http.scaladsl.model.Uri.apply(ParserInput$.MODULE$.apply(uri), charset, parsingMode)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Accept.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Accept.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Accept.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Accept.java index c1088067cf..f720148e40 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Accept.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Accept.java @@ -2,20 +2,21 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.MediaRange; +import akka.http.impl.util.Util; +import akka.http.javadsl.model.MediaRange; /** * Model for the `Accept` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-5.3.2 */ -public abstract class Accept extends akka.http.model.HttpHeader { +public abstract class Accept extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getMediaRanges(); public abstract boolean acceptsAll(); public static Accept create(MediaRange... mediaRanges) { - return new akka.http.model.headers.Accept(akka.http.model.japi.Util.convertArray(mediaRanges)); + return new akka.http.scaladsl.model.headers.Accept(Util.convertArray(mediaRanges)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptCharset.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptCharset.java similarity index 50% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptCharset.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptCharset.java index dc89ed15e8..b776629771 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptCharset.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptCharset.java @@ -2,18 +2,19 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.HttpCharsetRange; +import akka.http.impl.util.Util; +import akka.http.javadsl.model.HttpCharsetRange; /** * Model for the `Accept-Charset` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-5.3.3 */ -public abstract class AcceptCharset extends akka.http.model.HttpHeader { +public abstract class AcceptCharset extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getCharsetRanges(); public static AcceptCharset create(HttpCharsetRange... charsetRanges) { - return new akka.http.model.headers.Accept$minusCharset(akka.http.model.japi.Util.convertArray(charsetRanges)); + return new akka.http.scaladsl.model.headers.Accept$minusCharset(Util.convertArray(charsetRanges)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptEncoding.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptEncoding.java new file mode 100644 index 0000000000..967dc02754 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptEncoding.java @@ -0,0 +1,22 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +import akka.http.impl.util.Util; + +/** + * Model for the `Accept-Encoding` header. + * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-5.3.4 + */ +public abstract class AcceptEncoding extends akka.http.scaladsl.model.HttpHeader { + public abstract Iterable getEncodings(); + + public static AcceptEncoding create(HttpEncoding encoding) { + return new akka.http.scaladsl.model.headers.Accept$minusEncoding(Util.convertArray(new HttpEncodingRange[]{encoding.toRange()})); + } + public static AcceptEncoding create(HttpEncodingRange... encodings) { + return new akka.http.scaladsl.model.headers.Accept$minusEncoding(Util.convertArray(encodings)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptLanguage.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptLanguage.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptLanguage.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptLanguage.java index c0e5d2fd77..238502d7a8 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptLanguage.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptLanguage.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Accept-Language` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-5.3.5 */ -public abstract class AcceptLanguage extends akka.http.model.HttpHeader { +public abstract class AcceptLanguage extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getLanguages(); public static AcceptLanguage create(LanguageRange... languages) { - return new akka.http.model.headers.Accept$minusLanguage(akka.http.model.japi.Util.convertArray(languages)); + return new akka.http.scaladsl.model.headers.Accept$minusLanguage(akka.http.impl.util.Util.convertArray(languages)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptRanges.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptRanges.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptRanges.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptRanges.java index 5d5afba122..257a4cdd4c 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptRanges.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AcceptRanges.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Accept-Ranges` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-26#section-2.3 */ -public abstract class AcceptRanges extends akka.http.model.HttpHeader { +public abstract class AcceptRanges extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getRangeUnits(); public static AcceptRanges create(RangeUnit... rangeUnits) { - return new akka.http.model.headers.Accept$minusRanges(akka.http.model.japi.Util.convertArray(rangeUnits)); + return new akka.http.scaladsl.model.headers.Accept$minusRanges(akka.http.impl.util.Util.convertArray(rangeUnits)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowCredentials.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowCredentials.java similarity index 69% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowCredentials.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowCredentials.java index 7cdf049a7b..7acaffbb63 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowCredentials.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowCredentials.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Access-Control-Allow-Credentials` header. * Specification: http://www.w3.org/TR/cors/#access-control-allow-credentials-response-header */ -public abstract class AccessControlAllowCredentials extends akka.http.model.HttpHeader { +public abstract class AccessControlAllowCredentials extends akka.http.scaladsl.model.HttpHeader { public abstract boolean allow(); public static AccessControlAllowCredentials create(boolean allow) { - return new akka.http.model.headers.Access$minusControl$minusAllow$minusCredentials(allow); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusAllow$minusCredentials(allow); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowHeaders.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowHeaders.java similarity index 64% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowHeaders.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowHeaders.java index 9fce96ffef..a4884f8522 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowHeaders.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowHeaders.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Access-Control-Allow-Headers` header. * Specification: http://www.w3.org/TR/cors/#access-control-allow-headers-response-header */ -public abstract class AccessControlAllowHeaders extends akka.http.model.HttpHeader { +public abstract class AccessControlAllowHeaders extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getHeaders(); public static AccessControlAllowHeaders create(String... headers) { - return new akka.http.model.headers.Access$minusControl$minusAllow$minusHeaders(akka.http.model.japi.Util.convertArray(headers)); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusAllow$minusHeaders(akka.http.impl.util.Util.convertArray(headers)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowMethods.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowMethods.java similarity index 58% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowMethods.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowMethods.java index e357d4c888..f98315cdd1 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowMethods.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowMethods.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.HttpMethod; +import akka.http.javadsl.model.HttpMethod; /** * Model for the `Access-Control-Allow-Methods` header. * Specification: http://www.w3.org/TR/cors/#access-control-allow-methods-response-header */ -public abstract class AccessControlAllowMethods extends akka.http.model.HttpHeader { +public abstract class AccessControlAllowMethods extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getMethods(); public static AccessControlAllowMethods create(HttpMethod... methods) { - return new akka.http.model.headers.Access$minusControl$minusAllow$minusMethods(akka.http.model.japi.Util.convertArray(methods)); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusAllow$minusMethods(akka.http.impl.util.Util.convertArray(methods)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowOrigin.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowOrigin.java similarity index 65% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowOrigin.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowOrigin.java index 7063dd4509..fe7d44be69 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlAllowOrigin.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlAllowOrigin.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Access-Control-Allow-Origin` header. * Specification: http://www.w3.org/TR/cors/#access-control-allow-origin-response-header */ -public abstract class AccessControlAllowOrigin extends akka.http.model.HttpHeader { +public abstract class AccessControlAllowOrigin extends akka.http.scaladsl.model.HttpHeader { public abstract HttpOriginRange range(); public static AccessControlAllowOrigin create(HttpOriginRange range) { - return new akka.http.model.headers.Access$minusControl$minusAllow$minusOrigin(((akka.http.model.headers.HttpOriginRange) range)); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusAllow$minusOrigin(((akka.http.scaladsl.model.headers.HttpOriginRange) range)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlExposeHeaders.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlExposeHeaders.java similarity index 64% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlExposeHeaders.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlExposeHeaders.java index c4e5fbc98c..702793ceb1 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlExposeHeaders.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlExposeHeaders.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Access-Control-Expose-Headers` header. * Specification: http://www.w3.org/TR/cors/#access-control-expose-headers-response-header */ -public abstract class AccessControlExposeHeaders extends akka.http.model.HttpHeader { +public abstract class AccessControlExposeHeaders extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getHeaders(); public static AccessControlExposeHeaders create(String... headers) { - return new akka.http.model.headers.Access$minusControl$minusExpose$minusHeaders(akka.http.model.japi.Util.convertArray(headers)); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusExpose$minusHeaders(akka.http.impl.util.Util.convertArray(headers)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlMaxAge.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlMaxAge.java similarity index 59% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlMaxAge.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlMaxAge.java index ec06988a1f..c817095d39 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlMaxAge.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlMaxAge.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Access-Control-Max-Age` header. * Specification: http://www.w3.org/TR/cors/#access-control-max-age-response-header */ -public abstract class AccessControlMaxAge extends akka.http.model.HttpHeader { +public abstract class AccessControlMaxAge extends akka.http.scaladsl.model.HttpHeader { public abstract long deltaSeconds(); public static AccessControlMaxAge create(long deltaSeconds) { - return new akka.http.model.headers.Access$minusControl$minusMax$minusAge(deltaSeconds); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusMax$minusAge(deltaSeconds); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlRequestHeaders.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlRequestHeaders.java similarity index 64% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlRequestHeaders.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlRequestHeaders.java index 6d997f9928..9ba6718fd7 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlRequestHeaders.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlRequestHeaders.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Access-Control-Request-Headers` header. * Specification: http://www.w3.org/TR/cors/#access-control-request-headers-request-header */ -public abstract class AccessControlRequestHeaders extends akka.http.model.HttpHeader { +public abstract class AccessControlRequestHeaders extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getHeaders(); public static AccessControlRequestHeaders create(String... headers) { - return new akka.http.model.headers.Access$minusControl$minusRequest$minusHeaders(akka.http.model.japi.Util.convertArray(headers)); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusRequest$minusHeaders(akka.http.impl.util.Util.convertArray(headers)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlRequestMethod.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlRequestMethod.java similarity index 61% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlRequestMethod.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlRequestMethod.java index bc259e0799..fd44f214b3 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AccessControlRequestMethod.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/AccessControlRequestMethod.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.HttpMethod; +import akka.http.javadsl.model.HttpMethod; /** * Model for the `Access-Control-Request-Method` header. * Specification: http://www.w3.org/TR/cors/#access-control-request-method-request-header */ -public abstract class AccessControlRequestMethod extends akka.http.model.HttpHeader { +public abstract class AccessControlRequestMethod extends akka.http.scaladsl.model.HttpHeader { public abstract HttpMethod method(); public static AccessControlRequestMethod create(HttpMethod method) { - return new akka.http.model.headers.Access$minusControl$minusRequest$minusMethod(((akka.http.model.HttpMethod) method)); + return new akka.http.scaladsl.model.headers.Access$minusControl$minusRequest$minusMethod(((akka.http.scaladsl.model.HttpMethod) method)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Age.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Age.java similarity index 60% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Age.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Age.java index 5a66630c98..92c15d1efd 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Age.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Age.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Age` header. * Specification: http://tools.ietf.org/html/rfc7234#section-5.1 */ -public abstract class Age extends akka.http.model.HttpHeader { +public abstract class Age extends akka.http.scaladsl.model.HttpHeader { public abstract long deltaSeconds(); public static Age create(long deltaSeconds) { - return new akka.http.model.headers.Age(deltaSeconds); + return new akka.http.scaladsl.model.headers.Age(deltaSeconds); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Allow.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Allow.java similarity index 51% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Allow.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Allow.java index 0685da1f26..e0bdc4c3e1 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Allow.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Allow.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.HttpMethod; +import akka.http.javadsl.model.HttpMethod; /** * Model for the `Allow` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-7.4.1 */ -public abstract class Allow extends akka.http.model.HttpHeader { +public abstract class Allow extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getMethods(); public static Allow create(HttpMethod... methods) { - return new akka.http.model.headers.Allow(akka.http.model.japi.Util.convertArray(methods)); + return new akka.http.scaladsl.model.headers.Allow(akka.http.impl.util.Util.convertArray(methods)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Authorization.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Authorization.java similarity index 66% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Authorization.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Authorization.java index 5f48d4b3d3..57eb43fe32 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Authorization.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Authorization.java @@ -2,17 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Authorization` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p7-auth-26#section-4.2 */ -public abstract class Authorization extends akka.http.model.HttpHeader { +public abstract class Authorization extends akka.http.scaladsl.model.HttpHeader { public abstract HttpCredentials credentials(); public static Authorization create(HttpCredentials credentials) { - return new akka.http.model.headers.Authorization(((akka.http.model.headers.HttpCredentials) credentials)); + return new akka.http.scaladsl.model.headers.Authorization(((akka.http.scaladsl.model.headers.HttpCredentials) credentials)); } public static Authorization basic(String username, String password) { return create(HttpCredentials.createBasicHttpCredentials(username, password)); diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/BasicHttpCredentials.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/BasicHttpCredentials.java similarity index 52% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/BasicHttpCredentials.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/BasicHttpCredentials.java index d6f80af49f..f9f0fc0440 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/BasicHttpCredentials.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/BasicHttpCredentials.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -public abstract class BasicHttpCredentials extends akka.http.model.headers.HttpCredentials { +public abstract class BasicHttpCredentials extends akka.http.scaladsl.model.headers.HttpCredentials { public abstract String username(); public abstract String password(); } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ByteRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ByteRange.java similarity index 89% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ByteRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ByteRange.java index 7fb6854998..ac092ec651 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ByteRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ByteRange.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.headers.ByteRange$; +import akka.http.scaladsl.model.headers.ByteRange$; import akka.japi.Option; public abstract class ByteRange { diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheControl.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheControl.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/CacheControl.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheControl.java index d035651968..b92be0911d 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheControl.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheControl.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Cache-Control` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p6-cache-26#section-5.2 */ -public abstract class CacheControl extends akka.http.model.HttpHeader { +public abstract class CacheControl extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getDirectives(); public static CacheControl create(CacheDirective... directives) { - return new akka.http.model.headers.Cache$minusControl(akka.http.model.japi.Util.convertArray(directives)); + return new akka.http.scaladsl.model.headers.Cache$minusControl(akka.http.impl.util.Util.convertArray(directives)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheDirective.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheDirective.java similarity index 76% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/CacheDirective.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheDirective.java index 397691f545..459f79bfaa 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheDirective.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheDirective.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public interface CacheDirective { String value(); diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheDirectives.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheDirectives.java new file mode 100644 index 0000000000..141ffb15c3 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CacheDirectives.java @@ -0,0 +1,40 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +public final class CacheDirectives { + private CacheDirectives() {} + + public static CacheDirective MAX_AGE(long deltaSeconds) { + return new akka.http.scaladsl.model.headers.CacheDirectives.max$minusage(deltaSeconds); + } + public static CacheDirective MAX_STALE() { + return new akka.http.scaladsl.model.headers.CacheDirectives.max$minusstale(akka.japi.Option.none().asScala()); + } + public static CacheDirective MAX_STALE(long deltaSeconds) { + return new akka.http.scaladsl.model.headers.CacheDirectives.max$minusstale(akka.japi.Option.some((Object) deltaSeconds).asScala()); + } + public static CacheDirective MIN_FRESH(long deltaSeconds) { + return new akka.http.scaladsl.model.headers.CacheDirectives.min$minusfresh(deltaSeconds); + } + + public static final CacheDirective NO_CACHE = akka.http.scaladsl.model.headers.CacheDirectives.no$minuscache$.MODULE$; + public static final CacheDirective NO_STORE = akka.http.scaladsl.model.headers.CacheDirectives.no$minusstore$.MODULE$; + public static final CacheDirective NO_TRANSFORM = akka.http.scaladsl.model.headers.CacheDirectives.no$minustransform$.MODULE$; + public static final CacheDirective ONLY_IF_CACHED = akka.http.scaladsl.model.headers.CacheDirectives.only$minusif$minuscached$.MODULE$; + public static final CacheDirective MUST_REVALIDATE = akka.http.scaladsl.model.headers.CacheDirectives.must$minusrevalidate$.MODULE$; + + public static CacheDirective NO_CACHE(String... fieldNames) { + return akka.http.scaladsl.model.headers.CacheDirectives.no$minuscache$.MODULE$.apply(fieldNames); + } + public static final CacheDirective PUBLIC = akka.http.scaladsl.model.headers.CacheDirectives.getPublic(); + public static CacheDirective PRIVATE(String... fieldNames) { + return akka.http.scaladsl.model.headers.CacheDirectives.createPrivate(fieldNames); + } + public static final CacheDirective PROXY_REVALIDATE = akka.http.scaladsl.model.headers.CacheDirectives.proxy$minusrevalidate$.MODULE$; + public static CacheDirective S_MAXAGE(long deltaSeconds) { + return new akka.http.scaladsl.model.headers.CacheDirectives.s$minusmaxage(deltaSeconds); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDisposition.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDisposition.java similarity index 57% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDisposition.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDisposition.java index 545210fff0..daa23f649e 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDisposition.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDisposition.java @@ -2,17 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Content-Disposition` header. * Specification: http://tools.ietf.org/html/rfc6266 */ -public abstract class ContentDisposition extends akka.http.model.HttpHeader { +public abstract class ContentDisposition extends akka.http.scaladsl.model.HttpHeader { public abstract ContentDispositionType dispositionType(); public abstract java.util.Map getParams(); public static ContentDisposition create(ContentDispositionType dispositionType, java.util.Map params) { - return new akka.http.model.headers.Content$minusDisposition(((akka.http.model.headers.ContentDispositionType) dispositionType), akka.http.model.japi.Util.convertMapToScala(params)); + return new akka.http.scaladsl.model.headers.Content$minusDisposition(((akka.http.scaladsl.model.headers.ContentDispositionType) dispositionType), akka.http.impl.util.Util.convertMapToScala(params)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDispositionType.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDispositionType.java similarity index 77% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDispositionType.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDispositionType.java index fbb03e5191..7675d54094 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDispositionType.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDispositionType.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public interface ContentDispositionType { String name(); diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDispositionTypes.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDispositionTypes.java similarity index 54% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDispositionTypes.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDispositionTypes.java index 2d892e51eb..8b8db97071 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentDispositionTypes.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentDispositionTypes.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public final class ContentDispositionTypes { private ContentDispositionTypes() {} - public static final ContentDispositionType INLINE = akka.http.model.headers.ContentDispositionTypes.inline$.MODULE$; - public static final ContentDispositionType ATTACHMENT = akka.http.model.headers.ContentDispositionTypes.attachment$.MODULE$; - public static final ContentDispositionType FORM_DATA = akka.http.model.headers.ContentDispositionTypes.form$minusdata$.MODULE$; + public static final ContentDispositionType INLINE = akka.http.scaladsl.model.headers.ContentDispositionTypes.inline$.MODULE$; + public static final ContentDispositionType ATTACHMENT = akka.http.scaladsl.model.headers.ContentDispositionTypes.attachment$.MODULE$; + public static final ContentDispositionType FORM_DATA = akka.http.scaladsl.model.headers.ContentDispositionTypes.form$minusdata$.MODULE$; public static ContentDispositionType Ext(String name) { - return new akka.http.model.headers.ContentDispositionTypes.Ext(name); + return new akka.http.scaladsl.model.headers.ContentDispositionTypes.Ext(name); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentEncoding.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentEncoding.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ContentEncoding.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentEncoding.java index 6bbaee01c0..eae71c72aa 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentEncoding.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentEncoding.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Content-Encoding` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-3.1.2.2 */ -public abstract class ContentEncoding extends akka.http.model.HttpHeader { +public abstract class ContentEncoding extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getEncodings(); public static ContentEncoding create(HttpEncoding... encodings) { - return new akka.http.model.headers.Content$minusEncoding(akka.http.model.japi.Util.convertArray(encodings)); + return new akka.http.scaladsl.model.headers.Content$minusEncoding(akka.http.impl.util.Util.convertArray(encodings)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentRange.java new file mode 100644 index 0000000000..b537e000a1 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentRange.java @@ -0,0 +1,18 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +/** + * Model for the `Content-Range` header. + * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-26#section-4.2 + */ +public abstract class ContentRange extends akka.http.scaladsl.model.HttpHeader { + public abstract RangeUnit rangeUnit(); + public abstract akka.http.javadsl.model.ContentRange contentRange(); + + public static ContentRange create(RangeUnit rangeUnit, akka.http.javadsl.model.ContentRange contentRange) { + return new akka.http.scaladsl.model.headers.Content$minusRange(((akka.http.scaladsl.model.headers.RangeUnit) rangeUnit), ((akka.http.scaladsl.model.ContentRange) contentRange)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentType.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentType.java new file mode 100644 index 0000000000..5933b876fa --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ContentType.java @@ -0,0 +1,17 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +/** + * Model for the `Content-Type` header. + * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-3.1.1.5 + */ +public abstract class ContentType extends akka.http.scaladsl.model.HttpHeader { + public abstract akka.http.javadsl.model.ContentType contentType(); + + public static ContentType create(akka.http.javadsl.model.ContentType contentType) { + return new akka.http.scaladsl.model.headers.Content$minusType(((akka.http.scaladsl.model.ContentType) contentType)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Cookie.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Cookie.java similarity index 52% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Cookie.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Cookie.java index 90f249b365..0944449844 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Cookie.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Cookie.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Cookie` header. * Specification: https://tools.ietf.org/html/rfc6265#section-4.2 */ -public abstract class Cookie extends akka.http.model.HttpHeader { +public abstract class Cookie extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getCookies(); public static Cookie create(HttpCookie... cookies) { - return new akka.http.model.headers.Cookie(akka.http.model.japi.Util.convertArray(cookies)); + return new akka.http.scaladsl.model.headers.Cookie(akka.http.impl.util.Util.convertArray(cookies)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/CustomHeader.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CustomHeader.java similarity index 62% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/CustomHeader.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/CustomHeader.java index 65eaf89fa8..7313313a2e 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/CustomHeader.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/CustomHeader.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -public abstract class CustomHeader extends akka.http.model.HttpHeader { +public abstract class CustomHeader extends akka.http.scaladsl.model.HttpHeader { public abstract String name(); public abstract String value(); diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Date.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Date.java similarity index 54% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Date.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Date.java index 8930a25325..bbf578d698 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Date.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Date.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.DateTime; +import akka.http.javadsl.model.DateTime; /** * Model for the `Date` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-7.1.1.2 */ -public abstract class Date extends akka.http.model.HttpHeader { +public abstract class Date extends akka.http.scaladsl.model.HttpHeader { public abstract DateTime date(); public static Date create(DateTime date) { - return new akka.http.model.headers.Date(((akka.http.util.DateTime) date)); + return new akka.http.scaladsl.model.headers.Date(((akka.http.scaladsl.model.DateTime) date)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ETag.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ETag.java similarity index 57% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ETag.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ETag.java index f6f95cd9fe..a485469ae8 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ETag.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ETag.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `ETag` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-2.3 */ -public abstract class ETag extends akka.http.model.HttpHeader { +public abstract class ETag extends akka.http.scaladsl.model.HttpHeader { public abstract EntityTag etag(); public static ETag create(EntityTag etag) { - return new akka.http.model.headers.ETag(((akka.http.model.headers.EntityTag) etag)); + return new akka.http.scaladsl.model.headers.ETag(((akka.http.scaladsl.model.headers.EntityTag) etag)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/EntityTag.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/EntityTag.java similarity index 60% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/EntityTag.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/EntityTag.java index 743dd68f79..c635efb78a 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/EntityTag.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/EntityTag.java @@ -2,19 +2,19 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public abstract class EntityTag { public abstract String tag(); public abstract boolean weak(); public static EntityTag create(String tag, boolean weak) { - return new akka.http.model.headers.EntityTag(tag, weak); + return new akka.http.scaladsl.model.headers.EntityTag(tag, weak); } public static boolean matchesRange(EntityTag eTag, EntityTagRange range, boolean weak) { - return akka.http.model.headers.EntityTag.matchesRange(eTag, range, weak); + return akka.http.scaladsl.model.headers.EntityTag.matchesRange(eTag, range, weak); } public static boolean matches(EntityTag eTag, EntityTag other, boolean weak) { - return akka.http.model.headers.EntityTag.matches(eTag, other, weak); + return akka.http.scaladsl.model.headers.EntityTag.matches(eTag, other, weak); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/EntityTagRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/EntityTagRange.java new file mode 100644 index 0000000000..085f20df11 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/EntityTagRange.java @@ -0,0 +1,14 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +import akka.http.impl.util.Util; + +public abstract class EntityTagRange { + public static EntityTagRange create(EntityTag... tags) { + return akka.http.scaladsl.model.headers.EntityTagRange.apply(Util.convertArray(tags)); + } + public static final EntityTagRange ALL = akka.http.scaladsl.model.headers.EntityTagRange.$times$.MODULE$; +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Expires.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Expires.java similarity index 51% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Expires.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Expires.java index 14db6909a2..e52a8694ad 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Expires.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Expires.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.DateTime; +import akka.http.javadsl.model.DateTime; /** * Model for the `Expires` header. * Specification: http://tools.ietf.org/html/rfc7234#section-5.3 */ -public abstract class Expires extends akka.http.model.HttpHeader { +public abstract class Expires extends akka.http.scaladsl.model.HttpHeader { public abstract DateTime date(); public static Expires create(DateTime date) { - return new akka.http.model.headers.Expires(((akka.http.util.DateTime) date)); + return new akka.http.scaladsl.model.headers.Expires(((akka.http.scaladsl.model.DateTime) date)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Host.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Host.java new file mode 100644 index 0000000000..7e80f807da --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Host.java @@ -0,0 +1,10 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +public abstract class Host extends akka.http.scaladsl.model.HttpHeader { + public abstract akka.http.javadsl.model.Host host(); + public abstract int port(); +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpChallenge.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpChallenge.java similarity index 56% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpChallenge.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpChallenge.java index 01083e8392..643de1da96 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpChallenge.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpChallenge.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.headers.HttpChallenge$; -import akka.http.model.japi.Util; +import akka.http.scaladsl.model.headers.HttpChallenge$; +import akka.http.impl.util.Util; import java.util.Map; @@ -16,9 +16,9 @@ public abstract class HttpChallenge { public abstract Map getParams(); public static HttpChallenge create(String scheme, String realm) { - return new akka.http.model.headers.HttpChallenge(scheme, realm, Util.emptyMap); + return new akka.http.scaladsl.model.headers.HttpChallenge(scheme, realm, Util.emptyMap); } public static HttpChallenge create(String scheme, String realm, Map params) { - return new akka.http.model.headers.HttpChallenge(scheme, realm, Util.convertMapToScala(params)); + return new akka.http.scaladsl.model.headers.HttpChallenge(scheme, realm, Util.convertMapToScala(params)); } } \ No newline at end of file diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpCookie.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpCookie.java similarity index 72% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpCookie.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpCookie.java index 697ec9f639..8c1e0aca96 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpCookie.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpCookie.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.DateTime; -import akka.http.model.japi.Util; +import akka.http.javadsl.model.DateTime; +import akka.http.impl.util.Util; import akka.japi.Option; public abstract class HttpCookie { @@ -21,9 +21,9 @@ public abstract class HttpCookie { public abstract Option getExtension(); public static HttpCookie create(String name, String content) { - return new akka.http.model.headers.HttpCookie( + return new akka.http.scaladsl.model.headers.HttpCookie( name, content, - Util.scalaNone(), Util.scalaNone(), Util.scalaNone(), Util.scalaNone(), + Util.scalaNone(), Util.scalaNone(), Util.scalaNone(), Util.scalaNone(), false, false, Util.scalaNone()); } @@ -38,9 +38,9 @@ public abstract class HttpCookie { boolean secure, boolean httpOnly, Option extension) { - return new akka.http.model.headers.HttpCookie( + return new akka.http.scaladsl.model.headers.HttpCookie( name, content, - Util.convertOptionToScala(expires), + Util.convertOptionToScala(expires), ((Option) (Option) maxAge).asScala(), domain.asScala(), path.asScala(), diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpCredentials.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpCredentials.java similarity index 57% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpCredentials.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpCredentials.java index 2bbbebfaa8..639c7b0136 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpCredentials.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpCredentials.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.Util; +import akka.http.impl.util.Util; import java.util.Map; @@ -15,15 +15,15 @@ public abstract class HttpCredentials { public abstract Map getParams(); public static HttpCredentials create(String scheme, String token) { - return new akka.http.model.headers.GenericHttpCredentials(scheme, token, Util.emptyMap); + return new akka.http.scaladsl.model.headers.GenericHttpCredentials(scheme, token, Util.emptyMap); } public static HttpCredentials create(String scheme, String token, Map params) { - return new akka.http.model.headers.GenericHttpCredentials(scheme, token, Util.convertMapToScala(params)); + return new akka.http.scaladsl.model.headers.GenericHttpCredentials(scheme, token, Util.convertMapToScala(params)); } public static BasicHttpCredentials createBasicHttpCredentials(String username, String password) { - return new akka.http.model.headers.BasicHttpCredentials(username, password); + return new akka.http.scaladsl.model.headers.BasicHttpCredentials(username, password); } public static OAuth2BearerToken createOAuth2BearerToken(String token) { - return new akka.http.model.headers.OAuth2BearerToken(token); + return new akka.http.scaladsl.model.headers.OAuth2BearerToken(token); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncoding.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncoding.java similarity index 85% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncoding.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncoding.java index 8d6c040816..89cdc7ba49 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncoding.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncoding.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public abstract class HttpEncoding { public abstract String value(); diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncodingRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncodingRange.java similarity index 52% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncodingRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncodingRange.java index 7268901671..a7b27a2798 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncodingRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncodingRange.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.headers.HttpEncodingRange$; +import akka.http.scaladsl.model.headers.HttpEncodingRange$; public abstract class HttpEncodingRange { public abstract float qValue(); @@ -12,8 +12,8 @@ public abstract class HttpEncodingRange { public abstract HttpEncodingRange withQValue(float qValue); - public static final HttpEncodingRange ALL = akka.http.model.headers.HttpEncodingRange.$times$.MODULE$; + public static final HttpEncodingRange ALL = akka.http.scaladsl.model.headers.HttpEncodingRange.$times$.MODULE$; public static HttpEncodingRange create(HttpEncoding encoding) { - return HttpEncodingRange$.MODULE$.apply((akka.http.model.headers.HttpEncoding) encoding); + return HttpEncodingRange$.MODULE$.apply((akka.http.scaladsl.model.headers.HttpEncoding) encoding); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncodings.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncodings.java new file mode 100644 index 0000000000..f15282411a --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpEncodings.java @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +public final class HttpEncodings { + private HttpEncodings() {} + + public static final HttpEncoding CHUNKED = akka.http.scaladsl.model.headers.HttpEncodings.chunked(); + public static final HttpEncoding COMPRESS = akka.http.scaladsl.model.headers.HttpEncodings.compress(); + public static final HttpEncoding DEFLATE = akka.http.scaladsl.model.headers.HttpEncodings.deflate(); + public static final HttpEncoding GZIP = akka.http.scaladsl.model.headers.HttpEncodings.gzip(); + public static final HttpEncoding IDENTITY = akka.http.scaladsl.model.headers.HttpEncodings.identity(); + public static final HttpEncoding X_COMPRESS = akka.http.scaladsl.model.headers.HttpEncodings.x$minuscompress(); + public static final HttpEncoding X_ZIP = akka.http.scaladsl.model.headers.HttpEncodings.x$minuszip(); +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpOrigin.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpOrigin.java similarity index 63% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpOrigin.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpOrigin.java index 973d0865b9..e3d87d7340 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpOrigin.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpOrigin.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.headers.HttpOrigin$; +import akka.http.scaladsl.model.headers.HttpOrigin$; public abstract class HttpOrigin { public abstract String scheme(); public abstract Host host(); public static HttpOrigin create(String scheme, Host host) { - return new akka.http.model.headers.HttpOrigin(scheme, (akka.http.model.headers.Host) host); + return new akka.http.scaladsl.model.headers.HttpOrigin(scheme, (akka.http.scaladsl.model.headers.Host) host); } public static HttpOrigin parse(String originString) { return HttpOrigin$.MODULE$.apply(originString); diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpOriginRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpOriginRange.java similarity index 50% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/HttpOriginRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpOriginRange.java index 9fc0347191..821259ee06 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpOriginRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/HttpOriginRange.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.headers.HttpOriginRange$; -import akka.http.model.japi.Util; +import akka.http.scaladsl.model.headers.HttpOriginRange$; +import akka.http.impl.util.Util; public abstract class HttpOriginRange { public abstract boolean matches(HttpOrigin origin); - public static final HttpOriginRange ALL = akka.http.model.headers.HttpOriginRange.$times$.MODULE$; + public static final HttpOriginRange ALL = akka.http.scaladsl.model.headers.HttpOriginRange.$times$.MODULE$; public static HttpOriginRange create(HttpOrigin... origins) { - return HttpOriginRange$.MODULE$.apply(Util.convertArray(origins)); + return HttpOriginRange$.MODULE$.apply(Util.convertArray(origins)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfMatch.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfMatch.java similarity index 57% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/IfMatch.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfMatch.java index e4a1b745ff..e3086df285 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfMatch.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfMatch.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `If-Match` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-3.1 */ -public abstract class IfMatch extends akka.http.model.HttpHeader { +public abstract class IfMatch extends akka.http.scaladsl.model.HttpHeader { public abstract EntityTagRange m(); public static IfMatch create(EntityTagRange m) { - return new akka.http.model.headers.If$minusMatch(((akka.http.model.headers.EntityTagRange) m)); + return new akka.http.scaladsl.model.headers.If$minusMatch(((akka.http.scaladsl.model.headers.EntityTagRange) m)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfModifiedSince.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfModifiedSince.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/IfModifiedSince.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfModifiedSince.java index e9db6519e9..4d5c9db3cd 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfModifiedSince.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfModifiedSince.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.DateTime; +import akka.http.javadsl.model.DateTime; /** * Model for the `If-Modified-Since` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-3.3 */ -public abstract class IfModifiedSince extends akka.http.model.HttpHeader { +public abstract class IfModifiedSince extends akka.http.scaladsl.model.HttpHeader { public abstract DateTime date(); public static IfModifiedSince create(DateTime date) { - return new akka.http.model.headers.If$minusModified$minusSince(((akka.http.util.DateTime) date)); + return new akka.http.scaladsl.model.headers.If$minusModified$minusSince(((akka.http.scaladsl.model.DateTime) date)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfNoneMatch.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfNoneMatch.java similarity index 56% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/IfNoneMatch.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfNoneMatch.java index 365b8704ae..f2265c8cb9 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfNoneMatch.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfNoneMatch.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `If-None-Match` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-3.2 */ -public abstract class IfNoneMatch extends akka.http.model.HttpHeader { +public abstract class IfNoneMatch extends akka.http.scaladsl.model.HttpHeader { public abstract EntityTagRange m(); public static IfNoneMatch create(EntityTagRange m) { - return new akka.http.model.headers.If$minusNone$minusMatch(((akka.http.model.headers.EntityTagRange) m)); + return new akka.http.scaladsl.model.headers.If$minusNone$minusMatch(((akka.http.scaladsl.model.headers.EntityTagRange) m)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfUnmodifiedSince.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfUnmodifiedSince.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/IfUnmodifiedSince.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfUnmodifiedSince.java index 28a350c15b..3c60adc96c 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/IfUnmodifiedSince.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/IfUnmodifiedSince.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.DateTime; +import akka.http.javadsl.model.DateTime; /** * Model for the `If-Unmodified-Since` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-3.4 */ -public abstract class IfUnmodifiedSince extends akka.http.model.HttpHeader { +public abstract class IfUnmodifiedSince extends akka.http.scaladsl.model.HttpHeader { public abstract DateTime date(); public static IfUnmodifiedSince create(DateTime date) { - return new akka.http.model.headers.If$minusUnmodified$minusSince(((akka.http.util.DateTime) date)); + return new akka.http.scaladsl.model.headers.If$minusUnmodified$minusSince(((akka.http.scaladsl.model.DateTime) date)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Language.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Language.java similarity index 71% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Language.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Language.java index 7cf51a4815..1753969dee 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Language.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Language.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.headers.Language$; -import akka.http.model.japi.Util; +import akka.http.impl.util.Util; +import akka.http.scaladsl.model.headers.Language$; public abstract class Language implements LanguageRange { public static Language create(String primaryTag, String... subTags) { diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/LanguageRange.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LanguageRange.java similarity index 70% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/LanguageRange.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/LanguageRange.java index cb472a9933..9b7c4f29f4 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/LanguageRange.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LanguageRange.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public interface LanguageRange { public abstract String primaryTag(); @@ -13,5 +13,5 @@ public interface LanguageRange { public abstract LanguageRange withQValue(float qValue); - public static final LanguageRange ALL = akka.http.model.headers.LanguageRange.$times$.MODULE$; + public static final LanguageRange ALL = akka.http.scaladsl.model.headers.LanguageRange.$times$.MODULE$; } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/LastModified.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LastModified.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/LastModified.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/LastModified.java index b1ad03be80..bf52122c4c 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/LastModified.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LastModified.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.DateTime; +import akka.http.javadsl.model.DateTime; /** * Model for the `Last-Modified` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-2.2 */ -public abstract class LastModified extends akka.http.model.HttpHeader { +public abstract class LastModified extends akka.http.scaladsl.model.HttpHeader { public abstract DateTime date(); public static LastModified create(DateTime date) { - return new akka.http.model.headers.Last$minusModified(((akka.http.util.DateTime) date)); + return new akka.http.scaladsl.model.headers.Last$minusModified(((akka.http.scaladsl.model.DateTime) date)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Link.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Link.java similarity index 52% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Link.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Link.java index eb865e7da9..1be966459e 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Link.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Link.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Link` header. * Specification: http://tools.ietf.org/html/rfc5988#section-5 */ -public abstract class Link extends akka.http.model.HttpHeader { +public abstract class Link extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getValues(); public static Link create(LinkValue... values) { - return new akka.http.model.headers.Link(akka.http.model.japi.Util.convertArray(values)); + return new akka.http.scaladsl.model.headers.Link(akka.http.impl.util.Util.convertArray(values)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkParam.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkParam.java similarity index 54% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/LinkParam.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkParam.java index 72ee4212b0..14c111a5f8 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkParam.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkParam.java @@ -2,11 +2,11 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.MediaType; -import akka.http.model.japi.Uri; -import akka.http.model.japi.Util; +import akka.http.javadsl.model.MediaType; +import akka.http.javadsl.model.Uri; +import akka.http.impl.util.Util; public abstract class LinkParam { public abstract String key(); diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkParams.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkParams.java new file mode 100644 index 0000000000..a8206e1b3a --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkParams.java @@ -0,0 +1,43 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +import akka.http.javadsl.model.MediaType; +import akka.http.javadsl.model.Uri; +import akka.http.impl.util.Util; + +public final class LinkParams { + private LinkParams() {} + + public static final LinkParam next = akka.http.scaladsl.model.headers.LinkParams.next(); + public static final LinkParam prev = akka.http.scaladsl.model.headers.LinkParams.prev(); + public static final LinkParam first = akka.http.scaladsl.model.headers.LinkParams.first(); + public static final LinkParam last = akka.http.scaladsl.model.headers.LinkParams.last(); + + public static LinkParam rel(String value) { + return new akka.http.scaladsl.model.headers.LinkParams.rel(value); + } + public static LinkParam anchor(Uri uri) { + return new akka.http.scaladsl.model.headers.LinkParams.anchor(Util.convertUriToScala(uri)); + } + public static LinkParam rev(String value) { + return new akka.http.scaladsl.model.headers.LinkParams.rev(value); + } + public static LinkParam hreflang(Language language) { + return new akka.http.scaladsl.model.headers.LinkParams.hreflang((akka.http.scaladsl.model.headers.Language) language); + } + public static LinkParam media(String desc) { + return new akka.http.scaladsl.model.headers.LinkParams.media(desc); + } + public static LinkParam title(String title) { + return new akka.http.scaladsl.model.headers.LinkParams.title(title); + } + public static LinkParam title_All(String title) { + return new akka.http.scaladsl.model.headers.LinkParams.title$times(title); + } + public static LinkParam type(MediaType type) { + return new akka.http.scaladsl.model.headers.LinkParams.type((akka.http.scaladsl.model.MediaType) type); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkValue.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkValue.java similarity index 54% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/LinkValue.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkValue.java index f4d9107dd4..ad0729ed84 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkValue.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/LinkValue.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.Uri; -import akka.http.model.japi.Util; +import akka.http.javadsl.model.Uri; +import akka.http.impl.util.Util; public abstract class LinkValue { public abstract Uri getUri(); public abstract Iterable getParams(); public static LinkValue create(Uri uri, LinkParam... params) { - return new akka.http.model.headers.LinkValue( + return new akka.http.scaladsl.model.headers.LinkValue( Util.convertUriToScala(uri), - Util.convertArray(params)); + Util.convertArray(params)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Location.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Location.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Location.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Location.java index 70e0130de2..060c2842ce 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Location.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Location.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.Uri; +import akka.http.javadsl.model.Uri; /** * Model for the `Location` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-7.1.2 */ -public abstract class Location extends akka.http.model.HttpHeader { +public abstract class Location extends akka.http.scaladsl.model.HttpHeader { public abstract Uri getUri(); public static Location create(Uri uri) { - return new akka.http.model.headers.Location(akka.http.model.japi.Util.convertUriToScala(uri)); + return new akka.http.scaladsl.model.headers.Location(akka.http.impl.util.Util.convertUriToScala(uri)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/OAuth2BearerToken.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/OAuth2BearerToken.java new file mode 100644 index 0000000000..d2f20ad9ca --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/OAuth2BearerToken.java @@ -0,0 +1,9 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +public abstract class OAuth2BearerToken extends akka.http.scaladsl.model.headers.HttpCredentials { + public abstract String token(); +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Origin.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Origin.java similarity index 52% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Origin.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Origin.java index d9c5c0f36c..086ba31882 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Origin.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Origin.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Origin` header. * Specification: http://tools.ietf.org/html/rfc6454#section-7 */ -public abstract class Origin extends akka.http.model.HttpHeader { +public abstract class Origin extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getOrigins(); public static Origin create(HttpOrigin... origins) { - return new akka.http.model.headers.Origin(akka.http.model.japi.Util.convertArray(origins)); + return new akka.http.scaladsl.model.headers.Origin(akka.http.impl.util.Util.convertArray(origins)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ProductVersion.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProductVersion.java similarity index 76% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ProductVersion.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProductVersion.java index 3b51382d79..846038c8a8 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ProductVersion.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProductVersion.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public abstract class ProductVersion { public abstract String product(); @@ -10,7 +10,7 @@ public abstract class ProductVersion { public abstract String comment(); public static ProductVersion create(String product, String version, String comment) { - return new akka.http.model.headers.ProductVersion(product, version, comment); + return new akka.http.scaladsl.model.headers.ProductVersion(product, version, comment); } public static ProductVersion create(String product, String version) { return create(product, version, ""); diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ProxyAuthenticate.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProxyAuthenticate.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ProxyAuthenticate.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProxyAuthenticate.java index d11c3b99d0..47ad02ce32 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ProxyAuthenticate.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProxyAuthenticate.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Proxy-Authenticate` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p7-auth-26#section-4.3 */ -public abstract class ProxyAuthenticate extends akka.http.model.HttpHeader { +public abstract class ProxyAuthenticate extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getChallenges(); public static ProxyAuthenticate create(HttpChallenge... challenges) { - return new akka.http.model.headers.Proxy$minusAuthenticate(akka.http.model.japi.Util.convertArray(challenges)); + return new akka.http.scaladsl.model.headers.Proxy$minusAuthenticate(akka.http.impl.util.Util.convertArray(challenges)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ProxyAuthorization.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProxyAuthorization.java similarity index 56% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/ProxyAuthorization.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProxyAuthorization.java index 251bfc907d..26e645118b 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ProxyAuthorization.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/ProxyAuthorization.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Proxy-Authorization` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p7-auth-26#section-4.4 */ -public abstract class ProxyAuthorization extends akka.http.model.HttpHeader { +public abstract class ProxyAuthorization extends akka.http.scaladsl.model.HttpHeader { public abstract HttpCredentials credentials(); public static ProxyAuthorization create(HttpCredentials credentials) { - return new akka.http.model.headers.Proxy$minusAuthorization(((akka.http.model.headers.HttpCredentials) credentials)); + return new akka.http.scaladsl.model.headers.Proxy$minusAuthorization(((akka.http.scaladsl.model.headers.HttpCredentials) credentials)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Range.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Range.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Range.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Range.java index fd34908057..873a386d13 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Range.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Range.java @@ -2,17 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Range` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-26#section-3.1 */ -public abstract class Range extends akka.http.model.HttpHeader { +public abstract class Range extends akka.http.scaladsl.model.HttpHeader { public abstract RangeUnit rangeUnit(); public abstract Iterable getRanges(); public static Range create(RangeUnit rangeUnit, ByteRange... ranges) { - return new akka.http.model.headers.Range(((akka.http.model.headers.RangeUnit) rangeUnit), akka.http.model.japi.Util.convertArray(ranges)); + return new akka.http.scaladsl.model.headers.Range(((akka.http.scaladsl.model.headers.RangeUnit) rangeUnit), akka.http.impl.util.Util.convertArray(ranges)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/RangeUnit.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RangeUnit.java similarity index 63% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/RangeUnit.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/RangeUnit.java index 433815750b..beded19459 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/RangeUnit.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RangeUnit.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; public abstract class RangeUnit { public abstract String name(); public static RangeUnit create(String name) { - return new akka.http.model.headers.RangeUnits.Other(name); + return new akka.http.scaladsl.model.headers.RangeUnits.Other(name); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RangeUnits.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RangeUnits.java new file mode 100644 index 0000000000..963374bea6 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RangeUnits.java @@ -0,0 +1,11 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +public final class RangeUnits { + private RangeUnits() {} + + public static final RangeUnit BYTES = akka.http.scaladsl.model.headers.RangeUnits.Bytes$.MODULE$; +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/RawHeader.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RawHeader.java similarity index 55% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/RawHeader.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/RawHeader.java index debb8c1220..e444d4d3bc 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/RawHeader.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RawHeader.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -public abstract class RawHeader extends akka.http.model.HttpHeader { +public abstract class RawHeader extends akka.http.scaladsl.model.HttpHeader { public abstract String name(); public abstract String value(); } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/RawRequestURI.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RawRequestURI.java similarity index 64% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/RawRequestURI.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/RawRequestURI.java index 0fd3f02518..394cca3f8c 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/RawRequestURI.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RawRequestURI.java @@ -2,17 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Raw-Request-URI` header. * Custom header we use for transporting the raw request URI either to the application (server-side) * or to the request rendering stage (client-side). */ -public abstract class RawRequestURI extends akka.http.model.HttpHeader { +public abstract class RawRequestURI extends akka.http.scaladsl.model.HttpHeader { public abstract String uri(); public static RawRequestURI create(String uri) { - return new akka.http.model.headers.Raw$minusRequest$minusURI(uri); + return new akka.http.scaladsl.model.headers.Raw$minusRequest$minusURI(uri); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Referer.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Referer.java similarity index 51% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Referer.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Referer.java index f8095a12d6..a307a02a25 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Referer.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Referer.java @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; -import akka.http.model.japi.Uri; +import akka.http.javadsl.model.Uri; /** * Model for the `Referer` header. * Specification: http://tools.ietf.org/html/rfc7231#section-5.5.2 */ -public abstract class Referer extends akka.http.model.HttpHeader { +public abstract class Referer extends akka.http.scaladsl.model.HttpHeader { public abstract Uri getUri(); public static Referer create(Uri uri) { - return new akka.http.model.headers.Referer(akka.http.model.japi.Util.convertUriToScala(uri)); + return new akka.http.scaladsl.model.headers.Referer(akka.http.impl.util.Util.convertUriToScala(uri)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RemoteAddress.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RemoteAddress.java new file mode 100644 index 0000000000..1584e3f7f9 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/RemoteAddress.java @@ -0,0 +1,17 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +/** + * Model for the `Remote-Address` header. + * Custom header we use for optionally transporting the peer's IP in an HTTP header. + */ +public abstract class RemoteAddress extends akka.http.scaladsl.model.HttpHeader { + public abstract akka.http.javadsl.model.RemoteAddress address(); + + public static RemoteAddress create(akka.http.javadsl.model.RemoteAddress address) { + return new akka.http.scaladsl.model.headers.Remote$minusAddress(((akka.http.scaladsl.model.RemoteAddress) address)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Server.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Server.java similarity index 54% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/Server.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/Server.java index 5b646a5b26..9a8fb71b87 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Server.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/Server.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Server` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-7.4.2 */ -public abstract class Server extends akka.http.model.HttpHeader { +public abstract class Server extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getProducts(); public static Server create(ProductVersion... products) { - return new akka.http.model.headers.Server(akka.http.model.japi.Util.convertArray(products)); + return new akka.http.scaladsl.model.headers.Server(akka.http.impl.util.Util.convertArray(products)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/SetCookie.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/SetCookie.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/SetCookie.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/SetCookie.java index 2bfc3a7d1d..1a4e96bd86 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/SetCookie.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/SetCookie.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `Set-Cookie` header. * Specification: https://tools.ietf.org/html/rfc6265 */ -public abstract class SetCookie extends akka.http.model.HttpHeader { +public abstract class SetCookie extends akka.http.scaladsl.model.HttpHeader { public abstract HttpCookie cookie(); public static SetCookie create(HttpCookie cookie) { - return new akka.http.model.headers.Set$minusCookie(((akka.http.model.headers.HttpCookie) cookie)); + return new akka.http.scaladsl.model.headers.Set$minusCookie(((akka.http.scaladsl.model.headers.HttpCookie) cookie)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TransferEncoding.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TransferEncoding.java new file mode 100644 index 0000000000..f8dd276385 --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TransferEncoding.java @@ -0,0 +1,17 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +/** + * Model for the `Transfer-Encoding` header. + * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-26#section-3.3.1 + */ +public abstract class TransferEncoding extends akka.http.scaladsl.model.HttpHeader { + public abstract Iterable getEncodings(); + + public static TransferEncoding create(akka.http.javadsl.model.TransferEncoding... encodings) { + return new akka.http.scaladsl.model.headers.Transfer$minusEncoding(akka.http.impl.util.Util.convertArray(encodings)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/UserAgent.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/UserAgent.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/UserAgent.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/UserAgent.java index 3e9cfb45ed..5797ebb328 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/UserAgent.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/UserAgent.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `User-Agent` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-5.5.3 */ -public abstract class UserAgent extends akka.http.model.HttpHeader { +public abstract class UserAgent extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getProducts(); public static UserAgent create(ProductVersion... products) { - return new akka.http.model.headers.User$minusAgent(akka.http.model.japi.Util.convertArray(products)); + return new akka.http.scaladsl.model.headers.User$minusAgent(akka.http.impl.util.Util.convertArray(products)); } } diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/WWWAuthenticate.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/WWWAuthenticate.java similarity index 53% rename from akka-http-core/src/main/java/akka/http/model/japi/headers/WWWAuthenticate.java rename to akka-http-core/src/main/java/akka/http/javadsl/model/headers/WWWAuthenticate.java index aac65e27f1..3919ae41eb 100644 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/WWWAuthenticate.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/WWWAuthenticate.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi.headers; +package akka.http.javadsl.model.headers; /** * Model for the `WWW-Authenticate` header. * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p7-auth-26#section-4.1 */ -public abstract class WWWAuthenticate extends akka.http.model.HttpHeader { +public abstract class WWWAuthenticate extends akka.http.scaladsl.model.HttpHeader { public abstract Iterable getChallenges(); public static WWWAuthenticate create(HttpChallenge... challenges) { - return new akka.http.model.headers.WWW$minusAuthenticate(akka.http.model.japi.Util.convertArray(challenges)); + return new akka.http.scaladsl.model.headers.WWW$minusAuthenticate(akka.http.impl.util.Util.convertArray(challenges)); } } diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/XForwardedFor.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/XForwardedFor.java new file mode 100644 index 0000000000..48b479590a --- /dev/null +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/XForwardedFor.java @@ -0,0 +1,17 @@ +/** + * Copyright (C) 2009-2014 Typesafe Inc. + */ + +package akka.http.javadsl.model.headers; + +/** + * Model for the `X-Forwarded-For` header. + * Specification: http://en.wikipedia.org/wiki/X-Forwarded-For + */ +public abstract class XForwardedFor extends akka.http.scaladsl.model.HttpHeader { + public abstract Iterable getAddresses(); + + public static XForwardedFor create(akka.http.javadsl.model.RemoteAddress... addresses) { + return new akka.http.scaladsl.model.headers.X$minusForwarded$minusFor(akka.http.impl.util.Util.convertArray(addresses)); + } +} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsets.java b/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsets.java deleted file mode 100644 index b3bb027fc4..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpCharsets.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -import akka.http.model.HttpCharsets$; -import akka.japi.Option; - -/** - * Contains a set of predefined charsets. - */ -public final class HttpCharsets { - private HttpCharsets() {} - - public static final HttpCharset US_ASCII = akka.http.model.HttpCharsets.US$minusASCII(); - public static final HttpCharset ISO_8859_1 = akka.http.model.HttpCharsets.ISO$minus8859$minus1(); - public static final HttpCharset UTF_8 = akka.http.model.HttpCharsets.UTF$minus8(); - public static final HttpCharset UTF_16 = akka.http.model.HttpCharsets.UTF$minus16(); - public static final HttpCharset UTF_16BE = akka.http.model.HttpCharsets.UTF$minus16BE(); - public static final HttpCharset UTF_16LE = akka.http.model.HttpCharsets.UTF$minus16LE(); - - /** - * Create and return a custom charset. - */ - public static HttpCharset custom(String value, String... aliases) { - return akka.http.model.HttpCharset.custom(value, Util.convertArray(aliases)); - } - - /** - * Returns Some(charset) if the charset with the given name was found and None otherwise. - */ - public static Option lookup(String name) { - return Util.lookupInRegistry(HttpCharsets$.MODULE$, name); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpMethods.java b/akka-http-core/src/main/java/akka/http/model/japi/HttpMethods.java deleted file mode 100644 index 522a672c1e..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpMethods.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -import akka.japi.Option; -import akka.http.model.HttpMethods$; - -/** - * Contains static constants for predefined method types. - */ -public final class HttpMethods { - private HttpMethods() {} - - public static final HttpMethod CONNECT = akka.http.model.HttpMethods.CONNECT(); - public static final HttpMethod DELETE = akka.http.model.HttpMethods.DELETE(); - public static final HttpMethod GET = akka.http.model.HttpMethods.GET(); - public static final HttpMethod HEAD = akka.http.model.HttpMethods.HEAD(); - public static final HttpMethod OPTIONS = akka.http.model.HttpMethods.OPTIONS(); - public static final HttpMethod PATCH = akka.http.model.HttpMethods.PATCH(); - public static final HttpMethod POST = akka.http.model.HttpMethods.POST(); - public static final HttpMethod PUT = akka.http.model.HttpMethods.PUT(); - public static final HttpMethod TRACE = akka.http.model.HttpMethods.TRACE(); - - /** - * Create a custom method type. - */ - public static HttpMethod custom(String value, boolean safe, boolean idempotent, boolean entityAccepted) { - return akka.http.model.HttpMethod.custom(value, safe, idempotent, entityAccepted); - } - - /** - * Looks up a predefined HTTP method with the given name. - */ - public static Option lookup(String name) { - return Util.lookupInRegistry(HttpMethods$.MODULE$, name); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/HttpProtocols.java b/akka-http-core/src/main/java/akka/http/model/japi/HttpProtocols.java deleted file mode 100644 index 70e5c37cf8..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/HttpProtocols.java +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -/** - * Contains constants of the supported Http protocols. - */ -public final class HttpProtocols { - private HttpProtocols() {} - - final HttpProtocol HTTP_1_0 = akka.http.model.HttpProtocols.HTTP$div1$u002E0(); - final HttpProtocol HTTP_1_1 = akka.http.model.HttpProtocols.HTTP$div1$u002E1(); -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/MediaRanges.java b/akka-http-core/src/main/java/akka/http/model/japi/MediaRanges.java deleted file mode 100644 index 8d7c19a4ae..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/MediaRanges.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -import java.util.Map; - -/** - * Contains a set of predefined media-ranges and static methods to create custom ones. - */ -public final class MediaRanges { - private MediaRanges() {} - - public static final MediaRange ALL = akka.http.model.MediaRanges.$times$div$times(); - public static final MediaRange ALL_APPLICATION = akka.http.model.MediaRanges.application$div$times(); - public static final MediaRange ALL_AUDIO = akka.http.model.MediaRanges.audio$div$times(); - public static final MediaRange ALL_IMAGE = akka.http.model.MediaRanges.image$div$times(); - public static final MediaRange ALL_MESSAGE = akka.http.model.MediaRanges.message$div$times(); - public static final MediaRange ALL_MULTIPART = akka.http.model.MediaRanges.multipart$div$times(); - public static final MediaRange ALL_TEXT = akka.http.model.MediaRanges.text$div$times(); - public static final MediaRange ALL_VIDEO = akka.http.model.MediaRanges.video$div$times(); - - /** - * Creates a custom universal media-range for a given main-type. - */ - public static MediaRange create(MediaType mediaType) { - return akka.http.model.MediaRange.apply((akka.http.model.MediaType) mediaType); - } - - /** - * Creates a custom universal media-range for a given main-type and a Map of parameters. - */ - public static MediaRange custom(String mainType, Map parameters) { - return akka.http.model.MediaRange.custom(mainType, Util.convertMapToScala(parameters), 1.0f); - } - - /** - * Creates a custom universal media-range for a given main-type and qValue. - */ - public static MediaRange create(MediaType mediaType, float qValue) { - return akka.http.model.MediaRange.apply((akka.http.model.MediaType) mediaType, qValue); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/MediaTypes.java b/akka-http-core/src/main/java/akka/http/model/japi/MediaTypes.java deleted file mode 100644 index 2efa6df2cf..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/MediaTypes.java +++ /dev/null @@ -1,200 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -import akka.http.model.MediaTypes$; -import akka.japi.Option; - -import java.util.Map; - -/** - * Contains the set of predefined media-types. - */ -public abstract class MediaTypes { - public static final MediaType APPLICATION_ATOM_XML = akka.http.model.MediaTypes.application$divatom$plusxml(); - public static final MediaType APPLICATION_BASE64 = akka.http.model.MediaTypes.application$divbase64(); - public static final MediaType APPLICATION_EXCEL = akka.http.model.MediaTypes.application$divexcel(); - public static final MediaType APPLICATION_FONT_WOFF = akka.http.model.MediaTypes.application$divfont$minuswoff(); - public static final MediaType APPLICATION_GNUTAR = akka.http.model.MediaTypes.application$divgnutar(); - public static final MediaType APPLICATION_JAVA_ARCHIVE = akka.http.model.MediaTypes.application$divjava$minusarchive(); - public static final MediaType APPLICATION_JAVASCRIPT = akka.http.model.MediaTypes.application$divjavascript(); - public static final MediaType APPLICATION_JSON = akka.http.model.MediaTypes.application$divjson(); - public static final MediaType APPLICATION_JSON_PATCH_JSON = akka.http.model.MediaTypes.application$divjson$minuspatch$plusjson(); - public static final MediaType APPLICATION_LHA = akka.http.model.MediaTypes.application$divlha(); - public static final MediaType APPLICATION_LZX = akka.http.model.MediaTypes.application$divlzx(); - public static final MediaType APPLICATION_MSPOWERPOINT = akka.http.model.MediaTypes.application$divmspowerpoint(); - public static final MediaType APPLICATION_MSWORD = akka.http.model.MediaTypes.application$divmsword(); - public static final MediaType APPLICATION_OCTET_STREAM = akka.http.model.MediaTypes.application$divoctet$minusstream(); - public static final MediaType APPLICATION_PDF = akka.http.model.MediaTypes.application$divpdf(); - public static final MediaType APPLICATION_POSTSCRIPT = akka.http.model.MediaTypes.application$divpostscript(); - public static final MediaType APPLICATION_RSS_XML = akka.http.model.MediaTypes.application$divrss$plusxml(); - public static final MediaType APPLICATION_SOAP_XML = akka.http.model.MediaTypes.application$divsoap$plusxml(); - public static final MediaType APPLICATION_VND_API_JSON = akka.http.model.MediaTypes.application$divvnd$u002Eapi$plusjson(); - public static final MediaType APPLICATION_VND_GOOGLE_EARTH_KML_XML = akka.http.model.MediaTypes.application$divvnd$u002Egoogle$minusearth$u002Ekml$plusxml(); - public static final MediaType APPLICATION_VND_GOOGLE_EARTH_KMZ = akka.http.model.MediaTypes.application$divvnd$u002Egoogle$minusearth$u002Ekmz(); - public static final MediaType APPLICATION_VND_MS_FONTOBJECT = akka.http.model.MediaTypes.application$divvnd$u002Ems$minusfontobject(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_CHART = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Echart(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_DATABASE = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Edatabase(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_FORMULA = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Eformula(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_GRAPHICS = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Egraphics(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_IMAGE = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Eimage(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_PRESENTATION = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Epresentation(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_SPREADSHEET = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Espreadsheet(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Etext(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_MASTER = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Etext$minusmaster(); - public static final MediaType APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_WEB = akka.http.model.MediaTypes.application$divvnd$u002Eoasis$u002Eopendocument$u002Etext$minusweb(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_PRESENTATION = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Epresentation(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_SLIDE = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Eslide(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_SLIDESHOW = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Eslideshow(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_PRESENTATIONML_TEMPLATE = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Epresentationml$u002Etemplate(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_SPREADSHEETML_SHEET = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Espreadsheetml$u002Esheet(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_SPREADSHEETML_TEMPLATE = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Espreadsheetml$u002Etemplate(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_WORDPROCESSINGML_DOCUMENT = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Ewordprocessingml$u002Edocument(); - public static final MediaType APPLICATION_VND_OPENXMLFORMATS_OFFICEDOCUMENT_WORDPROCESSINGML_TEMPLATE = akka.http.model.MediaTypes.application$divvnd$u002Eopenxmlformats$minusofficedocument$u002Ewordprocessingml$u002Etemplate(); - public static final MediaType APPLICATION_X_7Z_COMPRESSED = akka.http.model.MediaTypes.application$divx$minus7z$minuscompressed(); - public static final MediaType APPLICATION_X_ACE_COMPRESSED = akka.http.model.MediaTypes.application$divx$minusace$minuscompressed(); - public static final MediaType APPLICATION_X_APPLE_DISKIMAGE = akka.http.model.MediaTypes.application$divx$minusapple$minusdiskimage(); - public static final MediaType APPLICATION_X_ARC_COMPRESSED = akka.http.model.MediaTypes.application$divx$minusarc$minuscompressed(); - public static final MediaType APPLICATION_X_BZIP = akka.http.model.MediaTypes.application$divx$minusbzip(); - public static final MediaType APPLICATION_X_BZIP2 = akka.http.model.MediaTypes.application$divx$minusbzip2(); - public static final MediaType APPLICATION_X_CHROME_EXTENSION = akka.http.model.MediaTypes.application$divx$minuschrome$minusextension(); - public static final MediaType APPLICATION_X_COMPRESS = akka.http.model.MediaTypes.application$divx$minuscompress(); - public static final MediaType APPLICATION_X_COMPRESSED = akka.http.model.MediaTypes.application$divx$minuscompressed(); - public static final MediaType APPLICATION_X_DEBIAN_PACKAGE = akka.http.model.MediaTypes.application$divx$minusdebian$minuspackage(); - public static final MediaType APPLICATION_X_DVI = akka.http.model.MediaTypes.application$divx$minusdvi(); - public static final MediaType APPLICATION_X_FONT_TRUETYPE = akka.http.model.MediaTypes.application$divx$minusfont$minustruetype(); - public static final MediaType APPLICATION_X_FONT_OPENTYPE = akka.http.model.MediaTypes.application$divx$minusfont$minusopentype(); - public static final MediaType APPLICATION_X_GTAR = akka.http.model.MediaTypes.application$divx$minusgtar(); - public static final MediaType APPLICATION_X_GZIP = akka.http.model.MediaTypes.application$divx$minusgzip(); - public static final MediaType APPLICATION_X_LATEX = akka.http.model.MediaTypes.application$divx$minuslatex(); - public static final MediaType APPLICATION_X_RAR_COMPRESSED = akka.http.model.MediaTypes.application$divx$minusrar$minuscompressed(); - public static final MediaType APPLICATION_X_REDHAT_PACKAGE_MANAGER = akka.http.model.MediaTypes.application$divx$minusredhat$minuspackage$minusmanager(); - public static final MediaType APPLICATION_X_SHOCKWAVE_FLASH = akka.http.model.MediaTypes.application$divx$minusshockwave$minusflash(); - public static final MediaType APPLICATION_X_TAR = akka.http.model.MediaTypes.application$divx$minustar(); - public static final MediaType APPLICATION_X_TEX = akka.http.model.MediaTypes.application$divx$minustex(); - public static final MediaType APPLICATION_X_TEXINFO = akka.http.model.MediaTypes.application$divx$minustexinfo(); - public static final MediaType APPLICATION_X_VRML = akka.http.model.MediaTypes.application$divx$minusvrml(); - public static final MediaType APPLICATION_X_WWW_FORM_URLENCODED = akka.http.model.MediaTypes.application$divx$minuswww$minusform$minusurlencoded(); - public static final MediaType APPLICATION_X_X509_CA_CERT = akka.http.model.MediaTypes.application$divx$minusx509$minusca$minuscert(); - public static final MediaType APPLICATION_X_XPINSTALL = akka.http.model.MediaTypes.application$divx$minusxpinstall(); - public static final MediaType APPLICATION_XHTML_XML = akka.http.model.MediaTypes.application$divxhtml$plusxml(); - public static final MediaType APPLICATION_XML_DTD = akka.http.model.MediaTypes.application$divxml$minusdtd(); - public static final MediaType APPLICATION_XML = akka.http.model.MediaTypes.application$divxml(); - public static final MediaType APPLICATION_ZIP = akka.http.model.MediaTypes.application$divzip(); - public static final MediaType AUDIO_AIFF = akka.http.model.MediaTypes.audio$divaiff(); - public static final MediaType AUDIO_BASIC = akka.http.model.MediaTypes.audio$divbasic(); - public static final MediaType AUDIO_MIDI = akka.http.model.MediaTypes.audio$divmidi(); - public static final MediaType AUDIO_MOD = akka.http.model.MediaTypes.audio$divmod(); - public static final MediaType AUDIO_MPEG = akka.http.model.MediaTypes.audio$divmpeg(); - public static final MediaType AUDIO_OGG = akka.http.model.MediaTypes.audio$divogg(); - public static final MediaType AUDIO_VOC = akka.http.model.MediaTypes.audio$divvoc(); - public static final MediaType AUDIO_VORBIS = akka.http.model.MediaTypes.audio$divvorbis(); - public static final MediaType AUDIO_VOXWARE = akka.http.model.MediaTypes.audio$divvoxware(); - public static final MediaType AUDIO_WAV = akka.http.model.MediaTypes.audio$divwav(); - public static final MediaType AUDIO_X_REALAUDIO = akka.http.model.MediaTypes.audio$divx$minusrealaudio(); - public static final MediaType AUDIO_X_PSID = akka.http.model.MediaTypes.audio$divx$minuspsid(); - public static final MediaType AUDIO_XM = akka.http.model.MediaTypes.audio$divxm(); - public static final MediaType AUDIO_WEBM = akka.http.model.MediaTypes.audio$divwebm(); - public static final MediaType IMAGE_GIF = akka.http.model.MediaTypes.image$divgif(); - public static final MediaType IMAGE_JPEG = akka.http.model.MediaTypes.image$divjpeg(); - public static final MediaType IMAGE_PICT = akka.http.model.MediaTypes.image$divpict(); - public static final MediaType IMAGE_PNG = akka.http.model.MediaTypes.image$divpng(); - public static final MediaType IMAGE_SVG_XML = akka.http.model.MediaTypes.image$divsvg$plusxml(); - public static final MediaType IMAGE_TIFF = akka.http.model.MediaTypes.image$divtiff(); - public static final MediaType IMAGE_X_ICON = akka.http.model.MediaTypes.image$divx$minusicon(); - public static final MediaType IMAGE_X_MS_BMP = akka.http.model.MediaTypes.image$divx$minusms$minusbmp(); - public static final MediaType IMAGE_X_PCX = akka.http.model.MediaTypes.image$divx$minuspcx(); - public static final MediaType IMAGE_X_PICT = akka.http.model.MediaTypes.image$divx$minuspict(); - public static final MediaType IMAGE_X_QUICKTIME = akka.http.model.MediaTypes.image$divx$minusquicktime(); - public static final MediaType IMAGE_X_RGB = akka.http.model.MediaTypes.image$divx$minusrgb(); - public static final MediaType IMAGE_X_XBITMAP = akka.http.model.MediaTypes.image$divx$minusxbitmap(); - public static final MediaType IMAGE_X_XPIXMAP = akka.http.model.MediaTypes.image$divx$minusxpixmap(); - public static final MediaType IMAGE_WEBP = akka.http.model.MediaTypes.image$divwebp(); - public static final MediaType MESSAGE_HTTP = akka.http.model.MediaTypes.message$divhttp(); - public static final MediaType MESSAGE_DELIVERY_STATUS = akka.http.model.MediaTypes.message$divdelivery$minusstatus(); - public static final MediaType MESSAGE_RFC822 = akka.http.model.MediaTypes.message$divrfc822(); - public static final MediaType MULTIPART_MIXED = akka.http.model.MediaTypes.multipart$divmixed(); - public static final MediaType MULTIPART_ALTERNATIVE = akka.http.model.MediaTypes.multipart$divalternative(); - public static final MediaType MULTIPART_RELATED = akka.http.model.MediaTypes.multipart$divrelated(); - public static final MediaType MULTIPART_FORM_DATA = akka.http.model.MediaTypes.multipart$divform$minusdata(); - public static final MediaType MULTIPART_SIGNED = akka.http.model.MediaTypes.multipart$divsigned(); - public static final MediaType MULTIPART_ENCRYPTED = akka.http.model.MediaTypes.multipart$divencrypted(); - public static final MediaType MULTIPART_BYTERANGES = akka.http.model.MediaTypes.multipart$divbyteranges(); - public static final MediaType TEXT_ASP = akka.http.model.MediaTypes.text$divasp(); - public static final MediaType TEXT_CACHE_MANIFEST = akka.http.model.MediaTypes.text$divcache$minusmanifest(); - public static final MediaType TEXT_CALENDAR = akka.http.model.MediaTypes.text$divcalendar(); - public static final MediaType TEXT_CSS = akka.http.model.MediaTypes.text$divcss(); - public static final MediaType TEXT_CSV = akka.http.model.MediaTypes.text$divcsv(); - public static final MediaType TEXT_HTML = akka.http.model.MediaTypes.text$divhtml(); - public static final MediaType TEXT_MCF = akka.http.model.MediaTypes.text$divmcf(); - public static final MediaType TEXT_PLAIN = akka.http.model.MediaTypes.text$divplain(); - public static final MediaType TEXT_RICHTEXT = akka.http.model.MediaTypes.text$divrichtext(); - public static final MediaType TEXT_TAB_SEPARATED_VALUES = akka.http.model.MediaTypes.text$divtab$minusseparated$minusvalues(); - public static final MediaType TEXT_URI_LIST = akka.http.model.MediaTypes.text$divuri$minuslist(); - public static final MediaType TEXT_VND_WAP_WML = akka.http.model.MediaTypes.text$divvnd$u002Ewap$u002Ewml(); - public static final MediaType TEXT_VND_WAP_WMLSCRIPT = akka.http.model.MediaTypes.text$divvnd$u002Ewap$u002Ewmlscript(); - public static final MediaType TEXT_X_ASM = akka.http.model.MediaTypes.text$divx$minusasm(); - public static final MediaType TEXT_X_C = akka.http.model.MediaTypes.text$divx$minusc(); - public static final MediaType TEXT_X_COMPONENT = akka.http.model.MediaTypes.text$divx$minuscomponent(); - public static final MediaType TEXT_X_H = akka.http.model.MediaTypes.text$divx$minush(); - public static final MediaType TEXT_X_JAVA_SOURCE = akka.http.model.MediaTypes.text$divx$minusjava$minussource(); - public static final MediaType TEXT_X_PASCAL = akka.http.model.MediaTypes.text$divx$minuspascal(); - public static final MediaType TEXT_X_SCRIPT = akka.http.model.MediaTypes.text$divx$minusscript(); - public static final MediaType TEXT_X_SCRIPTCSH = akka.http.model.MediaTypes.text$divx$minusscriptcsh(); - public static final MediaType TEXT_X_SCRIPTELISP = akka.http.model.MediaTypes.text$divx$minusscriptelisp(); - public static final MediaType TEXT_X_SCRIPTKSH = akka.http.model.MediaTypes.text$divx$minusscriptksh(); - public static final MediaType TEXT_X_SCRIPTLISP = akka.http.model.MediaTypes.text$divx$minusscriptlisp(); - public static final MediaType TEXT_X_SCRIPTPERL = akka.http.model.MediaTypes.text$divx$minusscriptperl(); - public static final MediaType TEXT_X_SCRIPTPERL_MODULE = akka.http.model.MediaTypes.text$divx$minusscriptperl$minusmodule(); - public static final MediaType TEXT_X_SCRIPTPHYTON = akka.http.model.MediaTypes.text$divx$minusscriptphyton(); - public static final MediaType TEXT_X_SCRIPTREXX = akka.http.model.MediaTypes.text$divx$minusscriptrexx(); - public static final MediaType TEXT_X_SCRIPTSCHEME = akka.http.model.MediaTypes.text$divx$minusscriptscheme(); - public static final MediaType TEXT_X_SCRIPTSH = akka.http.model.MediaTypes.text$divx$minusscriptsh(); - public static final MediaType TEXT_X_SCRIPTTCL = akka.http.model.MediaTypes.text$divx$minusscripttcl(); - public static final MediaType TEXT_X_SCRIPTTCSH = akka.http.model.MediaTypes.text$divx$minusscripttcsh(); - public static final MediaType TEXT_X_SCRIPTZSH = akka.http.model.MediaTypes.text$divx$minusscriptzsh(); - public static final MediaType TEXT_X_SERVER_PARSED_HTML = akka.http.model.MediaTypes.text$divx$minusserver$minusparsed$minushtml(); - public static final MediaType TEXT_X_SETEXT = akka.http.model.MediaTypes.text$divx$minussetext(); - public static final MediaType TEXT_X_SGML = akka.http.model.MediaTypes.text$divx$minussgml(); - public static final MediaType TEXT_X_SPEECH = akka.http.model.MediaTypes.text$divx$minusspeech(); - public static final MediaType TEXT_X_UUENCODE = akka.http.model.MediaTypes.text$divx$minusuuencode(); - public static final MediaType TEXT_X_VCALENDAR = akka.http.model.MediaTypes.text$divx$minusvcalendar(); - public static final MediaType TEXT_X_VCARD = akka.http.model.MediaTypes.text$divx$minusvcard(); - public static final MediaType TEXT_XML = akka.http.model.MediaTypes.text$divxml(); - public static final MediaType VIDEO_AVS_VIDEO = akka.http.model.MediaTypes.video$divavs$minusvideo(); - public static final MediaType VIDEO_DIVX = akka.http.model.MediaTypes.video$divdivx(); - public static final MediaType VIDEO_GL = akka.http.model.MediaTypes.video$divgl(); - public static final MediaType VIDEO_MP4 = akka.http.model.MediaTypes.video$divmp4(); - public static final MediaType VIDEO_MPEG = akka.http.model.MediaTypes.video$divmpeg(); - public static final MediaType VIDEO_OGG = akka.http.model.MediaTypes.video$divogg(); - public static final MediaType VIDEO_QUICKTIME = akka.http.model.MediaTypes.video$divquicktime(); - public static final MediaType VIDEO_X_DV = akka.http.model.MediaTypes.video$divx$minusdv(); - public static final MediaType VIDEO_X_FLV = akka.http.model.MediaTypes.video$divx$minusflv(); - public static final MediaType VIDEO_X_MOTION_JPEG = akka.http.model.MediaTypes.video$divx$minusmotion$minusjpeg(); - public static final MediaType VIDEO_X_MS_ASF = akka.http.model.MediaTypes.video$divx$minusms$minusasf(); - public static final MediaType VIDEO_X_MSVIDEO = akka.http.model.MediaTypes.video$divx$minusmsvideo(); - public static final MediaType VIDEO_X_SGI_MOVIE = akka.http.model.MediaTypes.video$divx$minussgi$minusmovie(); - public static final MediaType VIDEO_WEBM = akka.http.model.MediaTypes.video$divwebm(); - - /** - * Creates a custom media type. - */ - public static MediaType custom( - String mainType, - String subType, - boolean compressible, - akka.http.model.MediaType.Encoding encoding, - Iterable fileExtensions, - Map params) { - return akka.http.model.MediaType.custom(mainType, subType, encoding, compressible, Util.convertIterable(fileExtensions), Util.convertMapToScala(params), false); - } - - /** - * Looks up a media-type with the given main-type and sub-type. - */ - public static Option lookup(String mainType, String subType) { - return Util., MediaType, akka.http.model.MediaType>lookupInRegistry(MediaTypes$.MODULE$, new scala.Tuple2(mainType, subType)); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/StatusCodes.java b/akka-http-core/src/main/java/akka/http/model/japi/StatusCodes.java deleted file mode 100644 index 3e306da242..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/StatusCodes.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -import akka.http.model.StatusCodes$; -import akka.japi.Option; - -/** - * Contains the set of predefined status-codes along with static methods to access and create custom - * status-codes. - */ -public final class StatusCodes { - private StatusCodes() {} - - public static final StatusCode CONTINUE = akka.http.model.StatusCodes.Continue(); - public static final StatusCode SWITCHING_PROTOCOLS = akka.http.model.StatusCodes.SwitchingProtocols(); - public static final StatusCode PROCESSING = akka.http.model.StatusCodes.Processing(); - - public static final StatusCode OK = akka.http.model.StatusCodes.OK(); - public static final StatusCode CREATED = akka.http.model.StatusCodes.Created(); - public static final StatusCode ACCEPTED = akka.http.model.StatusCodes.Accepted(); - public static final StatusCode NON_AUTHORITATIVE_INFORMATION = akka.http.model.StatusCodes.NonAuthoritativeInformation(); - public static final StatusCode NO_CONTENT = akka.http.model.StatusCodes.NoContent(); - public static final StatusCode RESET_CONTENT = akka.http.model.StatusCodes.ResetContent(); - public static final StatusCode PARTIAL_CONTENT = akka.http.model.StatusCodes.PartialContent(); - public static final StatusCode MULTI_STATUS = akka.http.model.StatusCodes.MultiStatus(); - public static final StatusCode ALREADY_REPORTED = akka.http.model.StatusCodes.AlreadyReported(); - public static final StatusCode IMUSED = akka.http.model.StatusCodes.IMUsed(); - - public static final StatusCode MULTIPLE_CHOICES = akka.http.model.StatusCodes.MultipleChoices(); - public static final StatusCode MOVED_PERMANENTLY = akka.http.model.StatusCodes.MovedPermanently(); - public static final StatusCode FOUND = akka.http.model.StatusCodes.Found(); - public static final StatusCode SEE_OTHER = akka.http.model.StatusCodes.SeeOther(); - public static final StatusCode NOT_MODIFIED = akka.http.model.StatusCodes.NotModified(); - public static final StatusCode USE_PROXY = akka.http.model.StatusCodes.UseProxy(); - public static final StatusCode TEMPORARY_REDIRECT = akka.http.model.StatusCodes.TemporaryRedirect(); - public static final StatusCode PERMANENT_REDIRECT = akka.http.model.StatusCodes.PermanentRedirect(); - - public static final StatusCode BAD_REQUEST = akka.http.model.StatusCodes.BadRequest(); - public static final StatusCode UNAUTHORIZED = akka.http.model.StatusCodes.Unauthorized(); - public static final StatusCode PAYMENT_REQUIRED = akka.http.model.StatusCodes.PaymentRequired(); - public static final StatusCode FORBIDDEN = akka.http.model.StatusCodes.Forbidden(); - public static final StatusCode NOT_FOUND = akka.http.model.StatusCodes.NotFound(); - public static final StatusCode METHOD_NOT_ALLOWED = akka.http.model.StatusCodes.MethodNotAllowed(); - public static final StatusCode NOT_ACCEPTABLE = akka.http.model.StatusCodes.NotAcceptable(); - public static final StatusCode PROXY_AUTHENTICATION_REQUIRED = akka.http.model.StatusCodes.ProxyAuthenticationRequired(); - public static final StatusCode REQUEST_TIMEOUT = akka.http.model.StatusCodes.RequestTimeout(); - public static final StatusCode CONFLICT = akka.http.model.StatusCodes.Conflict(); - public static final StatusCode GONE = akka.http.model.StatusCodes.Gone(); - public static final StatusCode LENGTH_REQUIRED = akka.http.model.StatusCodes.LengthRequired(); - public static final StatusCode PRECONDITION_FAILED = akka.http.model.StatusCodes.PreconditionFailed(); - public static final StatusCode REQUEST_ENTITY_TOO_LARGE = akka.http.model.StatusCodes.RequestEntityTooLarge(); - public static final StatusCode REQUEST_URI_TOO_LONG = akka.http.model.StatusCodes.RequestUriTooLong(); - public static final StatusCode UNSUPPORTED_MEDIA_TYPE = akka.http.model.StatusCodes.UnsupportedMediaType(); - public static final StatusCode REQUESTED_RANGE_NOT_SATISFIABLE = akka.http.model.StatusCodes.RequestedRangeNotSatisfiable(); - public static final StatusCode EXPECTATION_FAILED = akka.http.model.StatusCodes.ExpectationFailed(); - public static final StatusCode ENHANCE_YOUR_CALM = akka.http.model.StatusCodes.EnhanceYourCalm(); - public static final StatusCode UNPROCESSABLE_ENTITY = akka.http.model.StatusCodes.UnprocessableEntity(); - public static final StatusCode LOCKED = akka.http.model.StatusCodes.Locked(); - public static final StatusCode FAILED_DEPENDENCY = akka.http.model.StatusCodes.FailedDependency(); - public static final StatusCode UNORDERED_COLLECTION = akka.http.model.StatusCodes.UnorderedCollection(); - public static final StatusCode UPGRADE_REQUIRED = akka.http.model.StatusCodes.UpgradeRequired(); - public static final StatusCode PRECONDITION_REQUIRED = akka.http.model.StatusCodes.PreconditionRequired(); - public static final StatusCode TOO_MANY_REQUESTS = akka.http.model.StatusCodes.TooManyRequests(); - public static final StatusCode REQUEST_HEADER_FIELDS_TOO_LARGE = akka.http.model.StatusCodes.RequestHeaderFieldsTooLarge(); - public static final StatusCode RETRY_WITH = akka.http.model.StatusCodes.RetryWith(); - public static final StatusCode BLOCKED_BY_PARENTAL_CONTROLS = akka.http.model.StatusCodes.BlockedByParentalControls(); - public static final StatusCode UNAVAILABLE_FOR_LEGAL_REASONS = akka.http.model.StatusCodes.UnavailableForLegalReasons(); - - public static final StatusCode INTERNAL_SERVER_ERROR = akka.http.model.StatusCodes.InternalServerError(); - public static final StatusCode NOT_IMPLEMENTED = akka.http.model.StatusCodes.NotImplemented(); - public static final StatusCode BAD_GATEWAY = akka.http.model.StatusCodes.BadGateway(); - public static final StatusCode SERVICE_UNAVAILABLE = akka.http.model.StatusCodes.ServiceUnavailable(); - public static final StatusCode GATEWAY_TIMEOUT = akka.http.model.StatusCodes.GatewayTimeout(); - public static final StatusCode HTTPVERSION_NOT_SUPPORTED = akka.http.model.StatusCodes.HTTPVersionNotSupported(); - public static final StatusCode VARIANT_ALSO_NEGOTIATES = akka.http.model.StatusCodes.VariantAlsoNegotiates(); - public static final StatusCode INSUFFICIENT_STORAGE = akka.http.model.StatusCodes.InsufficientStorage(); - public static final StatusCode LOOP_DETECTED = akka.http.model.StatusCodes.LoopDetected(); - public static final StatusCode BANDWIDTH_LIMIT_EXCEEDED = akka.http.model.StatusCodes.BandwidthLimitExceeded(); - public static final StatusCode NOT_EXTENDED = akka.http.model.StatusCodes.NotExtended(); - public static final StatusCode NETWORK_AUTHENTICATION_REQUIRED = akka.http.model.StatusCodes.NetworkAuthenticationRequired(); - public static final StatusCode NETWORK_READ_TIMEOUT = akka.http.model.StatusCodes.NetworkReadTimeout(); - public static final StatusCode NETWORK_CONNECT_TIMEOUT = akka.http.model.StatusCodes.NetworkConnectTimeout(); - - /** - * Create a custom status code. - */ - public static StatusCode custom(int intValue, String reason, String defaultMessage, boolean isSuccess, boolean allowsEntity) { - return akka.http.model.StatusCodes.custom(intValue, reason, defaultMessage, isSuccess, allowsEntity); - } - - /** - * Create a custom status code. - */ - public static StatusCode custom(int intValue, String reason, String defaultMessage) { - return akka.http.model.StatusCodes.custom(intValue, reason, defaultMessage); - } - - /** - * Looks up a status-code by numeric code. Throws an exception if no such status-code is found. - */ - public static StatusCode get(int intValue) { - return akka.http.model.StatusCode.int2StatusCode(intValue); - } - - /** - * Looks up a status-code by numeric code and returns Some(code). Returns None otherwise. - */ - public static Option lookup(int intValue) { - return Util.lookupInRegistry(StatusCodes$.MODULE$, intValue); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/TransferEncodings.java b/akka-http-core/src/main/java/akka/http/model/japi/TransferEncodings.java deleted file mode 100644 index 7b9d422167..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/TransferEncodings.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi; - -public final class TransferEncodings { - private TransferEncodings() {} - - public static final TransferEncoding CHUNKED = akka.http.model.TransferEncodings.chunked$.MODULE$; - public static final TransferEncoding COMPRESS = akka.http.model.TransferEncodings.compress$.MODULE$; - public static final TransferEncoding DEFLATE = akka.http.model.TransferEncodings.deflate$.MODULE$; - public static final TransferEncoding GZIP = akka.http.model.TransferEncodings.gzip$.MODULE$; -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptEncoding.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptEncoding.java deleted file mode 100644 index 4b268600e4..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/AcceptEncoding.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -/** - * Model for the `Accept-Encoding` header. - * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-5.3.4 - */ -public abstract class AcceptEncoding extends akka.http.model.HttpHeader { - public abstract Iterable getEncodings(); - - public static AcceptEncoding create(HttpEncoding encoding) { - return new akka.http.model.headers.Accept$minusEncoding(akka.http.model.japi.Util.convertArray(new HttpEncodingRange[] {encoding.toRange()})); - } - public static AcceptEncoding create(HttpEncodingRange... encodings) { - return new akka.http.model.headers.Accept$minusEncoding(akka.http.model.japi.Util.convertArray(encodings)); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheDirectives.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheDirectives.java deleted file mode 100644 index d7936de125..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/CacheDirectives.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -public final class CacheDirectives { - private CacheDirectives() {} - - public static CacheDirective MAX_AGE(long deltaSeconds) { - return new akka.http.model.headers.CacheDirectives.max$minusage(deltaSeconds); - } - public static CacheDirective MAX_STALE() { - return new akka.http.model.headers.CacheDirectives.max$minusstale(akka.japi.Option.none().asScala()); - } - public static CacheDirective MAX_STALE(long deltaSeconds) { - return new akka.http.model.headers.CacheDirectives.max$minusstale(akka.japi.Option.some((Object) deltaSeconds).asScala()); - } - public static CacheDirective MIN_FRESH(long deltaSeconds) { - return new akka.http.model.headers.CacheDirectives.min$minusfresh(deltaSeconds); - } - - public static final CacheDirective NO_CACHE = akka.http.model.headers.CacheDirectives.no$minuscache$.MODULE$; - public static final CacheDirective NO_STORE = akka.http.model.headers.CacheDirectives.no$minusstore$.MODULE$; - public static final CacheDirective NO_TRANSFORM = akka.http.model.headers.CacheDirectives.no$minustransform$.MODULE$; - public static final CacheDirective ONLY_IF_CACHED = akka.http.model.headers.CacheDirectives.only$minusif$minuscached$.MODULE$; - public static final CacheDirective MUST_REVALIDATE = akka.http.model.headers.CacheDirectives.must$minusrevalidate$.MODULE$; - - public static CacheDirective NO_CACHE(String... fieldNames) { - return akka.http.model.headers.CacheDirectives.no$minuscache$.MODULE$.apply(fieldNames); - } - public static final CacheDirective PUBLIC = akka.http.model.headers.CacheDirectives.getPublic(); - public static CacheDirective PRIVATE(String... fieldNames) { - return akka.http.model.headers.CacheDirectives.createPrivate(fieldNames); - } - public static final CacheDirective PROXY_REVALIDATE = akka.http.model.headers.CacheDirectives.proxy$minusrevalidate$.MODULE$; - public static CacheDirective S_MAXAGE(long deltaSeconds) { - return new akka.http.model.headers.CacheDirectives.s$minusmaxage(deltaSeconds); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentRange.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentRange.java deleted file mode 100644 index ee58f56527..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentRange.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -/** - * Model for the `Content-Range` header. - * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-26#section-4.2 - */ -public abstract class ContentRange extends akka.http.model.HttpHeader { - public abstract RangeUnit rangeUnit(); - public abstract akka.http.model.japi.ContentRange contentRange(); - - public static ContentRange create(RangeUnit rangeUnit, akka.http.model.japi.ContentRange contentRange) { - return new akka.http.model.headers.Content$minusRange(((akka.http.model.headers.RangeUnit) rangeUnit), ((akka.http.model.ContentRange) contentRange)); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentType.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentType.java deleted file mode 100644 index ec52c0cdda..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/ContentType.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -/** - * Model for the `Content-Type` header. - * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-26#section-3.1.1.5 - */ -public abstract class ContentType extends akka.http.model.HttpHeader { - public abstract akka.http.model.japi.ContentType contentType(); - - public static ContentType create(akka.http.model.japi.ContentType contentType) { - return new akka.http.model.headers.Content$minusType(((akka.http.model.ContentType) contentType)); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/EntityTagRange.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/EntityTagRange.java deleted file mode 100644 index f3e798fbde..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/EntityTagRange.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -import akka.http.model.japi.Util; - -public abstract class EntityTagRange { - public static EntityTagRange create(EntityTag... tags) { - return akka.http.model.headers.EntityTagRange.apply(Util.convertArray(tags)); - } - public static final EntityTagRange ALL = akka.http.model.headers.EntityTagRange.$times$.MODULE$; -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/Host.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/Host.java deleted file mode 100644 index b032fd11ea..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/Host.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -public abstract class Host extends akka.http.model.HttpHeader { - public abstract akka.http.model.japi.Host host(); - public abstract int port(); -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncodings.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncodings.java deleted file mode 100644 index b704d22677..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/HttpEncodings.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -public final class HttpEncodings { - private HttpEncodings() {} - - public static final HttpEncoding CHUNKED = akka.http.model.headers.HttpEncodings.chunked(); - public static final HttpEncoding COMPRESS = akka.http.model.headers.HttpEncodings.compress(); - public static final HttpEncoding DEFLATE = akka.http.model.headers.HttpEncodings.deflate(); - public static final HttpEncoding GZIP = akka.http.model.headers.HttpEncodings.gzip(); - public static final HttpEncoding IDENTITY = akka.http.model.headers.HttpEncodings.identity(); - public static final HttpEncoding X_COMPRESS = akka.http.model.headers.HttpEncodings.x$minuscompress(); - public static final HttpEncoding X_ZIP = akka.http.model.headers.HttpEncodings.x$minuszip(); -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkParams.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkParams.java deleted file mode 100644 index e828a50f44..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/LinkParams.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -import akka.http.model.japi.MediaType; -import akka.http.model.japi.Uri; -import akka.http.model.japi.Util; - -public final class LinkParams { - private LinkParams() {} - - public static final LinkParam next = akka.http.model.headers.LinkParams.next(); - public static final LinkParam prev = akka.http.model.headers.LinkParams.prev(); - public static final LinkParam first = akka.http.model.headers.LinkParams.first(); - public static final LinkParam last = akka.http.model.headers.LinkParams.last(); - - public static LinkParam rel(String value) { - return new akka.http.model.headers.LinkParams.rel(value); - } - public static LinkParam anchor(Uri uri) { - return new akka.http.model.headers.LinkParams.anchor(Util.convertUriToScala(uri)); - } - public static LinkParam rev(String value) { - return new akka.http.model.headers.LinkParams.rev(value); - } - public static LinkParam hreflang(Language language) { - return new akka.http.model.headers.LinkParams.hreflang((akka.http.model.headers.Language) language); - } - public static LinkParam media(String desc) { - return new akka.http.model.headers.LinkParams.media(desc); - } - public static LinkParam title(String title) { - return new akka.http.model.headers.LinkParams.title(title); - } - public static LinkParam title_All(String title) { - return new akka.http.model.headers.LinkParams.title$times(title); - } - public static LinkParam type(MediaType type) { - return new akka.http.model.headers.LinkParams.type((akka.http.model.MediaType) type); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/OAuth2BearerToken.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/OAuth2BearerToken.java deleted file mode 100644 index c9c306c549..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/OAuth2BearerToken.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -public abstract class OAuth2BearerToken extends akka.http.model.headers.HttpCredentials { - public abstract String token(); -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/RangeUnits.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/RangeUnits.java deleted file mode 100644 index 95e04325dc..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/RangeUnits.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -public final class RangeUnits { - private RangeUnits() {} - - public static final RangeUnit BYTES = akka.http.model.headers.RangeUnits.Bytes$.MODULE$; -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/RemoteAddress.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/RemoteAddress.java deleted file mode 100644 index 7ee0f87482..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/RemoteAddress.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -/** - * Model for the `Remote-Address` header. - * Custom header we use for optionally transporting the peer's IP in an HTTP header. - */ -public abstract class RemoteAddress extends akka.http.model.HttpHeader { - public abstract akka.http.model.japi.RemoteAddress address(); - - public static RemoteAddress create(akka.http.model.japi.RemoteAddress address) { - return new akka.http.model.headers.Remote$minusAddress(((akka.http.model.RemoteAddress) address)); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/TransferEncoding.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/TransferEncoding.java deleted file mode 100644 index 6c6086dc96..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/TransferEncoding.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -/** - * Model for the `Transfer-Encoding` header. - * Specification: http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-26#section-3.3.1 - */ -public abstract class TransferEncoding extends akka.http.model.HttpHeader { - public abstract Iterable getEncodings(); - - public static TransferEncoding create(akka.http.model.japi.TransferEncoding... encodings) { - return new akka.http.model.headers.Transfer$minusEncoding(akka.http.model.japi.Util.convertArray(encodings)); - } -} diff --git a/akka-http-core/src/main/java/akka/http/model/japi/headers/XForwardedFor.java b/akka-http-core/src/main/java/akka/http/model/japi/headers/XForwardedFor.java deleted file mode 100644 index b7933860da..0000000000 --- a/akka-http-core/src/main/java/akka/http/model/japi/headers/XForwardedFor.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (C) 2009-2014 Typesafe Inc. - */ - -package akka.http.model.japi.headers; - -/** - * Model for the `X-Forwarded-For` header. - * Specification: http://en.wikipedia.org/wiki/X-Forwarded-For - */ -public abstract class XForwardedFor extends akka.http.model.HttpHeader { - public abstract Iterable getAddresses(); - - public static XForwardedFor create(akka.http.model.japi.RemoteAddress... addresses) { - return new akka.http.model.headers.X$minusForwarded$minusFor(akka.http.model.japi.Util.convertArray(addresses)); - } -} diff --git a/akka-http-core/src/main/scala/akka/http/engine/TokenSourceActor.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/TokenSourceActor.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/engine/TokenSourceActor.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/TokenSourceActor.scala index aa8804bbb5..9d9f17a737 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/TokenSourceActor.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/TokenSourceActor.scala @@ -1,4 +1,4 @@ -package akka.http.engine +package akka.http.impl.engine import scala.annotation.tailrec import akka.stream.actor.{ ActorPublisherMessage, ActorPublisher } diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/ClientConnectionSettings.scala similarity index 84% rename from akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/ClientConnectionSettings.scala index d8e44794ac..fc793e7ec0 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/ClientConnectionSettings.scala @@ -2,14 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import com.typesafe.config.Config import scala.concurrent.duration.{ FiniteDuration, Duration } -import akka.actor.ActorRefFactory -import akka.http.model.headers.`User-Agent` -import akka.http.engine.parsing.ParserSettings -import akka.http.util._ +import akka.http.scaladsl.model.headers.`User-Agent` +import akka.http.impl.engine.parsing.ParserSettings +import akka.http.impl.util._ final case class ClientConnectionSettings( userAgentHeader: Option[`User-Agent`], diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/ConnectionPoolSettings.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/ConnectionPoolSettings.scala similarity index 92% rename from akka-http-core/src/main/scala/akka/http/engine/client/ConnectionPoolSettings.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/ConnectionPoolSettings.scala index edd3b7bfa7..99184d9233 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/ConnectionPoolSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/ConnectionPoolSettings.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import akka.event.LoggingAdapter import akka.io.Inet import com.typesafe.config.Config import scala.collection.immutable -import scala.concurrent.duration.{ FiniteDuration, Duration } -import akka.http.util._ +import scala.concurrent.duration.Duration +import akka.http.impl.util._ final case class HostConnectionPoolSetup(host: String, port: Int, setup: ConnectionPoolSetup) diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/OutgoingConnectionBlueprint.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/engine/client/OutgoingConnectionBlueprint.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala index 7e21e18222..85dbf6fc77 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/OutgoingConnectionBlueprint.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import language.existentials import java.net.InetSocketAddress @@ -15,10 +15,10 @@ import akka.event.LoggingAdapter import akka.stream._ import akka.stream.scaladsl._ import akka.stream.OperationAttributes._ -import akka.http.model.{ IllegalResponseException, HttpMethod, HttpRequest, HttpResponse } -import akka.http.engine.rendering.{ RequestRenderingContext, HttpRequestRendererFactory } -import akka.http.engine.parsing._ -import akka.http.util._ +import akka.http.scaladsl.model.{ IllegalResponseException, HttpMethod, HttpRequest, HttpResponse } +import akka.http.impl.engine.rendering.{ RequestRenderingContext, HttpRequestRendererFactory } +import akka.http.impl.engine.parsing._ +import akka.http.impl.util._ /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/PoolConductor.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/engine/client/PoolConductor.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala index 36eab274df..67d978253b 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/PoolConductor.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import language.existentials import scala.annotation.tailrec @@ -10,8 +10,8 @@ import scala.collection.immutable import akka.event.LoggingAdapter import akka.stream.scaladsl._ import akka.stream._ -import akka.http.model.HttpMethod -import akka.http.util._ +import akka.http.scaladsl.model.HttpMethod +import akka.http.impl.util._ private object PoolConductor { import PoolFlow.RequestContext diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/PoolFlow.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/client/PoolFlow.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala index 20df591906..3431cdb8fb 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/PoolFlow.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import java.net.InetSocketAddress import scala.concurrent.{ Promise, Future } @@ -11,8 +11,8 @@ import akka.event.LoggingAdapter import akka.actor._ import akka.stream.FlowMaterializer import akka.stream.scaladsl._ -import akka.http.model._ -import akka.http.Http +import akka.http.scaladsl.model._ +import akka.http.scaladsl.Http private object PoolFlow { diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/PoolGateway.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolGateway.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/engine/client/PoolGateway.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolGateway.scala index d210dfd68c..2bd73af7d0 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/PoolGateway.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolGateway.scala @@ -1,11 +1,11 @@ -package akka.http.engine.client +package akka.http.impl.engine.client import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec import scala.concurrent.{ Future, Promise } import akka.actor.{ Props, ActorSystem, ActorRef } -import akka.http.Http -import akka.http.model.{ HttpResponse, HttpRequest } +import akka.http.scaladsl.Http +import akka.http.scaladsl.model.{ HttpResponse, HttpRequest } import akka.stream.FlowMaterializer private object PoolGateway { diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/PoolInterfaceActor.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolInterfaceActor.scala similarity index 97% rename from akka-http-core/src/main/scala/akka/http/engine/client/PoolInterfaceActor.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolInterfaceActor.scala index ff73f6d248..1ed4291ebd 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/PoolInterfaceActor.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolInterfaceActor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import java.net.InetSocketAddress import scala.annotation.tailrec @@ -15,9 +15,9 @@ import akka.stream.actor.ActorPublisherMessage._ import akka.stream.actor.ActorSubscriberMessage._ import akka.stream.impl.FixedSizeBuffer import akka.stream.scaladsl.{ Sink, Source } -import akka.http.model.{ HttpResponse, HttpRequest } -import akka.http.util.SeqActorName -import akka.http.Http +import akka.http.scaladsl.model.{ HttpResponse, HttpRequest } +import akka.http.impl.util.SeqActorName +import akka.http.scaladsl.Http import PoolFlow._ private object PoolInterfaceActor { diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/PoolSlot.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolSlot.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/client/PoolSlot.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolSlot.scala index 597b690724..aaf4ec8b68 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/client/PoolSlot.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolSlot.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import language.existentials import java.net.InetSocketAddress import scala.util.{ Failure, Success } import scala.collection.immutable import akka.actor._ -import akka.http.model.{ HttpResponse, HttpRequest } -import akka.http.util._ +import akka.http.scaladsl.model.{ HttpResponse, HttpRequest } +import akka.http.impl.util._ import akka.stream.impl.{ SubscribePending, ExposedPublisher, ActorProcessor } import akka.stream.actor._ import akka.stream.scaladsl._ diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/BodyPartParser.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/BodyPartParser.scala index 094a999731..bf8578e53e 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/BodyPartParser.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import scala.annotation.tailrec import akka.event.LoggingAdapter @@ -10,8 +10,8 @@ import akka.parboiled2.CharPredicate import akka.stream.scaladsl.Source import akka.stream.stage._ import akka.util.ByteString -import akka.http.model._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.impl.util._ import headers._ /** diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/BoyerMoore.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/BoyerMoore.scala index 9360ce1001..7e3bda1755 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/BoyerMoore.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import scala.annotation.tailrec import akka.util.ByteString diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpHeaderParser.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpHeaderParser.scala index 09b0c39245..5d7b0a4bef 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpHeaderParser.scala @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import java.util.Arrays.copyOf import java.lang.{ StringBuilder ⇒ JStringBuilder } import scala.annotation.tailrec import akka.parboiled2.CharUtils import akka.util.ByteString -import akka.http.util._ -import akka.http.model.{ IllegalHeaderException, StatusCodes, HttpHeader, ErrorInfo } -import akka.http.model.headers.RawHeader -import akka.http.model.parser.HeaderParser -import akka.http.model.parser.CharacterClasses._ +import akka.http.impl.util._ +import akka.http.scaladsl.model.{ IllegalHeaderException, StatusCodes, HttpHeader, ErrorInfo } +import akka.http.scaladsl.model.headers.RawHeader +import akka.http.impl.model.parser.HeaderParser +import akka.http.impl.model.parser.CharacterClasses._ /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpMessageParser.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpMessageParser.scala index bf4777105d..77db7a28e5 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpMessageParser.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import scala.annotation.tailrec import scala.collection.mutable.ListBuffer @@ -10,9 +10,9 @@ import akka.parboiled2.CharUtils import akka.util.ByteString import akka.stream.scaladsl.Source import akka.stream.stage._ -import akka.http.model.parser.CharacterClasses -import akka.http.util._ -import akka.http.model._ +import akka.http.impl.model.parser.CharacterClasses +import akka.http.impl.util._ +import akka.http.scaladsl.model._ import headers._ import HttpProtocols._ import ParserOutput._ diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpRequestParser.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpRequestParser.scala index 5b10f15ea5..104f16ab1e 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpRequestParser.scala @@ -2,22 +2,20 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import java.lang.{ StringBuilder ⇒ JStringBuilder } -import akka.http.engine.ws.Handshake - import scala.annotation.tailrec import akka.actor.ActorRef -import akka.stream.OperationAttributes._ import akka.stream.stage.{ Context, PushPullStage } import akka.stream.scaladsl.Flow import akka.stream.scaladsl.{ Keep, Source } import akka.util.ByteString -import akka.http.model.parser.CharacterClasses -import akka.http.util.identityFunc -import akka.http.engine.TokenSourceActor -import akka.http.model._ +import akka.http.impl.engine.ws.Handshake +import akka.http.impl.model.parser.CharacterClasses +import akka.http.impl.util.identityFunc +import akka.http.impl.engine.TokenSourceActor +import akka.http.scaladsl.model._ import headers._ import StatusCodes._ import ParserOutput._ diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpResponseParser.scala similarity index 97% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpResponseParser.scala index e2ec023a9a..8ce57052b5 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/HttpResponseParser.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import scala.annotation.tailrec -import akka.http.model.parser.CharacterClasses +import akka.http.impl.model.parser.CharacterClasses import akka.stream.scaladsl.Source import akka.util.ByteString -import akka.http.model._ +import akka.http.scaladsl.model._ import headers._ import ParserOutput._ diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/ParserOutput.scala similarity index 95% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/ParserOutput.scala index a8a5bbf075..035cca3e19 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/ParserOutput.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing -import akka.http.model._ +import akka.http.scaladsl.model._ import akka.util.ByteString import akka.stream.scaladsl.Source diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/ParserSettings.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/ParserSettings.scala index 683950234e..217d73b619 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/ParserSettings.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import java.util.Locale import com.typesafe.config.Config import scala.collection.JavaConverters._ -import akka.http.model.{ StatusCode, HttpMethod, Uri } -import akka.http.util._ +import akka.http.scaladsl.model.{ StatusCode, HttpMethod, Uri } +import akka.http.impl.util._ final case class ParserSettings( maxUriLength: Int, diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/SpecializedHeaderValueParsers.scala similarity index 83% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/SpecializedHeaderValueParsers.scala index 61e38dcad7..229a013135 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/SpecializedHeaderValueParsers.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import scala.annotation.tailrec import akka.util.ByteString -import akka.http.model.{ HttpHeader, ErrorInfo } -import akka.http.model.headers.{ RawHeader, `Content-Length` } -import akka.http.model.parser.CharacterClasses._ +import akka.http.impl.model.parser.CharacterClasses._ +import akka.http.scaladsl.model.{ HttpHeader, ErrorInfo } +import akka.http.scaladsl.model.headers.`Content-Length` /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/package.scala similarity index 93% rename from akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/parsing/package.scala index 12f6a1cd22..9dd084664d 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/parsing/package.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine +package akka.http.impl.engine import java.lang.{ StringBuilder ⇒ JStringBuilder } import scala.annotation.tailrec import akka.event.LoggingAdapter import akka.util.ByteString -import akka.http.model.{ ErrorInfo, StatusCode, StatusCodes } -import akka.http.util.SingletonException +import akka.http.scaladsl.model.{ ErrorInfo, StatusCode, StatusCodes } +import akka.http.impl.util.SingletonException /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/BodyPartRenderer.scala similarity index 95% rename from akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/rendering/BodyPartRenderer.scala index 8994f4ddd5..151f3bcc0c 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/BodyPartRenderer.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.rendering +package akka.http.impl.engine.rendering import java.nio.charset.Charset import scala.collection.immutable import akka.event.LoggingAdapter -import akka.http.model._ -import akka.http.model.headers._ -import akka.http.engine.rendering.RenderSupport._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers._ +import akka.http.impl.engine.rendering.RenderSupport._ +import akka.http.impl.util._ import akka.stream.scaladsl.Source import akka.stream.stage._ import akka.util.ByteString diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/HttpRequestRendererFactory.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/rendering/HttpRequestRendererFactory.scala index ca69fdc608..410fe6bd55 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/HttpRequestRendererFactory.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.rendering +package akka.http.impl.engine.rendering import java.net.InetSocketAddress import scala.annotation.tailrec @@ -11,8 +11,8 @@ import akka.util.ByteString import akka.stream.OperationAttributes._ import akka.stream.scaladsl.Source import akka.stream.stage._ -import akka.http.model._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.impl.util._ import RenderSupport._ import headers._ diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/HttpResponseRendererFactory.scala similarity index 97% rename from akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/rendering/HttpResponseRendererFactory.scala index 2c6c6411d7..e59f5d9568 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/HttpResponseRendererFactory.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.rendering +package akka.http.impl.engine.rendering -import akka.http.engine.ws.{ WebsocketSwitch, UpgradeToWebsocketResponseHeader, Handshake } +import akka.http.impl.engine.ws.{ WebsocketSwitch, UpgradeToWebsocketResponseHeader, Handshake } import scala.annotation.tailrec import akka.event.LoggingAdapter @@ -12,8 +12,8 @@ import akka.util.ByteString import akka.stream.OperationAttributes._ import akka.stream.scaladsl.Source import akka.stream.stage._ -import akka.http.model._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.impl.util._ import RenderSupport._ import HttpProtocols._ import headers._ diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/RenderSupport.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/rendering/RenderSupport.scala index f8fe5003c4..3ebb0c8624 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/rendering/RenderSupport.scala @@ -2,17 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.rendering +package akka.http.impl.engine.rendering import akka.parboiled2.CharUtils import akka.util.ByteString import akka.event.LoggingAdapter import akka.stream.scaladsl._ import akka.stream.stage._ -import akka.http.model._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.impl.util._ import org.reactivestreams.Subscriber -import akka.http.model.HttpEntity.ChunkStreamPart +import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerBluePrint.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/server/HttpServerBluePrint.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala index ce2d8239cf..77f66e123a 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerBluePrint.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala @@ -2,32 +2,27 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.server +package akka.http.impl.engine.server import org.reactivestreams.{ Subscriber, Publisher } - import scala.util.control.NonFatal import akka.util.ByteString import akka.event.LoggingAdapter import akka.actor.{ ActorRef, Props } - import akka.stream._ import akka.stream.scaladsl._ import akka.stream.stage.PushPullStage - import akka.stream.scaladsl.FlexiMerge.{ ReadAny, MergeLogic } import akka.stream.scaladsl.FlexiRoute.{ DemandFrom, RouteLogic } - -import akka.http.engine.parsing._ -import akka.http.engine.rendering.{ ResponseRenderingContext, HttpResponseRendererFactory } -import akka.http.engine.TokenSourceActor -import akka.http.model._ -import ParserOutput._ - -import akka.http.util._ - -import akka.http.engine.ws._ +import akka.http.impl.engine.parsing._ +import akka.http.impl.engine.rendering.{ ResponseRenderingContext, HttpResponseRendererFactory } +import akka.http.impl.engine.TokenSourceActor +import akka.http.scaladsl.model._ +import akka.http.scaladsl.ServerSettings +import akka.http.impl.util._ +import akka.http.impl.engine.ws._ import Websocket.SwitchToWebsocketToken +import ParserOutput._ /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameEvent.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEvent.scala similarity index 97% rename from akka-http-core/src/main/scala/akka/http/engine/ws/FrameEvent.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEvent.scala index e4911a2844..35c8cc54b3 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameEvent.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEvent.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws -import akka.http.engine.ws.Protocol.Opcode +import akka.http.impl.engine.ws.Protocol.Opcode import akka.util.ByteString /** diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameEventParser.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventParser.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/FrameEventParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventParser.scala index 3992d51767..86ae74d01d 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameEventParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventParser.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws -import akka.http.util.{ ByteReader, ByteStringParserStage } +import akka.http.impl.util.{ ByteReader, ByteStringParserStage } import akka.stream.stage.{ StageState, SyncDirective, Context } import akka.util.ByteString diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameEventRenderer.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventRenderer.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/FrameEventRenderer.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventRenderer.scala index 85c7555c69..ab0c0da679 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameEventRenderer.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventRenderer.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.util.ByteString import akka.stream.stage.{ TerminationDirective, StatefulStage, SyncDirective, Context } diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameHandler.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameHandler.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/engine/ws/FrameHandler.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameHandler.scala index bde765f3d7..062c070330 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameHandler.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameHandler.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.stream.scaladsl.Flow import akka.stream.stage.{ TerminationDirective, SyncDirective, Context, StatefulStage } diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameOutHandler.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameOutHandler.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/FrameOutHandler.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameOutHandler.scala index 4f560cca33..5145875afb 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/FrameOutHandler.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameOutHandler.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import scala.concurrent.duration.FiniteDuration import akka.stream.stage._ -import akka.http.util.Timestamp +import akka.http.impl.util.Timestamp import FrameHandler.{ UserHandlerCompleted, ActivelyCloseWithCode, PeerClosed, DirectAnswer } import Websocket.Tick diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/Handshake.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Handshake.scala similarity index 95% rename from akka-http-core/src/main/scala/akka/http/engine/ws/Handshake.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/Handshake.scala index b6113d7ef5..d4db4e37ec 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/Handshake.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Handshake.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws -import akka.http.model.headers._ -import akka.http.model.ws.{ Message, UpgradeToWebsocket } -import akka.http.model.{ StatusCodes, HttpResponse, HttpProtocol, HttpHeader } +import akka.http.scaladsl.model.headers._ +import akka.http.scaladsl.model.ws.{ Message, UpgradeToWebsocket } +import akka.http.scaladsl.model.{ StatusCodes, HttpResponse, HttpProtocol, HttpHeader } import akka.parboiled2.util.Base64 import akka.stream.FlowMaterializer import akka.stream.scaladsl.Flow diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/Masking.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Masking.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/Masking.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/Masking.scala index dbf7d85338..0784456f98 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/Masking.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Masking.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.stream.scaladsl.Flow import akka.stream.stage.{ SyncDirective, Context, StageState, StatefulStage } diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/MessageToFrameRenderer.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/MessageToFrameRenderer.scala similarity index 94% rename from akka-http-core/src/main/scala/akka/http/engine/ws/MessageToFrameRenderer.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/MessageToFrameRenderer.scala index 3d3c4c8d6b..2565331e17 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/MessageToFrameRenderer.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/MessageToFrameRenderer.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.util.ByteString import akka.stream.scaladsl.{ FlattenStrategy, Source, Flow } import Protocol.Opcode -import akka.http.model.ws._ +import akka.http.scaladsl.model.ws._ /** * Renders messages to full frames. diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/Protocol.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Protocol.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/Protocol.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/Protocol.scala index f9cd40843f..d6afc7301d 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/Protocol.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Protocol.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws /** * Contains Websocket protocol constants diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/UpgradeToWebsocketLowLevel.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketLowLevel.scala similarity index 88% rename from akka-http-core/src/main/scala/akka/http/engine/ws/UpgradeToWebsocketLowLevel.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketLowLevel.scala index 1408d41be6..8c192276c6 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/UpgradeToWebsocketLowLevel.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketLowLevel.scala @@ -2,10 +2,10 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws -import akka.http.model.HttpResponse -import akka.http.model.ws.{ Message, UpgradeToWebsocket } +import akka.http.scaladsl.model.HttpResponse +import akka.http.scaladsl.model.ws.{ Message, UpgradeToWebsocket } import akka.stream.FlowMaterializer import akka.stream.scaladsl.Flow diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/UpgradeToWebsocketsResponseHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketsResponseHeader.scala similarity index 86% rename from akka-http-core/src/main/scala/akka/http/engine/ws/UpgradeToWebsocketsResponseHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketsResponseHeader.scala index 594f06c7f4..f75fdd7a44 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/UpgradeToWebsocketsResponseHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketsResponseHeader.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws -import akka.http.model.headers.CustomHeader +import akka.http.scaladsl.model.headers.CustomHeader import akka.stream.FlowMaterializer import akka.stream.scaladsl.Flow diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/Utf8Decoder.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Decoder.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/engine/ws/Utf8Decoder.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Decoder.scala index daa5dbc9f2..3f9e3a4109 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/Utf8Decoder.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Decoder.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.util.ByteString diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/Utf8Encoder.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Encoder.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/Utf8Encoder.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Encoder.scala index a4426a7874..a129fd375d 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/Utf8Encoder.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Encoder.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.stream.stage._ import akka.util.{ ByteStringBuilder, ByteString } diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/Websocket.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Websocket.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/engine/ws/Websocket.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/Websocket.scala index fdf758a27b..03a498095f 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/Websocket.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/Websocket.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import java.security.SecureRandom @@ -14,8 +14,8 @@ import akka.stream.stage._ import FlexiRoute.{ DemandFrom, DemandFromAny, RouteLogic } import FlexiMerge.MergeLogic -import akka.http.util._ -import akka.http.model.ws._ +import akka.http.impl.util._ +import akka.http.scaladsl.model.ws._ /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/engine/ws/WebsocketSwitch.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/WebsocketSwitch.scala similarity index 92% rename from akka-http-core/src/main/scala/akka/http/engine/ws/WebsocketSwitch.scala rename to akka-http-core/src/main/scala/akka/http/impl/engine/ws/WebsocketSwitch.scala index 91f81bd227..ade0243316 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/ws/WebsocketSwitch.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/ws/WebsocketSwitch.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import akka.stream.FlowMaterializer import akka.stream.scaladsl.Flow diff --git a/akka-http-core/src/main/scala/akka/http/model/japi/JavaUri.scala b/akka-http-core/src/main/scala/akka/http/impl/model/JavaUri.scala similarity index 58% rename from akka-http-core/src/main/scala/akka/http/model/japi/JavaUri.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/JavaUri.scala index 75e302b366..fd9e096849 100644 --- a/akka-http-core/src/main/scala/akka/http/model/japi/JavaUri.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/JavaUri.scala @@ -2,24 +2,22 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.impl.model import java.{ util ⇒ ju, lang ⇒ jl } - -import akka.http.model import akka.japi.Option -import scala.annotation.tailrec - -import JavaMapping.Implicits._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.{ model ⇒ sm } +import akka.http.impl.util.JavaMapping.Implicits._ /** INTERNAL API */ -protected[model] case class JavaUri(uri: model.Uri) extends Uri { +case class JavaUri(uri: sm.Uri) extends jm.Uri { def isRelative: Boolean = uri.isRelative def isAbsolute: Boolean = uri.isAbsolute def isEmpty: Boolean = uri.isEmpty def scheme(): String = uri.scheme - def host(): Host = uri.authority.host + def host(): jm.Host = uri.authority.host def port(): Int = uri.authority.port def userInfo(): String = uri.authority.userinfo @@ -27,7 +25,7 @@ protected[model] case class JavaUri(uri: model.Uri) extends Uri { import collection.JavaConverters._ def pathSegments(): jl.Iterable[String] = { - import model.Uri.Path + import sm.Uri.Path import Path._ def gatherSegments(path: Path): List[String] = path match { case Empty ⇒ Nil @@ -51,28 +49,26 @@ protected[model] case class JavaUri(uri: model.Uri) extends Uri { // Modification methods - def t(f: model.Uri ⇒ model.Uri): Uri = JavaUri(f(uri)) + def t(f: sm.Uri ⇒ sm.Uri): jm.Uri = JavaUri(f(uri)) - def scheme(scheme: String): Uri = t(_.withScheme(scheme)) + def scheme(scheme: String): jm.Uri = t(_.withScheme(scheme)) - def host(host: Host): Uri = t(_.withHost(host.asScala)) - def host(host: String): Uri = t(_.withHost(host)) - def port(port: Int): Uri = t(_.withPort(port)) - def userInfo(userInfo: String): Uri = t(_.withUserInfo(userInfo)) + def host(host: jm.Host): jm.Uri = t(_.withHost(host.asScala)) + def host(host: String): jm.Uri = t(_.withHost(host)) + def port(port: Int): jm.Uri = t(_.withPort(port)) + def userInfo(userInfo: String): jm.Uri = t(_.withUserInfo(userInfo)) - def path(path: String): Uri = t(_.withPath(model.Uri.Path(path))) + def path(path: String): jm.Uri = t(_.withPath(sm.Uri.Path(path))) - def toRelative: Uri = t(_.toRelative) + def toRelative: jm.Uri = t(_.toRelative) - def query(query: String): Uri = t(_.withQuery(query)) - def addParameter(key: String, value: String): Uri = t { u ⇒ + def query(query: String): jm.Uri = t(_.withQuery(query)) + def addParameter(key: String, value: String): jm.Uri = t { u ⇒ u.withQuery(((key -> value) +: u.query.reverse).reverse) } - def addPathSegment(segment: String): Uri = t { u ⇒ - import model.Uri.Path - import Path._ - + def addPathSegment(segment: String): jm.Uri = t { u ⇒ + import sm.Uri.Path val newPath = if (u.path.endsWithSlash) u.path ++ Path(segment) else u.path ++ Path./(segment) @@ -80,6 +76,6 @@ protected[model] case class JavaUri(uri: model.Uri) extends Uri { u.withPath(newPath) } - def fragment(fragment: Option[String]): Uri = t(_.copy(fragment = fragment)) - def fragment(fragment: String): Uri = t(_.withFragment(fragment)) + def fragment(fragment: Option[String]): jm.Uri = t(_.copy(fragment = fragment)) + def fragment(fragment: String): jm.Uri = t(_.withFragment(fragment)) } \ No newline at end of file diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptCharsetHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptCharsetHeader.scala similarity index 81% rename from akka-http-core/src/main/scala/akka/http/model/parser/AcceptCharsetHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptCharsetHeader.scala index d6b816e589..811ddb9799 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptCharsetHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptCharsetHeader.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import akka.parboiled2.Parser +import akka.http.scaladsl.model.headers.`Accept-Charset` +import akka.http.scaladsl.model.HttpCharsetRange private[parser] trait AcceptCharsetHeader { this: Parser with CommonRules with CommonActions ⇒ // http://tools.ietf.org/html/rfc7231#section-5.3.3 def `accept-charset` = rule { - oneOrMore(`charset-range-decl`).separatedBy(listSep) ~ EOI ~> (headers.`Accept-Charset`(_)) + oneOrMore(`charset-range-decl`).separatedBy(listSep) ~ EOI ~> (`Accept-Charset`(_)) } def `charset-range-decl` = rule { diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptEncodingHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptEncodingHeader.scala similarity index 91% rename from akka-http-core/src/main/scala/akka/http/model/parser/AcceptEncodingHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptEncodingHeader.scala index c0c5c9b01c..dc3ae3b596 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptEncodingHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptEncodingHeader.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.headers._ private[parser] trait AcceptEncodingHeader { this: Parser with CommonRules with CommonActions ⇒ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptHeader.scala similarity index 87% rename from akka-http-core/src/main/scala/akka/http/model/parser/AcceptHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptHeader.scala index 00c58e8823..1f9a613481 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptHeader.scala @@ -2,13 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser - -import akka.http.util._ +package akka.http.impl.model.parser import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.headers._ +import akka.http.scaladsl.model.{ MediaRange, MediaRanges } +import akka.http.impl.util._ private[parser] trait AcceptHeader { this: Parser with CommonRules with CommonActions ⇒ import CharacterClasses._ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptLanguageHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptLanguageHeader.scala similarity index 89% rename from akka-http-core/src/main/scala/akka/http/model/parser/AcceptLanguageHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptLanguageHeader.scala index be2d88f1ac..f5e7b463ed 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/AcceptLanguageHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/AcceptLanguageHeader.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.headers._ private[parser] trait AcceptLanguageHeader { this: Parser with CommonRules with CommonActions ⇒ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/Base64Parsing.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/Base64Parsing.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/parser/Base64Parsing.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/Base64Parsing.scala index 46890850a4..022c89993e 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/Base64Parsing.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/Base64Parsing.scala @@ -14,11 +14,10 @@ * limitations under the License. */ -package akka.http.model -package parser +package akka.http.impl.model.parser -import akka.parboiled2._ import akka.parboiled2.util.Base64 +import akka.parboiled2._ /** * Rules for parsing Base-64 encoded strings. diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/CacheControlHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CacheControlHeader.scala similarity index 95% rename from akka-http-core/src/main/scala/akka/http/model/parser/CacheControlHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/CacheControlHeader.scala index 3093f206a5..75e2dedf58 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/CacheControlHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CacheControlHeader.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.headers._ import CacheDirectives._ private[parser] trait CacheControlHeader { this: Parser with CommonRules with CommonActions with StringBuilding ⇒ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/CharacterClasses.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CharacterClasses.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/parser/CharacterClasses.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/CharacterClasses.scala index d08ec29a58..37ee2a724f 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/CharacterClasses.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CharacterClasses.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.parser +package akka.http.impl.model.parser import akka.parboiled2.CharPredicate diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/CommonActions.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CommonActions.scala similarity index 93% rename from akka-http-core/src/main/scala/akka/http/model/parser/CommonActions.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/CommonActions.scala index a003579f45..ca32ff847f 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/CommonActions.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CommonActions.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser - -import akka.http.util._ +package akka.http.impl.model.parser +import akka.http.impl.util._ +import akka.http.scaladsl.model._ import MediaTypes._ private[parser] trait CommonActions { diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/CommonRules.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CommonRules.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/model/parser/CommonRules.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/CommonRules.scala index e42fea003b..b83ada4c3d 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/CommonRules.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/CommonRules.scala @@ -2,14 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import scala.collection.immutable -import akka.http.util.DateTime +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers._ import akka.parboiled2._ import akka.shapeless._ -import headers._ private[parser] trait CommonRules { this: Parser with StringBuilding ⇒ import CharacterClasses._ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/ContentDispositionHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/ContentDispositionHeader.scala similarity index 94% rename from akka-http-core/src/main/scala/akka/http/model/parser/ContentDispositionHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/ContentDispositionHeader.scala index 18266b6001..283850347c 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/ContentDispositionHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/ContentDispositionHeader.scala @@ -2,12 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser -import scala.annotation.tailrec import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.headers._ private[parser] trait ContentDispositionHeader { this: Parser with CommonRules with CommonActions ⇒ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/ContentTypeHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/ContentTypeHeader.scala similarity index 87% rename from akka-http-core/src/main/scala/akka/http/model/parser/ContentTypeHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/ContentTypeHeader.scala index 59eeebdc24..73713d51b9 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/ContentTypeHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/ContentTypeHeader.scala @@ -2,18 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import scala.annotation.tailrec import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model._ private[parser] trait ContentTypeHeader { this: Parser with CommonRules with CommonActions ⇒ // http://tools.ietf.org/html/rfc7231#section-3.1.1.5 def `content-type` = rule { - `media-type` ~ EOI ~> ((main, sub, params) ⇒ `Content-Type`(contentType(main, sub, params))) + `media-type` ~ EOI ~> ((main, sub, params) ⇒ headers.`Content-Type`(contentType(main, sub, params))) } @tailrec private def contentType(main: String, diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/HeaderParser.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/HeaderParser.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/model/parser/HeaderParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/HeaderParser.scala index 4c87d634c8..b509523a1c 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/HeaderParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/HeaderParser.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import scala.util.control.NonFatal -import akka.http.util.SingletonException +import akka.http.impl.util.SingletonException import akka.parboiled2._ import akka.shapeless._ +import akka.http.scaladsl.model._ /** * INTERNAL API. diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/IpAddressParsing.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/IpAddressParsing.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/parser/IpAddressParsing.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/IpAddressParsing.scala index ce04f76ba0..f4a313f5e2 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/IpAddressParsing.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/IpAddressParsing.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.parser +package akka.http.impl.model.parser import akka.parboiled2._ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/LinkHeader.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/LinkHeader.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/model/parser/LinkHeader.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/LinkHeader.scala index c59a7be14a..2c9a41f880 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/LinkHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/LinkHeader.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import scala.annotation.tailrec import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.{ ParsingException, IllegalUriException } +import akka.http.scaladsl.model.headers._ private[parser] trait LinkHeader { this: Parser with CommonRules with CommonActions ⇒ import CharacterClasses._ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/SimpleHeaders.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/SimpleHeaders.scala index 0a0142dc46..58244291f1 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/SimpleHeaders.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import akka.parboiled2.Parser -import headers._ +import akka.http.scaladsl.model.RemoteAddress +import akka.http.scaladsl.model.headers._ /** * Parser rules for all headers that can be parsed with one single rule. diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/StringBuilding.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/StringBuilding.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/parser/StringBuilding.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/StringBuilding.scala index d3260b3771..d8b5e5e1cf 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/StringBuilding.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/StringBuilding.scala @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import akka.parboiled2._ diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/UriParser.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/UriParser.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/model/parser/UriParser.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/UriParser.scala index 76cd4f1bbd..7e3272c391 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/UriParser.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/UriParser.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.parser +package akka.http.impl.model.parser import java.nio.charset.Charset import akka.parboiled2._ -import akka.http.util.enhanceString_ -import akka.http.model.Uri -import akka.http.model.headers.HttpOrigin -import Uri._ +import akka.http.impl.util.enhanceString_ +import akka.http.scaladsl.model.Uri +import akka.http.scaladsl.model.headers.HttpOrigin import Parser.DeliveryScheme.Either +import Uri._ // format: OFF @@ -41,7 +41,7 @@ private[http] class UriParser(val input: ParserInput, def parseOrigin(): HttpOrigin = rule(origin ~ EOI).run() match { - case Right(_) => HttpOrigin(_scheme, akka.http.model.headers.Host(_host.address, _port)) + case Right(_) => HttpOrigin(_scheme, akka.http.scaladsl.model.headers.Host(_host.address, _port)) case Left(error) => fail(error, "origin") } diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/WebsocketHeaders.scala b/akka-http-core/src/main/scala/akka/http/impl/model/parser/WebsocketHeaders.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/model/parser/WebsocketHeaders.scala rename to akka-http-core/src/main/scala/akka/http/impl/model/parser/WebsocketHeaders.scala index 3df0bee907..ceb3b30254 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/WebsocketHeaders.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/parser/WebsocketHeaders.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.parser +package akka.http.impl.model.parser -import akka.http.model.headers._ +import akka.http.scaladsl.model.headers._ import akka.parboiled2._ // see grammar at http://tools.ietf.org/html/rfc6455#section-4.3 diff --git a/akka-http-core/src/main/scala/akka/http/util/ByteReader.scala b/akka-http-core/src/main/scala/akka/http/impl/util/ByteReader.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/util/ByteReader.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/ByteReader.scala index d9043e4946..d46ab53ca0 100644 --- a/akka-http-core/src/main/scala/akka/http/util/ByteReader.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/ByteReader.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util - -import akka.util.ByteString +package akka.http.impl.util import scala.util.control.NoStackTrace +import akka.util.ByteString /** * A helper class to read from a ByteString statefully. diff --git a/akka-http-core/src/main/scala/akka/http/util/ByteStringParserStage.scala b/akka-http-core/src/main/scala/akka/http/impl/util/ByteStringParserStage.scala similarity index 95% rename from akka-http-core/src/main/scala/akka/http/util/ByteStringParserStage.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/ByteStringParserStage.scala index 037d60bed9..88a56641cc 100644 --- a/akka-http-core/src/main/scala/akka/http/util/ByteStringParserStage.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/ByteStringParserStage.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util -import akka.stream.stage.{ Directive, Context, StatefulStage } +import akka.stream.stage.{ Context, StatefulStage } import akka.util.ByteString import akka.stream.stage.SyncDirective diff --git a/akka-http-core/src/main/scala/akka/http/util/EnhancedByteArray.scala b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedByteArray.scala similarity index 97% rename from akka-http-core/src/main/scala/akka/http/util/EnhancedByteArray.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/EnhancedByteArray.scala index 2ac89f5da2..75420b87db 100644 --- a/akka-http-core/src/main/scala/akka/http/util/EnhancedByteArray.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedByteArray.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import scala.annotation.tailrec diff --git a/akka-http-core/src/main/scala/akka/http/util/EnhancedByteStringTraversableOnce.scala b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedByteStringTraversableOnce.scala similarity index 91% rename from akka-http-core/src/main/scala/akka/http/util/EnhancedByteStringTraversableOnce.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/EnhancedByteStringTraversableOnce.scala index c7529e578f..fbe1fc9eef 100644 --- a/akka-http-core/src/main/scala/akka/http/util/EnhancedByteStringTraversableOnce.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedByteStringTraversableOnce.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import akka.util.ByteString diff --git a/akka-http-core/src/main/scala/akka/http/util/EnhancedConfig.scala b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedConfig.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/util/EnhancedConfig.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/EnhancedConfig.scala index 41e66aaf6f..09cb967eea 100644 --- a/akka-http-core/src/main/scala/akka/http/util/EnhancedConfig.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedConfig.scala @@ -2,10 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util -import scala.concurrent.duration.{ FiniteDuration, Duration } import com.typesafe.config.Config +import scala.concurrent.duration.{ FiniteDuration, Duration } import akka.ConfigurationException /** diff --git a/akka-http-core/src/main/scala/akka/http/util/EnhancedRegex.scala b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedRegex.scala similarity index 90% rename from akka-http-core/src/main/scala/akka/http/util/EnhancedRegex.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/EnhancedRegex.scala index f83132c453..047c4d68bc 100644 --- a/akka-http-core/src/main/scala/akka/http/util/EnhancedRegex.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedRegex.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import scala.util.matching.Regex diff --git a/akka-http-core/src/main/scala/akka/http/util/EnhancedString.scala b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedString.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/util/EnhancedString.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/EnhancedString.scala index 7cf6baecbf..82e73f98c3 100644 --- a/akka-http-core/src/main/scala/akka/http/util/EnhancedString.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/EnhancedString.scala @@ -2,10 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import java.util.Locale - import scala.annotation.tailrec import scala.collection.immutable diff --git a/akka-http-core/src/main/scala/akka/http/model/japi/JavaMapping.scala b/akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala similarity index 55% rename from akka-http-core/src/main/scala/akka/http/model/japi/JavaMapping.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala index e032e535e2..203b25d15e 100644 --- a/akka-http-core/src/main/scala/akka/http/model/japi/JavaMapping.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala @@ -2,15 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.impl.util +import java.net.InetAddress +import java.{ util ⇒ ju, lang ⇒ jl } import scala.collection.immutable import scala.reflect.ClassTag - -import akka.http.model -import java.{ util ⇒ ju, lang ⇒ jl } import akka.japi -import java.net.InetAddress +import akka.http.impl.model.JavaUri +import akka.http.javadsl.model.Accessors +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.{ model ⇒ sm } /** INTERNAL API */ trait J2SMapping[J] { @@ -103,48 +105,48 @@ object JavaMapping { def toScala(javaObject: J): S = cast[S](javaObject) } - implicit object DateTime extends Inherited[DateTime, akka.http.util.DateTime] + implicit object DateTime extends Inherited[jm.DateTime, akka.http.scaladsl.model.DateTime] - implicit object ContentType extends Inherited[ContentType, model.ContentType] - implicit object Host extends Inherited[Host, model.Uri.Host] - implicit object HttpCharset extends Inherited[HttpCharset, model.HttpCharset] - implicit object HttpCharsetRange extends Inherited[HttpCharsetRange, model.HttpCharsetRange] - implicit object HttpEntity extends Inherited[HttpEntity, model.HttpEntity] - implicit object HttpHeader extends Inherited[HttpHeader, model.HttpHeader] - implicit object HttpMethod extends Inherited[HttpMethod, model.HttpMethod] - implicit object HttpProtocol extends Inherited[HttpProtocol, model.HttpProtocol] - implicit object HttpRequest extends Inherited[HttpRequest, model.HttpRequest] - implicit object HttpResponse extends Inherited[HttpResponse, model.HttpResponse] - implicit object MediaRange extends Inherited[MediaRange, model.MediaRange] - implicit object MediaType extends Inherited[MediaType, model.MediaType] - implicit object StatusCode extends Inherited[StatusCode, model.StatusCode] + implicit object ContentType extends Inherited[jm.ContentType, sm.ContentType] + implicit object Host extends Inherited[jm.Host, sm.Uri.Host] + implicit object HttpCharset extends Inherited[jm.HttpCharset, sm.HttpCharset] + implicit object HttpCharsetRange extends Inherited[jm.HttpCharsetRange, sm.HttpCharsetRange] + implicit object HttpEntity extends Inherited[jm.HttpEntity, sm.HttpEntity] + implicit object HttpHeader extends Inherited[jm.HttpHeader, sm.HttpHeader] + implicit object HttpMethod extends Inherited[jm.HttpMethod, sm.HttpMethod] + implicit object HttpProtocol extends Inherited[jm.HttpProtocol, sm.HttpProtocol] + implicit object HttpRequest extends Inherited[jm.HttpRequest, sm.HttpRequest] + implicit object HttpResponse extends Inherited[jm.HttpResponse, sm.HttpResponse] + implicit object MediaRange extends Inherited[jm.MediaRange, sm.MediaRange] + implicit object MediaType extends Inherited[jm.MediaType, sm.MediaType] + implicit object StatusCode extends Inherited[jm.StatusCode, sm.StatusCode] - implicit object ContentRange extends Inherited[ContentRange, model.ContentRange] - implicit object RemoteAddress extends Inherited[RemoteAddress, model.RemoteAddress] - implicit object TransferEncoding extends Inherited[TransferEncoding, model.TransferEncoding] + implicit object ContentRange extends Inherited[jm.ContentRange, sm.ContentRange] + implicit object RemoteAddress extends Inherited[jm.RemoteAddress, sm.RemoteAddress] + implicit object TransferEncoding extends Inherited[jm.TransferEncoding, sm.TransferEncoding] - implicit object ByteRange extends Inherited[headers.ByteRange, model.headers.ByteRange] - implicit object CacheDirective extends Inherited[headers.CacheDirective, model.headers.CacheDirective] - implicit object ContentDispositionType extends Inherited[headers.ContentDispositionType, model.headers.ContentDispositionType] - implicit object EntityTag extends Inherited[headers.EntityTag, model.headers.EntityTag] - implicit object EntityTagRange extends Inherited[headers.EntityTagRange, model.headers.EntityTagRange] - implicit object HttpChallenge extends Inherited[headers.HttpChallenge, model.headers.HttpChallenge] - implicit object HttpCookie extends Inherited[headers.HttpCookie, model.headers.HttpCookie] - implicit object HttpCredentials extends Inherited[headers.HttpCredentials, model.headers.HttpCredentials] - implicit object HttpEncoding extends Inherited[headers.HttpEncoding, model.headers.HttpEncoding] - implicit object HttpEncodingRange extends Inherited[headers.HttpEncodingRange, model.headers.HttpEncodingRange] - implicit object HttpOrigin extends Inherited[headers.HttpOrigin, model.headers.HttpOrigin] - implicit object HttpOriginRange extends Inherited[headers.HttpOriginRange, model.headers.HttpOriginRange] - implicit object Language extends Inherited[headers.Language, model.headers.Language] - implicit object LanguageRange extends Inherited[headers.LanguageRange, model.headers.LanguageRange] - implicit object LinkParam extends Inherited[headers.LinkParam, model.headers.LinkParam] - implicit object LinkValue extends Inherited[headers.LinkValue, model.headers.LinkValue] - implicit object ProductVersion extends Inherited[headers.ProductVersion, model.headers.ProductVersion] - implicit object RangeUnit extends Inherited[headers.RangeUnit, model.headers.RangeUnit] + implicit object ByteRange extends Inherited[jm.headers.ByteRange, sm.headers.ByteRange] + implicit object CacheDirective extends Inherited[jm.headers.CacheDirective, sm.headers.CacheDirective] + implicit object ContentDispositionType extends Inherited[jm.headers.ContentDispositionType, sm.headers.ContentDispositionType] + implicit object EntityTag extends Inherited[jm.headers.EntityTag, sm.headers.EntityTag] + implicit object EntityTagRange extends Inherited[jm.headers.EntityTagRange, sm.headers.EntityTagRange] + implicit object HttpChallenge extends Inherited[jm.headers.HttpChallenge, sm.headers.HttpChallenge] + implicit object HttpCookie extends Inherited[jm.headers.HttpCookie, sm.headers.HttpCookie] + implicit object HttpCredentials extends Inherited[jm.headers.HttpCredentials, sm.headers.HttpCredentials] + implicit object HttpEncoding extends Inherited[jm.headers.HttpEncoding, sm.headers.HttpEncoding] + implicit object HttpEncodingRange extends Inherited[jm.headers.HttpEncodingRange, sm.headers.HttpEncodingRange] + implicit object HttpOrigin extends Inherited[jm.headers.HttpOrigin, sm.headers.HttpOrigin] + implicit object HttpOriginRange extends Inherited[jm.headers.HttpOriginRange, sm.headers.HttpOriginRange] + implicit object Language extends Inherited[jm.headers.Language, sm.headers.Language] + implicit object LanguageRange extends Inherited[jm.headers.LanguageRange, sm.headers.LanguageRange] + implicit object LinkParam extends Inherited[jm.headers.LinkParam, sm.headers.LinkParam] + implicit object LinkValue extends Inherited[jm.headers.LinkValue, sm.headers.LinkValue] + implicit object ProductVersion extends Inherited[jm.headers.ProductVersion, sm.headers.ProductVersion] + implicit object RangeUnit extends Inherited[jm.headers.RangeUnit, sm.headers.RangeUnit] - implicit object Uri extends JavaMapping[Uri, model.Uri] { - def toScala(javaObject: Uri): Uri.S = cast[JavaUri](javaObject).uri - def toJava(scalaObject: model.Uri): Uri.J = Accessors.Uri(scalaObject) + implicit object Uri extends JavaMapping[jm.Uri, sm.Uri] { + def toScala(javaObject: jm.Uri): Uri.S = cast[JavaUri](javaObject).uri + def toJava(scalaObject: sm.Uri): Uri.J = Accessors.Uri(scalaObject) } private def cast[T](obj: AnyRef)(implicit classTag: ClassTag[T]): T = @@ -152,6 +154,6 @@ object JavaMapping { catch { case exp: ClassCastException ⇒ throw new IllegalArgumentException(s"Illegal custom subclass of $classTag. " + - s"Please use only the provided factories in akka.http.model.japi.Http") + s"Please use only the provided factories in akka.http.javadsl.model.Http") } } diff --git a/akka-http-core/src/main/scala/akka/http/util/ObjectRegistry.scala b/akka-http-core/src/main/scala/akka/http/impl/util/ObjectRegistry.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/util/ObjectRegistry.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/ObjectRegistry.scala index 5db5fd14c6..866e64a2fd 100644 --- a/akka-http-core/src/main/scala/akka/http/util/ObjectRegistry.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/ObjectRegistry.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/util/Rendering.scala b/akka-http-core/src/main/scala/akka/http/impl/util/Rendering.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/util/Rendering.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/Rendering.scala index 39eba4ab39..bce70a177f 100644 --- a/akka-http-core/src/main/scala/akka/http/util/Rendering.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/Rendering.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import java.nio.CharBuffer import java.nio.charset.Charset @@ -11,7 +11,7 @@ import java.util.Locale import scala.annotation.tailrec import scala.collection.{ immutable, LinearSeq } import akka.parboiled2.{ CharPredicate, CharUtils } -import akka.http.model.parser.CharacterClasses +import akka.http.impl.model.parser.CharacterClasses import akka.util.{ ByteStringBuilder, ByteString } /** diff --git a/akka-http-core/src/main/scala/akka/http/util/SettingsCompanion.scala b/akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanion.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/util/SettingsCompanion.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanion.scala index 83ac16b4c1..5f4f71e4bf 100644 --- a/akka-http-core/src/main/scala/akka/http/util/SettingsCompanion.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanion.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import java.net.InetAddress import com.typesafe.config.{ ConfigFactory, Config } @@ -46,7 +46,7 @@ private[http] abstract class SettingsCompanion[T](prefix: String) { def fromSubConfig(c: Config): T } -object SettingsCompanion { +private[http] object SettingsCompanion { lazy val configAdditions: Config = { val localHostName = try InetAddress.getLocalHost.getHostName // TODO: upgrade to `getHostString` once we are on JDK7 diff --git a/akka-http-core/src/main/scala/akka/http/util/SingletonException.scala b/akka-http-core/src/main/scala/akka/http/impl/util/SingletonException.scala similarity index 92% rename from akka-http-core/src/main/scala/akka/http/util/SingletonException.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/SingletonException.scala index 00f666cfcf..e29bf8c2d7 100644 --- a/akka-http-core/src/main/scala/akka/http/util/SingletonException.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/SingletonException.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import scala.util.control.NoStackTrace diff --git a/akka-http-core/src/main/scala/akka/http/util/StreamUtils.scala b/akka-http-core/src/main/scala/akka/http/impl/util/StreamUtils.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/util/StreamUtils.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/StreamUtils.scala index 1288680dca..32d7b1d690 100644 --- a/akka-http-core/src/main/scala/akka/http/util/StreamUtils.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/StreamUtils.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import java.io.InputStream import java.util.concurrent.atomic.{ AtomicReference, AtomicBoolean } @@ -14,7 +14,7 @@ import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.concurrent.{ ExecutionContext, Future } import akka.util.ByteString -import akka.http.model.RequestEntity +import akka.http.scaladsl.model.RequestEntity import akka.stream._ import akka.stream.scaladsl._ import akka.stream.stage._ diff --git a/akka-http-core/src/main/scala/akka/http/util/Timestamp.scala b/akka-http-core/src/main/scala/akka/http/impl/util/Timestamp.scala similarity index 97% rename from akka-http-core/src/main/scala/akka/http/util/Timestamp.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/Timestamp.scala index 494533a7fc..1499901851 100644 --- a/akka-http-core/src/main/scala/akka/http/util/Timestamp.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/Timestamp.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import scala.concurrent.duration._ diff --git a/akka-http-core/src/main/scala/akka/http/util/package.scala b/akka-http-core/src/main/scala/akka/http/impl/util/package.scala similarity index 91% rename from akka-http-core/src/main/scala/akka/http/util/package.scala rename to akka-http-core/src/main/scala/akka/http/impl/util/package.scala index e326957082..c8644d6e18 100644 --- a/akka-http-core/src/main/scala/akka/http/util/package.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.impl import language.implicitConversions import language.higherKinds @@ -63,7 +63,7 @@ package object util { .flatten(FlattenStrategy.concat) } - def printEvent[T](marker: String): Flow[T, T, Unit] = + private[http] def printEvent[T](marker: String): Flow[T, T, Unit] = Flow[T].transform(() ⇒ new PushPullStage[T, T] { override def onPush(element: T, ctx: Context[T]): SyncDirective = { println(s"$marker: $element") @@ -120,16 +120,7 @@ package object util { private[this] val _identityFunc: Any ⇒ Any = x ⇒ x /** Returns a constant identity function to avoid allocating the closure */ - def identityFunc[T]: T ⇒ T = _identityFunc.asInstanceOf[T ⇒ T] - - def humanReadableByteCount(bytes: Long, si: Boolean): String = { - val unit = if (si) 1000 else 1024 - if (bytes >= unit) { - val exp = (math.log(bytes) / math.log(unit)).toInt - val pre = if (si) "kMGTPE".charAt(exp - 1).toString else "KMGTPE".charAt(exp - 1).toString + 'i' - "%.1f %sB" format (bytes / math.pow(unit, exp), pre) - } else bytes.toString + " B" - } + private[http] def identityFunc[T]: T ⇒ T = _identityFunc.asInstanceOf[T ⇒ T] } package util { diff --git a/akka-http-core/src/main/scala/akka/http/model/japi/Http.scala b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala similarity index 89% rename from akka-http-core/src/main/scala/akka/http/model/japi/Http.scala rename to akka-http-core/src/main/scala/akka/http/javadsl/Http.scala index 85fb3759d3..5758e9d9ab 100644 --- a/akka-http-core/src/main/scala/akka/http/model/japi/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala @@ -2,26 +2,19 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.javadsl import java.lang.{ Iterable ⇒ JIterable } - -import akka.japi.Util._ -import akka.japi.{ Option ⇒ JOption } -import akka.japi.function.Function - import scala.concurrent.Future - -import akka.actor.{ ActorSystem, ExtensionId, ExtendedActorSystem, ExtensionIdProvider } +import akka.japi.Util._ +import akka.japi.Function +import akka.actor.{ ExtendedActorSystem, ActorSystem, ExtensionIdProvider, ExtensionId } import akka.event.LoggingAdapter import akka.io.Inet import akka.stream.FlowMaterializer import akka.stream.javadsl.{ Flow, Source } - -import akka.http.HttpExt -import akka.http.engine.server.ServerSettings - -import akka.http.model +import akka.http.scaladsl.{ model ⇒ sm, ServerSettings } +import akka.http.javadsl.model._ object Http extends ExtensionId[Http] with ExtensionIdProvider { override def get(system: ActorSystem): Http = super.get(system) @@ -32,7 +25,7 @@ object Http extends ExtensionId[Http] with ExtensionIdProvider { class Http(system: ExtendedActorSystem) extends akka.actor.Extension { import akka.dispatch.ExecutionContexts.{ sameThreadExecutionContext ⇒ ec } - private lazy val delegate: HttpExt = akka.http.Http(system) + private lazy val delegate = akka.http.scaladsl.Http(system) /** * Creates a [[Source]] of [[IncomingConnection]] instances which represents a prospective HTTP server binding @@ -79,7 +72,7 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { def bindAndHandle(handler: Flow[HttpRequest, HttpResponse, _], interface: String, port: Int, fm: FlowMaterializer): Future[ServerBinding] = - delegate.bindAndHandle(handler.asInstanceOf[Flow[model.HttpRequest, model.HttpResponse, _]].asScala, + delegate.bindAndHandle(handler.asInstanceOf[Flow[sm.HttpRequest, sm.HttpResponse, _]].asScala, interface, port)(fm) .map(new ServerBinding(_))(ec) @@ -97,7 +90,7 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { settings: ServerSettings, log: LoggingAdapter, fm: FlowMaterializer): Future[ServerBinding] = - delegate.bindAndHandle(handler.asInstanceOf[Flow[model.HttpRequest, model.HttpResponse, _]].asScala, + delegate.bindAndHandle(handler.asInstanceOf[Flow[sm.HttpRequest, sm.HttpResponse, _]].asScala, interface, port, backlog, immutableSeq(options), settings, log)(fm) .map(new ServerBinding(_))(ec) @@ -112,7 +105,7 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { def bindAndHandleSync(handler: Function[HttpRequest, HttpResponse], interface: String, port: Int, fm: FlowMaterializer): Future[ServerBinding] = - delegate.bindAndHandleSync(handler.apply(_).asInstanceOf[model.HttpResponse], interface, port)(fm) + delegate.bindAndHandleSync(handler.apply(_).asInstanceOf[sm.HttpResponse], interface, port)(fm) .map(new ServerBinding(_))(ec) /** @@ -129,7 +122,7 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { settings: ServerSettings, log: LoggingAdapter, fm: FlowMaterializer): Future[ServerBinding] = - delegate.bindAndHandleSync(handler.apply(_).asInstanceOf[model.HttpResponse], + delegate.bindAndHandleSync(handler.apply(_).asInstanceOf[sm.HttpResponse], interface, port, backlog, immutableSeq(options), settings, log)(fm) .map(new ServerBinding(_))(ec) @@ -144,7 +137,7 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { def bindAndHandleAsync(handler: Function[HttpRequest, Future[HttpResponse]], interface: String, port: Int, fm: FlowMaterializer): Future[ServerBinding] = - delegate.bindAndHandleAsync(handler.apply(_).asInstanceOf[Future[model.HttpResponse]], interface, port)(fm) + delegate.bindAndHandleAsync(handler.apply(_).asInstanceOf[Future[sm.HttpResponse]], interface, port)(fm) .map(new ServerBinding(_))(ec) /** @@ -161,7 +154,7 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { settings: ServerSettings, log: LoggingAdapter, fm: FlowMaterializer): Future[ServerBinding] = - delegate.bindAndHandleAsync(handler.apply(_).asInstanceOf[Future[model.HttpResponse]], + delegate.bindAndHandleAsync(handler.apply(_).asInstanceOf[Future[sm.HttpResponse]], interface, port, backlog, immutableSeq(options), settings, log)(fm) .map(new ServerBinding(_))(ec) } diff --git a/akka-http-core/src/main/scala/akka/http/model/japi/IncomingConnection.scala b/akka-http-core/src/main/scala/akka/http/javadsl/IncomingConnection.scala similarity index 82% rename from akka-http-core/src/main/scala/akka/http/model/japi/IncomingConnection.scala rename to akka-http-core/src/main/scala/akka/http/javadsl/IncomingConnection.scala index 0e834c9cf7..2760a99e19 100644 --- a/akka-http-core/src/main/scala/akka/http/model/japi/IncomingConnection.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/IncomingConnection.scala @@ -2,23 +2,19 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.javadsl import java.net.InetSocketAddress - -import akka.japi.function.Function - import scala.concurrent.Future - -import akka.http -import http.model import akka.stream.FlowMaterializer import akka.stream.javadsl.Flow +import akka.http.javadsl.model._ +import akka.http.scaladsl.{ model ⇒ sm } /** * Represents one accepted incoming HTTP connection. */ -class IncomingConnection private[http] (delegate: http.Http.IncomingConnection) { +class IncomingConnection private[http] (delegate: akka.http.scaladsl.Http.IncomingConnection) { /** * The local address of this connection. */ @@ -41,19 +37,19 @@ class IncomingConnection private[http] (delegate: http.Http.IncomingConnection) * and the respective materialization result returned. */ def handleWith[Mat](handler: Flow[HttpRequest, HttpResponse, Mat], materializer: FlowMaterializer): Mat = - delegate.handleWith(handler.asInstanceOf[Flow[model.HttpRequest, model.HttpResponse, Mat]].asScala)(materializer) + delegate.handleWith(handler.asInstanceOf[Flow[sm.HttpRequest, sm.HttpResponse, Mat]].asScala)(materializer) /** * Handles the connection with the given handler function. * Returns the materialization result of the underlying flow materialization. */ def handleWithSyncHandler(handler: Function[HttpRequest, HttpResponse], materializer: FlowMaterializer): Unit = - delegate.handleWithSyncHandler(handler.apply(_).asInstanceOf[model.HttpResponse])(materializer) + delegate.handleWithSyncHandler(handler.apply(_).asInstanceOf[sm.HttpResponse])(materializer) /** * Handles the connection with the given handler function. * Returns the materialization result of the underlying flow materialization. */ def handleWithAsyncHandler(handler: Function[HttpRequest, Future[HttpResponse]], materializer: FlowMaterializer): Unit = - delegate.handleWithAsyncHandler(handler.apply(_).asInstanceOf[Future[model.HttpResponse]])(materializer) + delegate.handleWithAsyncHandler(handler.apply(_).asInstanceOf[Future[sm.HttpResponse]])(materializer) } diff --git a/akka-http-core/src/main/scala/akka/http/model/japi/ServerBinding.scala b/akka-http-core/src/main/scala/akka/http/javadsl/ServerBinding.scala similarity index 84% rename from akka-http-core/src/main/scala/akka/http/model/japi/ServerBinding.scala rename to akka-http-core/src/main/scala/akka/http/javadsl/ServerBinding.scala index 12b44272ce..35f8496f6e 100644 --- a/akka-http-core/src/main/scala/akka/http/model/japi/ServerBinding.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/ServerBinding.scala @@ -2,18 +2,15 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.javadsl import java.net.InetSocketAddress - -import akka.http - import scala.concurrent.Future /** * Represents a prospective HTTP server binding. */ -class ServerBinding private[http] (delegate: http.Http.ServerBinding) { +class ServerBinding private[http] (delegate: akka.http.scaladsl.Http.ServerBinding) { /** * The local address of the endpoint bound by the materialization of the `connections` [[Source]]. */ diff --git a/akka-http-core/src/main/scala/akka/http/model/japi/Accessors.scala b/akka-http-core/src/main/scala/akka/http/javadsl/model/Accessors.scala similarity index 84% rename from akka-http-core/src/main/scala/akka/http/model/japi/Accessors.scala rename to akka-http-core/src/main/scala/akka/http/javadsl/model/Accessors.scala index 422fad8363..5a70c5c4fc 100644 --- a/akka-http-core/src/main/scala/akka/http/model/japi/Accessors.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/model/Accessors.scala @@ -2,9 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.javadsl.model -import akka.http.model +import akka.http.impl.model.JavaUri +import akka.http.scaladsl.model /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Message.scala b/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Message.scala index aada9e0f7b..12e854ca03 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Message.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Message.scala @@ -4,7 +4,7 @@ package akka.http.javadsl.model.ws -import akka.http.model.ws +import akka.http.scaladsl.{ model ⇒ sm } import akka.stream.javadsl.Source import akka.util.ByteString @@ -28,13 +28,13 @@ sealed abstract class Message { */ def asBinaryMessage: BinaryMessage - def asScala: ws.Message + def asScala: sm.ws.Message } object Message { - def adapt(msg: ws.Message): Message = msg match { - case t: ws.TextMessage ⇒ TextMessage.adapt(t) - case b: ws.BinaryMessage ⇒ BinaryMessage.adapt(b) + def adapt(msg: sm.ws.Message): Message = msg match { + case t: sm.ws.TextMessage ⇒ TextMessage.adapt(t) + case b: sm.ws.BinaryMessage ⇒ BinaryMessage.adapt(b) } } @@ -60,7 +60,7 @@ abstract class TextMessage extends Message { def isText: Boolean = true def asTextMessage: TextMessage = this def asBinaryMessage: BinaryMessage = throw new ClassCastException("This message is not a binary message.") - def asScala: ws.TextMessage + def asScala: sm.ws.TextMessage } object TextMessage { @@ -73,7 +73,7 @@ object TextMessage { def getStreamedText: Source[String, _] = Source.single(text) def getStrictText: String = text - def asScala: ws.TextMessage = ws.TextMessage.Strict(text) + def asScala: sm.ws.TextMessage = sm.ws.TextMessage.Strict(text) } /** * Creates a streamed text message. @@ -84,12 +84,12 @@ object TextMessage { def getStrictText: String = throw new IllegalStateException("Cannot get strict text for streamed message.") def getStreamedText: Source[String, _] = textStream - def asScala: ws.TextMessage = ws.TextMessage.Streamed(textStream.asScala) + def asScala: sm.ws.TextMessage = sm.ws.TextMessage.Streamed(textStream.asScala) } - def adapt(msg: ws.TextMessage): TextMessage = msg match { - case ws.TextMessage.Strict(text) ⇒ create(text) - case ws.TextMessage.Streamed(stream) ⇒ create(stream.asJava) + def adapt(msg: sm.ws.TextMessage): TextMessage = msg match { + case sm.ws.TextMessage.Strict(text) ⇒ create(text) + case sm.ws.TextMessage.Streamed(stream) ⇒ create(stream.asJava) } } @@ -110,7 +110,7 @@ abstract class BinaryMessage extends Message { def isText: Boolean = false def asTextMessage: TextMessage = throw new ClassCastException("This message is not a text message.") def asBinaryMessage: BinaryMessage = this - def asScala: ws.BinaryMessage + def asScala: sm.ws.BinaryMessage } object BinaryMessage { @@ -123,7 +123,7 @@ object BinaryMessage { def getStreamedData: Source[ByteString, _] = Source.single(data) def getStrictData: ByteString = data - def asScala: ws.BinaryMessage = ws.BinaryMessage.Strict(data) + def asScala: sm.ws.BinaryMessage = sm.ws.BinaryMessage.Strict(data) } /** @@ -135,11 +135,11 @@ object BinaryMessage { def getStrictData: ByteString = throw new IllegalStateException("Cannot get strict data for streamed message.") def getStreamedData: Source[ByteString, _] = dataStream - def asScala: ws.BinaryMessage = ws.BinaryMessage.Streamed(dataStream.asScala) + def asScala: sm.ws.BinaryMessage = sm.ws.BinaryMessage.Streamed(dataStream.asScala) } - def adapt(msg: ws.BinaryMessage): BinaryMessage = msg match { - case ws.BinaryMessage.Strict(data) ⇒ create(data) - case ws.BinaryMessage.Streamed(stream) ⇒ create(stream.asJava) + def adapt(msg: sm.ws.BinaryMessage): BinaryMessage = msg match { + case sm.ws.BinaryMessage.Strict(data) ⇒ create(data) + case sm.ws.BinaryMessage.Streamed(stream) ⇒ create(stream.asJava) } } \ No newline at end of file diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/UpgradeToWebsocket.scala b/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/UpgradeToWebsocket.scala index b865bdd724..ff973ab5c8 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/UpgradeToWebsocket.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/UpgradeToWebsocket.scala @@ -5,9 +5,8 @@ package akka.http.javadsl.model.ws import java.lang.{ Iterable ⇒ JIterable } - -import akka.http.model -import akka.http.model.japi.HttpResponse +import akka.http.scaladsl.{ model ⇒ sm } +import akka.http.javadsl.model._ import akka.stream.FlowMaterializer import akka.stream.javadsl.Flow @@ -15,7 +14,7 @@ import akka.stream.javadsl.Flow * A virtual header that Websocket requests will contain. Use [[UpgradeToWebsocket.handleMessagesWith]] to * create a Websocket handshake response and handle the Websocket message stream with the given handler. */ -trait UpgradeToWebsocket extends model.HttpHeader { +trait UpgradeToWebsocket extends sm.HttpHeader { /** * Returns the sequence of protocols the client accepts. * diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Websocket.scala b/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Websocket.scala index b8a30dfa4a..fd519a54f9 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Websocket.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/model/ws/Websocket.scala @@ -6,10 +6,8 @@ package akka.http.javadsl.model.ws import akka.stream.FlowMaterializer import akka.stream.javadsl.Flow - -import akka.http.model.japi.JavaMapping.Implicits._ - -import akka.http.model.japi.{ StatusCodes, HttpResponse, HttpRequest } +import akka.http.javadsl.model._ +import akka.http.impl.util.JavaMapping.Implicits._ object Websocket { /** diff --git a/akka-http-core/src/main/scala/akka/http/Http.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/Http.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala index 684f971ef7..5636ad3c89 100644 --- a/akka-http-core/src/main/scala/akka/http/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.scaladsl import java.net.InetSocketAddress import java.util.concurrent.ConcurrentHashMap -import akka.http.util.FastFuture import com.typesafe.config.Config import scala.util.Try import scala.util.control.NonFatal @@ -17,9 +16,10 @@ import akka.util.ByteString import akka.io.Inet import akka.stream.FlowMaterializer import akka.stream.scaladsl._ -import akka.http.engine.client._ -import akka.http.engine.server._ -import akka.http.model._ +import akka.http.impl.engine.client._ +import akka.http.impl.engine.server._ +import akka.http.scaladsl.util.FastFuture +import akka.http.scaladsl.model._ import akka.actor._ class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.Extension { diff --git a/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/ServerSettings.scala similarity index 87% rename from akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/ServerSettings.scala index 269f583b3c..b3b9b91d11 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/ServerSettings.scala @@ -2,17 +2,17 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.server +package akka.http.scaladsl -import language.implicitConversions import com.typesafe.config.Config +import scala.language.implicitConversions import scala.concurrent.duration._ -import akka.actor.{ ActorSystem, ActorRefFactory } import akka.ConfigurationException -import akka.http.engine.parsing.ParserSettings -import akka.http.model.HttpHeader -import akka.http.model.headers.{ Server, Host } -import akka.http.util._ +import akka.actor.{ ActorRefFactory, ActorSystem } +import akka.http.impl.engine.parsing.ParserSettings +import akka.http.impl.util._ +import akka.http.scaladsl.model.HttpHeader +import akka.http.scaladsl.model.headers.{ Host, Server } final case class ServerSettings( serverHeader: Option[Server], diff --git a/akka-http-core/src/main/scala/akka/http/model/ContentRange.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala similarity index 90% rename from akka-http-core/src/main/scala/akka/http/model/ContentRange.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala index 256001dcad..0ac6094b29 100644 --- a/akka-http-core/src/main/scala/akka/http/model/ContentRange.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala @@ -2,15 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.{ lang ⇒ jl } +import akka.http.impl.util.{ Rendering, ValueRenderable } +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ -import akka.http.util.{ Rendering, ValueRenderable } - -import akka.http.model.japi.JavaMapping.Implicits._ - -sealed trait ContentRange extends japi.ContentRange with ValueRenderable { +sealed trait ContentRange extends jm.ContentRange with ValueRenderable { // default implementations to override def isSatisfiable: Boolean = false def isOther: Boolean = false diff --git a/akka-http-core/src/main/scala/akka/http/model/ContentType.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentType.scala similarity index 92% rename from akka-http-core/src/main/scala/akka/http/model/ContentType.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentType.scala index 042a46c59f..e4d1fa4b56 100644 --- a/akka-http-core/src/main/scala/akka/http/model/ContentType.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentType.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import language.implicitConversions -import akka.http.util._ +import akka.http.impl.util._ import akka.japi.{ Option ⇒ JOption } - -import akka.http.model.japi.JavaMapping.Implicits._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ final case class ContentTypeRange(mediaRange: MediaRange, charsetRange: HttpCharsetRange) extends ValueRenderable { def matches(contentType: ContentType) = @@ -37,7 +37,7 @@ object ContentTypeRange { } } -abstract case class ContentType private (mediaType: MediaType, definedCharset: Option[HttpCharset]) extends japi.ContentType with ValueRenderable { +abstract case class ContentType private (mediaType: MediaType, definedCharset: Option[HttpCharset]) extends jm.ContentType with ValueRenderable { def render[R <: Rendering](r: R): r.type = definedCharset match { case Some(cs) ⇒ r ~~ mediaType ~~ ContentType.`; charset=` ~~ cs case _ ⇒ r ~~ mediaType @@ -56,7 +56,7 @@ abstract case class ContentType private (mediaType: MediaType, definedCharset: O if (mediaType.encoding == MediaType.Encoding.Open && definedCharset.isEmpty) ContentType(mediaType, charset) else this /** Java API */ - def getDefinedCharset: JOption[japi.HttpCharset] = definedCharset.asJava + def getDefinedCharset: JOption[jm.HttpCharset] = definedCharset.asJava } object ContentType { diff --git a/akka-http-core/src/main/scala/akka/http/util/DateTime.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/DateTime.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/util/DateTime.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/DateTime.scala index fe8a574be3..20ddeaf579 100644 --- a/akka-http-core/src/main/scala/akka/http/util/DateTime.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/DateTime.scala @@ -2,7 +2,9 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.scaladsl.model + +import akka.http.impl.util._ /** * Immutable, fast and efficient Date + Time implementation without any dependencies. @@ -17,7 +19,7 @@ final case class DateTime private (year: Int, // the year second: Int, // the second of the minute. The first second is 0. weekday: Int, // the day of the week. Sunday is 0. clicks: Long, // milliseconds since January 1, 1970, 00:00:00 GMT - isLeapYear: Boolean) extends akka.http.model.japi.DateTime with Ordered[DateTime] with Renderable { + isLeapYear: Boolean) extends akka.http.javadsl.model.DateTime with Ordered[DateTime] with Renderable { /** * The day of the week as a 3 letter abbreviation: * `Sun`, `Mon`, `Tue`, `Wed`, `Thu`, `Fri` or `Sat` diff --git a/akka-http-core/src/main/scala/akka/http/model/ErrorInfo.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ErrorInfo.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/model/ErrorInfo.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/ErrorInfo.scala index ff915e5de7..0a4d331a9b 100644 --- a/akka-http-core/src/main/scala/akka/http/model/ErrorInfo.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ErrorInfo.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import StatusCodes.ClientError diff --git a/akka-http-core/src/main/scala/akka/http/model/FormData.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/FormData.scala similarity index 93% rename from akka-http-core/src/main/scala/akka/http/model/FormData.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/FormData.scala index 30d731cf33..5f208471b3 100644 --- a/akka-http-core/src/main/scala/akka/http/model/FormData.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/FormData.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model /** * Simple model for `application/x-www-form-urlencoded` form data. diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpCharset.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpCharset.scala similarity index 93% rename from akka-http-core/src/main/scala/akka/http/model/HttpCharset.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpCharset.scala index 896fc1c563..8a5f7d86c9 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpCharset.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpCharset.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.lang.{ Iterable ⇒ JIterable } import language.implicitConversions import scala.collection.immutable import scala.util.Try import java.nio.charset.Charset -import akka.http.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util._ /** * A charset range as encountered in `Accept-Charset`. Can either be a single charset, or `*` * if all charsets are supported and optionally a qValue for selecting this choice. */ -sealed abstract class HttpCharsetRange extends japi.HttpCharsetRange with ValueRenderable with WithQValue[HttpCharsetRange] { +sealed abstract class HttpCharsetRange extends jm.HttpCharsetRange with ValueRenderable with WithQValue[HttpCharsetRange] { def qValue: Float def matches(charset: HttpCharset): Boolean @@ -25,8 +26,8 @@ sealed abstract class HttpCharsetRange extends japi.HttpCharsetRange with ValueR def specimen: HttpCharset /** Java API */ - def matches(charset: japi.HttpCharset): Boolean = { - import japi.JavaMapping.Implicits._ + def matches(charset: jm.HttpCharset): Boolean = { + import akka.http.impl.util.JavaMapping.Implicits._ matches(charset.asScala) } } @@ -57,7 +58,7 @@ object HttpCharsetRange { } final case class HttpCharset private[http] (override val value: String)(val aliases: immutable.Seq[String]) - extends japi.HttpCharset with SingletonValueRenderable with WithQValue[HttpCharsetRange] { + extends jm.HttpCharset with SingletonValueRenderable with WithQValue[HttpCharsetRange] { @transient private[this] var _nioCharset: Try[Charset] = HttpCharset.findNioCharset(value) /** Returns the Charset for this charset if available or throws an exception otherwise */ diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala similarity index 91% rename from akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala index efd6e06cd4..561a149005 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import language.implicitConversions import java.io.File @@ -11,18 +11,18 @@ import scala.concurrent.Future import scala.concurrent.duration.FiniteDuration import scala.collection.immutable import akka.util.ByteString -import akka.stream.OperationAttributes._ import akka.stream.FlowMaterializer import akka.stream.scaladsl._ import akka.stream import akka.stream.TimerTransformer -import akka.http.util._ -import japi.JavaMapping.Implicits._ +import akka.http.scaladsl.util.FastFuture +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ /** * Models the entity (aka "body" or "content) of an HTTP message. */ -sealed trait HttpEntity extends japi.HttpEntity { +sealed trait HttpEntity extends jm.HttpEntity { /** * Determines whether this entity is known to be empty. */ @@ -91,23 +91,23 @@ sealed trait HttpEntity extends japi.HttpEntity { } /* An entity that can be used for body parts */ -sealed trait BodyPartEntity extends HttpEntity with japi.BodyPartEntity { +sealed trait BodyPartEntity extends HttpEntity with jm.BodyPartEntity { def withContentType(contentType: ContentType): BodyPartEntity } /* An entity that can be used for requests */ -sealed trait RequestEntity extends HttpEntity with japi.RequestEntity with ResponseEntity { +sealed trait RequestEntity extends HttpEntity with jm.RequestEntity with ResponseEntity { def withContentType(contentType: ContentType): RequestEntity override def transformDataBytes(transformer: Flow[ByteString, ByteString, Any]): RequestEntity } /* An entity that can be used for responses */ -sealed trait ResponseEntity extends HttpEntity with japi.ResponseEntity { +sealed trait ResponseEntity extends HttpEntity with jm.ResponseEntity { def withContentType(contentType: ContentType): ResponseEntity override def transformDataBytes(transformer: Flow[ByteString, ByteString, Any]): ResponseEntity } /* An entity that can be used for requests, responses, and body parts */ -sealed trait UniversalEntity extends japi.UniversalEntity with MessageEntity with BodyPartEntity { +sealed trait UniversalEntity extends jm.UniversalEntity with MessageEntity with BodyPartEntity { def withContentType(contentType: ContentType): UniversalEntity def contentLength: Long @@ -150,7 +150,7 @@ object HttpEntity { * The model for the entity of a "regular" unchunked HTTP message with known, fixed data. */ final case class Strict(contentType: ContentType, data: ByteString) - extends japi.HttpEntityStrict with UniversalEntity { + extends jm.HttpEntityStrict with UniversalEntity { def contentLength: Long = data.length @@ -179,7 +179,7 @@ object HttpEntity { final case class Default(contentType: ContentType, contentLength: Long, data: Source[ByteString, Any]) - extends japi.HttpEntityDefault with UniversalEntity { + extends jm.HttpEntityDefault with UniversalEntity { require(contentLength > 0, "contentLength must be positive (use `HttpEntity.empty(contentType)` for empty entities)") def isKnownEmpty = false @@ -219,7 +219,7 @@ object HttpEntity { * Note that this type of HttpEntity can only be used for HttpResponses. */ final case class CloseDelimited(contentType: ContentType, data: Source[ByteString, Any]) - extends japi.HttpEntityCloseDelimited with ResponseEntity with WithoutKnownLength { + extends jm.HttpEntityCloseDelimited with ResponseEntity with WithoutKnownLength { type Self = CloseDelimited override def isCloseDelimited: Boolean = true @@ -237,7 +237,7 @@ object HttpEntity { * Note that this type of HttpEntity can only be used for BodyParts. */ final case class IndefiniteLength(contentType: ContentType, data: Source[ByteString, Any]) - extends japi.HttpEntityIndefiniteLength with BodyPartEntity with WithoutKnownLength { + extends jm.HttpEntityIndefiniteLength with BodyPartEntity with WithoutKnownLength { override def isIndefiniteLength: Boolean = true def withContentType(contentType: ContentType): IndefiniteLength = @@ -253,7 +253,7 @@ object HttpEntity { * The model for the entity of a chunked HTTP message (with `Transfer-Encoding: chunked`). */ final case class Chunked(contentType: ContentType, chunks: Source[ChunkStreamPart, Any]) - extends japi.HttpEntityChunked with MessageEntity { + extends jm.HttpEntityChunked with MessageEntity { def isKnownEmpty = chunks eq Source.empty override def isChunked: Boolean = true @@ -278,7 +278,7 @@ object HttpEntity { override def productPrefix = "HttpEntity.Chunked" /** Java API */ - def getChunks: stream.javadsl.Source[japi.ChunkStreamPart, Any] = stream.javadsl.Source.adapt(chunks) + def getChunks: stream.javadsl.Source[jm.ChunkStreamPart, Any] = stream.javadsl.Source.adapt(chunks) } object Chunked { /** @@ -295,7 +295,7 @@ object HttpEntity { * An element of the HttpEntity data stream. * Can be either a `Chunk` or a `LastChunk`. */ - sealed abstract class ChunkStreamPart extends japi.ChunkStreamPart { + sealed abstract class ChunkStreamPart extends jm.ChunkStreamPart { def data: ByteString def extension: String def isLastChunk: Boolean @@ -314,7 +314,7 @@ object HttpEntity { def isLastChunk = false /** Java API */ - def getTrailerHeaders: JIterable[japi.HttpHeader] = java.util.Collections.emptyList[japi.HttpHeader] + def getTrailerHeaders: JIterable[jm.HttpHeader] = java.util.Collections.emptyList[jm.HttpHeader] } object Chunk { def apply(string: String): Chunk = apply(ByteString(string)) @@ -331,7 +331,7 @@ object HttpEntity { def isLastChunk = true /** Java API */ - def getTrailerHeaders: JIterable[japi.HttpHeader] = trailer.asJava + def getTrailerHeaders: JIterable[jm.HttpHeader] = trailer.asJava } object LastChunk extends LastChunk("", Nil) } diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpHeader.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala similarity index 93% rename from akka-http-core/src/main/scala/akka/http/model/HttpHeader.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala index 406a50fbed..0ffc81ecbe 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpHeader.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import scala.util.{ Success, Failure } import akka.parboiled2.ParseError -import akka.http.util.ToStringRenderable -import akka.http.model.parser.{ CharacterClasses, HeaderParser } -import akka.http.model.headers._ +import akka.http.impl.util.ToStringRenderable +import akka.http.impl.model.parser.{ CharacterClasses, HeaderParser } +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.model.headers._ /** * The model of an HTTP header. In its most basic form headers are simple name-value pairs. Header names * are compared in a case-insensitive way. */ -abstract class HttpHeader extends japi.HttpHeader with ToStringRenderable { +abstract class HttpHeader extends jm.HttpHeader with ToStringRenderable { def name: String def value: String def lowercaseName: String diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpMessage.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpMessage.scala similarity index 83% rename from akka-http-core/src/main/scala/akka/http/model/HttpMessage.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpMessage.scala index daa097dde4..e0af56e275 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpMessage.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpMessage.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.lang.{ Iterable ⇒ JIterable } import scala.concurrent.duration.FiniteDuration @@ -12,14 +12,16 @@ import scala.reflect.{ classTag, ClassTag } import akka.parboiled2.CharUtils import akka.stream.FlowMaterializer import akka.util.ByteString -import akka.http.util._ +import akka.http.impl.model.JavaUri +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.util.FastFuture._ import headers._ -import FastFuture._ /** * Common base class of HttpRequest and HttpResponse. */ -sealed trait HttpMessage extends japi.HttpMessage { +sealed trait HttpMessage extends jm.HttpMessage { type Self <: HttpMessage def self: Self @@ -78,7 +80,7 @@ sealed trait HttpMessage extends japi.HttpMessage { } /** Returns the first header of the given type if there is one */ - def header[T <: japi.HttpHeader: ClassTag]: Option[T] = { + def header[T <: jm.HttpHeader: ClassTag]: Option[T] = { val erasure = classTag[T].runtimeClass headers.find(erasure.isInstance).asInstanceOf[Option[T]] } @@ -90,7 +92,7 @@ sealed trait HttpMessage extends japi.HttpMessage { */ def connectionCloseExpected: Boolean = HttpMessage.connectionCloseExpected(protocol, header[Connection]) - def addHeader(header: japi.HttpHeader): Self = mapHeaders(_ :+ header.asInstanceOf[HttpHeader]) + def addHeader(header: jm.HttpHeader): Self = mapHeaders(_ :+ header.asInstanceOf[HttpHeader]) /** Removes the header with the given name (case-insensitive) */ def removeHeader(headerName: String): Self = { @@ -101,23 +103,23 @@ sealed trait HttpMessage extends japi.HttpMessage { def withEntity(string: String): Self = withEntity(HttpEntity(string)) def withEntity(bytes: Array[Byte]): Self = withEntity(HttpEntity(bytes)) def withEntity(bytes: ByteString): Self = withEntity(HttpEntity(bytes)) - def withEntity(contentType: japi.ContentType, string: String): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], string)) - def withEntity(contentType: japi.ContentType, bytes: Array[Byte]): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], bytes)) - def withEntity(contentType: japi.ContentType, bytes: ByteString): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], bytes)) - def withEntity(contentType: japi.ContentType, file: java.io.File): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], file)) + def withEntity(contentType: jm.ContentType, string: String): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], string)) + def withEntity(contentType: jm.ContentType, bytes: Array[Byte]): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], bytes)) + def withEntity(contentType: jm.ContentType, bytes: ByteString): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], bytes)) + def withEntity(contentType: jm.ContentType, file: java.io.File): Self = withEntity(HttpEntity(contentType.asInstanceOf[ContentType], file)) import collection.JavaConverters._ /** Java API */ - def getHeaders: JIterable[japi.HttpHeader] = (headers: immutable.Seq[japi.HttpHeader]).asJava + def getHeaders: JIterable[jm.HttpHeader] = (headers: immutable.Seq[jm.HttpHeader]).asJava /** Java API */ - def getHeader[T <: japi.HttpHeader](headerClass: Class[T]): akka.japi.Option[T] = header(ClassTag(headerClass)) + def getHeader[T <: jm.HttpHeader](headerClass: Class[T]): akka.japi.Option[T] = header(ClassTag(headerClass)) /** Java API */ - def getHeader(headerName: String): akka.japi.Option[japi.HttpHeader] = { + def getHeader(headerName: String): akka.japi.Option[jm.HttpHeader] = { val lowerCased = headerName.toRootLowerCase headers.find(_.is(lowerCased)) } /** Java API */ - def addHeaders(headers: JIterable[japi.HttpHeader]): Self = mapHeaders(_ ++ headers.asScala.asInstanceOf[Iterable[HttpHeader]]) + def addHeaders(headers: JIterable[jm.HttpHeader]): Self = mapHeaders(_ ++ headers.asScala.asInstanceOf[Iterable[HttpHeader]]) } object HttpMessage { @@ -135,7 +137,7 @@ final case class HttpRequest(method: HttpMethod = HttpMethods.GET, uri: Uri = Uri./, headers: immutable.Seq[HttpHeader] = Nil, entity: RequestEntity = HttpEntity.Empty, - protocol: HttpProtocol = HttpProtocols.`HTTP/1.1`) extends japi.HttpRequest with HttpMessage { + protocol: HttpProtocol = HttpProtocols.`HTTP/1.1`) extends jm.HttpRequest with HttpMessage { HttpRequest.verifyUri(uri) require(entity.isKnownEmpty || method.isEntityAccepted, "Requests with this method must have an empty entity") require(protocol != HttpProtocols.`HTTP/1.0` || !entity.isInstanceOf[HttpEntity.Chunked], @@ -253,20 +255,20 @@ final case class HttpRequest(method: HttpMethod = HttpMethods.GET, if (headers eq this.headers) this else copy(headers = headers) override def withHeadersAndEntity(headers: immutable.Seq[HttpHeader], entity: RequestEntity): HttpRequest = copy(headers = headers, entity = entity) - override def withEntity(entity: japi.RequestEntity): HttpRequest = copy(entity = entity.asInstanceOf[RequestEntity]) + override def withEntity(entity: jm.RequestEntity): HttpRequest = copy(entity = entity.asInstanceOf[RequestEntity]) override def withEntity(entity: MessageEntity): HttpRequest = copy(entity = entity) def mapEntity(f: RequestEntity ⇒ RequestEntity): HttpRequest = withEntity(f(entity)) - override def withMethod(method: akka.http.model.japi.HttpMethod): HttpRequest = copy(method = method.asInstanceOf[HttpMethod]) - override def withProtocol(protocol: akka.http.model.japi.HttpProtocol): HttpRequest = copy(protocol = protocol.asInstanceOf[HttpProtocol]) + override def withMethod(method: akka.http.javadsl.model.HttpMethod): HttpRequest = copy(method = method.asInstanceOf[HttpMethod]) + override def withProtocol(protocol: akka.http.javadsl.model.HttpProtocol): HttpRequest = copy(protocol = protocol.asInstanceOf[HttpProtocol]) override def withUri(path: String): HttpRequest = withUri(Uri(path)) def withUri(uri: Uri): HttpRequest = copy(uri = uri) /** Java API */ - override def getUri: japi.Uri = japi.Accessors.Uri(uri) + override def getUri: jm.Uri = jm.Accessors.Uri(uri) /** Java API */ - override def withUri(relativeUri: akka.http.model.japi.Uri): HttpRequest = copy(uri = relativeUri.asInstanceOf[japi.JavaUri].uri) + override def withUri(relativeUri: akka.http.javadsl.model.Uri): HttpRequest = copy(uri = relativeUri.asInstanceOf[JavaUri].uri) } object HttpRequest { @@ -318,7 +320,7 @@ object HttpRequest { final case class HttpResponse(status: StatusCode = StatusCodes.OK, headers: immutable.Seq[HttpHeader] = Nil, entity: ResponseEntity = HttpEntity.Empty, - protocol: HttpProtocol = HttpProtocols.`HTTP/1.1`) extends japi.HttpResponse with HttpMessage { + protocol: HttpProtocol = HttpProtocols.`HTTP/1.1`) extends jm.HttpResponse with HttpMessage { require(entity.isKnownEmpty || status.allowsEntity, "Responses with this status code must have an empty entity") require(protocol == HttpProtocols.`HTTP/1.1` || !entity.isInstanceOf[HttpEntity.Chunked], "HTTP/1.0 responses must not have a chunked entity") @@ -332,15 +334,15 @@ final case class HttpResponse(status: StatusCode = StatusCodes.OK, override def withHeaders(headers: immutable.Seq[HttpHeader]) = if (headers eq this.headers) this else copy(headers = headers) - override def withProtocol(protocol: akka.http.model.japi.HttpProtocol): akka.http.model.japi.HttpResponse = copy(protocol = protocol.asInstanceOf[HttpProtocol]) - override def withStatus(statusCode: Int): akka.http.model.japi.HttpResponse = copy(status = statusCode) - override def withStatus(statusCode: akka.http.model.japi.StatusCode): akka.http.model.japi.HttpResponse = copy(status = statusCode.asInstanceOf[StatusCode]) + override def withProtocol(protocol: akka.http.javadsl.model.HttpProtocol): akka.http.javadsl.model.HttpResponse = copy(protocol = protocol.asInstanceOf[HttpProtocol]) + override def withStatus(statusCode: Int): akka.http.javadsl.model.HttpResponse = copy(status = statusCode) + override def withStatus(statusCode: akka.http.javadsl.model.StatusCode): akka.http.javadsl.model.HttpResponse = copy(status = statusCode.asInstanceOf[StatusCode]) override def withHeadersAndEntity(headers: immutable.Seq[HttpHeader], entity: MessageEntity): HttpResponse = withHeadersAndEntity(headers, entity: ResponseEntity) def withHeadersAndEntity(headers: immutable.Seq[HttpHeader], entity: ResponseEntity): HttpResponse = copy(headers = headers, entity = entity) - override def withEntity(entity: japi.ResponseEntity): HttpResponse = copy(entity = entity.asInstanceOf[ResponseEntity]) + override def withEntity(entity: jm.ResponseEntity): HttpResponse = copy(entity = entity.asInstanceOf[ResponseEntity]) override def withEntity(entity: MessageEntity): HttpResponse = copy(entity = entity) - override def withEntity(entity: japi.RequestEntity): HttpResponse = withEntity(entity: japi.ResponseEntity) + override def withEntity(entity: jm.RequestEntity): HttpResponse = withEntity(entity: jm.ResponseEntity) def mapEntity(f: ResponseEntity ⇒ ResponseEntity): HttpResponse = withEntity(f(entity)) } \ No newline at end of file diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpMethod.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpMethod.scala similarity index 93% rename from akka-http-core/src/main/scala/akka/http/model/HttpMethod.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpMethod.scala index c545380432..8145d011c8 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpMethod.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpMethod.scala @@ -2,10 +2,10 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model -import scala.collection.immutable -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } /** * The method of an HTTP request. @@ -16,7 +16,7 @@ import akka.http.util._ final case class HttpMethod private[http] (override val value: String, isSafe: Boolean, isIdempotent: Boolean, - isEntityAccepted: Boolean) extends japi.HttpMethod with SingletonValueRenderable { + isEntityAccepted: Boolean) extends jm.HttpMethod with SingletonValueRenderable { def name = value override def toString: String = s"HttpMethod($value)" } diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpProtocol.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpProtocol.scala similarity index 67% rename from akka-http-core/src/main/scala/akka/http/model/HttpProtocol.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpProtocol.scala index ac25b4dcc2..748a794632 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpProtocol.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpProtocol.scala @@ -2,12 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model -import akka.http.util.{ SingletonValueRenderable, ObjectRegistry } +import akka.http.impl.util.{ SingletonValueRenderable, ObjectRegistry } +import akka.http.javadsl.{ model ⇒ jm } /** The protocol of an HTTP message */ -final case class HttpProtocol private[http] (override val value: String) extends japi.HttpProtocol with SingletonValueRenderable +final case class HttpProtocol private[http] (override val value: String) extends jm.HttpProtocol with SingletonValueRenderable object HttpProtocols extends ObjectRegistry[String, HttpProtocol] { private def register(p: HttpProtocol): HttpProtocol = register(p.value, p) diff --git a/akka-http-core/src/main/scala/akka/http/model/MediaType.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/MediaType.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala index 4e7a3d1365..c57c35edf6 100644 --- a/akka-http-core/src/main/scala/akka/http/model/MediaType.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import language.implicitConversions -import scala.collection.immutable -import akka.http.util._ import java.util +import scala.collection.immutable +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } -sealed abstract class MediaRange extends japi.MediaRange with Renderable with WithQValue[MediaRange] { +sealed abstract class MediaRange extends jm.MediaRange with Renderable with WithQValue[MediaRange] { def value: String def mainType: String def params: Map[String, String] @@ -46,8 +47,8 @@ sealed abstract class MediaRange extends japi.MediaRange with Renderable with Wi params.asJava } /** Java API */ - def matches(mediaType: japi.MediaType): Boolean = { - import japi.JavaMapping.Implicits._ + def matches(mediaType: jm.MediaType): Boolean = { + import akka.http.impl.util.JavaMapping.Implicits._ matches(mediaType.asScala) } } @@ -168,7 +169,7 @@ sealed abstract case class MediaType private[http] (value: String)(val mainType: val encoding: MediaType.Encoding, val fileExtensions: immutable.Seq[String], val params: Map[String, String]) - extends japi.MediaType with LazyValueBytesRenderable with WithQValue[MediaRange] { + extends jm.MediaType with LazyValueBytesRenderable with WithQValue[MediaRange] { def isApplication = false def isAudio = false def isImage = false diff --git a/akka-http-core/src/main/scala/akka/http/model/Multipart.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/model/Multipart.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala index bd5455dc49..5cc1f17906 100644 --- a/akka-http-core/src/main/scala/akka/http/model/Multipart.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import scala.collection.immutable.VectorBuilder import scala.concurrent.duration.FiniteDuration @@ -11,8 +11,8 @@ import scala.collection.immutable import scala.util.{ Failure, Success, Try } import akka.stream.FlowMaterializer import akka.stream.scaladsl.Source -import akka.http.util.FastFuture -import akka.http.model.headers._ +import akka.http.scaladsl.util.FastFuture +import akka.http.scaladsl.model.headers._ import FastFuture._ trait Multipart { diff --git a/akka-http-core/src/main/scala/akka/http/model/RemoteAddress.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/RemoteAddress.scala similarity index 81% rename from akka-http-core/src/main/scala/akka/http/model/RemoteAddress.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/RemoteAddress.scala index c358d481af..860c7a2219 100644 --- a/akka-http-core/src/main/scala/akka/http/model/RemoteAddress.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/RemoteAddress.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.net.{ UnknownHostException, InetAddress } -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ -import japi.JavaMapping.Implicits._ - -sealed abstract class RemoteAddress extends japi.RemoteAddress with ValueRenderable { +sealed abstract class RemoteAddress extends jm.RemoteAddress with ValueRenderable { def toOption: Option[InetAddress] def isUnknown: Boolean diff --git a/akka-http-core/src/main/scala/akka/http/model/StatusCode.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/StatusCode.scala similarity index 98% rename from akka-http-core/src/main/scala/akka/http/model/StatusCode.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/StatusCode.scala index 2b648c9901..ec340d026d 100644 --- a/akka-http-core/src/main/scala/akka/http/model/StatusCode.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/StatusCode.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import language.implicitConversions -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } /** The result status code of an HTTP response. */ -sealed abstract class StatusCode extends japi.StatusCode with LazyValueBytesRenderable { +sealed abstract class StatusCode extends jm.StatusCode with LazyValueBytesRenderable { def intValue: Int def value: String = intValue.toString + ' ' + reason def reason: String diff --git a/akka-http-core/src/main/scala/akka/http/model/TransferEncoding.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/TransferEncoding.scala similarity index 74% rename from akka-http-core/src/main/scala/akka/http/model/TransferEncoding.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/TransferEncoding.scala index 69339d2c02..21a306e231 100644 --- a/akka-http-core/src/main/scala/akka/http/model/TransferEncoding.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/TransferEncoding.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model -import akka.http.util.{ Rendering, SingletonValueRenderable, Renderable } +import akka.http.impl.util.{ Rendering, SingletonValueRenderable, Renderable } +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ -import akka.http.model.japi.JavaMapping.Implicits._ - -sealed abstract class TransferEncoding extends japi.TransferEncoding with Renderable { +sealed abstract class TransferEncoding extends jm.TransferEncoding with Renderable { def name: String def params: Map[String, String] diff --git a/akka-http-core/src/main/scala/akka/http/model/Uri.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Uri.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/model/Uri.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/Uri.scala index 0b3a67df06..2f655125f5 100644 --- a/akka-http-core/src/main/scala/akka/http/model/Uri.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Uri.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import language.implicitConversions import java.net.{ Inet4Address, Inet6Address, InetAddress } @@ -12,9 +12,10 @@ import scala.annotation.tailrec import scala.collection.{ immutable, mutable, LinearSeqOptimized } import scala.collection.immutable.LinearSeq import akka.parboiled2.{ CharUtils, CharPredicate, ParserInput } -import akka.http.model.parser.UriParser -import akka.http.model.parser.CharacterClasses._ -import akka.http.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.model.parser.UriParser +import akka.http.impl.model.parser.CharacterClasses._ +import akka.http.impl.util._ import Uri._ /** @@ -316,7 +317,7 @@ object Uri { val Empty = Authority(Host.Empty) } - sealed abstract class Host extends japi.Host { + sealed abstract class Host extends jm.Host { def address: String def isEmpty: Boolean def toOption: Option[NonEmptyHost] @@ -332,7 +333,7 @@ object Uri { /** Java API */ def getInetAddresses: Iterable[InetAddress] = { - import akka.http.model.japi.JavaMapping.Implicits._ + import akka.http.impl.util.JavaMapping.Implicits._ inetAddresses.asJava } } diff --git a/akka-http-core/src/main/scala/akka/http/model/WithQValue.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/WithQValue.scala similarity index 92% rename from akka-http-core/src/main/scala/akka/http/model/WithQValue.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/WithQValue.scala index 0c2e7c5b58..45b11a7883 100644 --- a/akka-http-core/src/main/scala/akka/http/model/WithQValue.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/WithQValue.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model /** Helper trait for objects that allow creating new instances with a modified qValue. */ trait WithQValue[T] { diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/ByteRange.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ByteRange.scala similarity index 89% rename from akka-http-core/src/main/scala/akka/http/model/headers/ByteRange.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ByteRange.scala index 35037f5139..365ebd2df9 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/ByteRange.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ByteRange.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers -import akka.http.util.{ Rendering, ValueRenderable } -import akka.japi.{ Option ⇒ JOption } import java.{ lang ⇒ jl } +import akka.japi.{ Option ⇒ JOption } +import akka.http.impl.util.{ Rendering, ValueRenderable } +import akka.http.javadsl.{ model ⇒ jm } -sealed abstract class ByteRange extends japi.headers.ByteRange with ValueRenderable { +sealed abstract class ByteRange extends jm.headers.ByteRange with ValueRenderable { /** Java API */ def getSliceFirst: JOption[jl.Long] = JOption.none /** Java API */ diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/CacheDirective.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/CacheDirective.scala similarity index 95% rename from akka-http-core/src/main/scala/akka/http/model/headers/CacheDirective.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/CacheDirective.scala index 6aaeb3e5a8..29f73b1b1c 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/CacheDirective.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/CacheDirective.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import scala.annotation.{ varargs, tailrec } import scala.collection.immutable -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } -sealed trait CacheDirective extends Renderable with japi.headers.CacheDirective { +sealed trait CacheDirective extends Renderable with jm.headers.CacheDirective { def value: String } diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/ContentDispositionType.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ContentDispositionType.scala similarity index 66% rename from akka-http-core/src/main/scala/akka/http/model/headers/ContentDispositionType.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ContentDispositionType.scala index 4d0e1462e8..ce31a29755 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/ContentDispositionType.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ContentDispositionType.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers -import akka.http.util.{ Rendering, SingletonValueRenderable, Renderable } +import akka.http.impl.util.{ Rendering, SingletonValueRenderable, Renderable } +import akka.http.javadsl.{ model ⇒ jm } -sealed trait ContentDispositionType extends Renderable with japi.headers.ContentDispositionType +sealed trait ContentDispositionType extends Renderable with jm.headers.ContentDispositionType object ContentDispositionTypes { protected abstract class Predefined extends ContentDispositionType with SingletonValueRenderable { diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/EntityTag.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/EntityTag.scala similarity index 80% rename from akka-http-core/src/main/scala/akka/http/model/headers/EntityTag.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/EntityTag.scala index f714d0ac41..16079604f7 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/EntityTag.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/EntityTag.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import scala.collection.immutable -import akka.http.util.{ Renderer, Rendering, ValueRenderable } +import akka.http.impl.util.{ Renderer, Rendering, ValueRenderable } +import akka.http.javadsl.{ model ⇒ jm } -final case class EntityTag(tag: String, weak: Boolean = false) extends japi.headers.EntityTag with ValueRenderable { +final case class EntityTag(tag: String, weak: Boolean = false) extends jm.headers.EntityTag with ValueRenderable { def render[R <: Rendering](r: R): r.type = if (weak) r ~~ "W/" ~~#! tag else r ~~#! tag } @@ -22,7 +22,7 @@ object EntityTag { other.tag == eTag.tag && (weakComparison || !other.weak && !eTag.weak) } -sealed abstract class EntityTagRange extends japi.headers.EntityTagRange with ValueRenderable +sealed abstract class EntityTagRange extends jm.headers.EntityTagRange with ValueRenderable object EntityTagRange { def apply(tags: EntityTag*) = Default(immutable.Seq(tags: _*)) diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpChallenge.scala similarity index 68% rename from akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpChallenge.scala index 443997ec31..e918b472c1 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpChallenge.scala @@ -2,16 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers -import akka.http.util._ import java.util - -import akka.http.model.japi.JavaMapping.Implicits._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util._ +import akka.http.impl.util.JavaMapping.Implicits._ final case class HttpChallenge(scheme: String, realm: String, - params: Map[String, String] = Map.empty) extends japi.headers.HttpChallenge with ValueRenderable { + params: Map[String, String] = Map.empty) extends jm.headers.HttpChallenge with ValueRenderable { def render[R <: Rendering](r: R): r.type = { r ~~ scheme ~~ " realm=" ~~#! realm diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/HttpCookie.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCookie.scala similarity index 85% rename from akka-http-core/src/main/scala/akka/http/model/headers/HttpCookie.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCookie.scala index e58fa33935..86f453059a 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/HttpCookie.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCookie.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import akka.parboiled2.CharPredicate -import akka.http.util._ import akka.japi.{ Option ⇒ JOption } - -import akka.http.model.japi.JavaMapping.Implicits._ +import akka.http.scaladsl.model.DateTime +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ // see http://tools.ietf.org/html/rfc6265 final case class HttpCookie( @@ -21,7 +21,7 @@ final case class HttpCookie( path: Option[String] = None, secure: Boolean = false, httpOnly: Boolean = false, - extension: Option[String] = None) extends japi.headers.HttpCookie with ValueRenderable { + extension: Option[String] = None) extends jm.headers.HttpCookie with ValueRenderable { import HttpCookie._ @@ -53,11 +53,11 @@ final case class HttpCookie( /** Java API */ def getMaxAge: JOption[java.lang.Long] = maxAge.asJava /** Java API */ - def getExpires: JOption[japi.DateTime] = expires.asJava + def getExpires: JOption[jm.DateTime] = expires.asJava } object HttpCookie { - import akka.http.model.parser.CharacterClasses._ + import akka.http.impl.model.parser.CharacterClasses._ def nameChars = tchar // http://tools.ietf.org/html/rfc6265#section-4.1.1 diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/HttpCredentials.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCredentials.scala similarity index 80% rename from akka-http-core/src/main/scala/akka/http/model/headers/HttpCredentials.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCredentials.scala index 1b01e71e38..28b1e6e0ef 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/HttpCredentials.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCredentials.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import akka.parboiled2.util.Base64 -import akka.http.model.HttpCharsets._ -import akka.http.util.{ Rendering, ValueRenderable } -import akka.http.model.japi.JavaMapping.Implicits._ +import akka.http.scaladsl.model.HttpCharsets._ +import akka.http.impl.util.{ Rendering, ValueRenderable } +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ -sealed abstract class HttpCredentials extends japi.headers.HttpCredentials with ValueRenderable { +sealed abstract class HttpCredentials extends jm.headers.HttpCredentials with ValueRenderable { def scheme: String def token: String def params: Map[String, String] @@ -19,7 +19,7 @@ sealed abstract class HttpCredentials extends japi.headers.HttpCredentials with def getParams: java.util.Map[String, String] = params.asJava } -final case class BasicHttpCredentials(username: String, password: String) extends japi.headers.BasicHttpCredentials { +final case class BasicHttpCredentials(username: String, password: String) extends jm.headers.BasicHttpCredentials { val cookie = { val userPass = username + ':' + password val bytes = userPass.getBytes(`UTF-8`.nioCharset) @@ -43,7 +43,7 @@ object BasicHttpCredentials { } } -final case class OAuth2BearerToken(token: String) extends japi.headers.OAuth2BearerToken { +final case class OAuth2BearerToken(token: String) extends jm.headers.OAuth2BearerToken { def render[R <: Rendering](r: R): r.type = r ~~ "Bearer " ~~ token def scheme: String = "Bearer" diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/HttpEncoding.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpEncoding.scala similarity index 81% rename from akka-http-core/src/main/scala/akka/http/model/headers/HttpEncoding.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpEncoding.scala index 3d32b39c1a..dc69e14158 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/HttpEncoding.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpEncoding.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import language.implicitConversions -import akka.http.util._ -import akka.http.model.japi.JavaMapping.Implicits._ +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.model.WithQValue +import akka.http.impl.util.JavaMapping.Implicits._ -sealed abstract class HttpEncodingRange extends japi.headers.HttpEncodingRange with ValueRenderable with WithQValue[HttpEncodingRange] { +sealed abstract class HttpEncodingRange extends jm.headers.HttpEncodingRange with ValueRenderable with WithQValue[HttpEncodingRange] { def qValue: Float def matches(encoding: HttpEncoding): Boolean /** Java API */ - def matches(encoding: japi.headers.HttpEncoding): Boolean = matches(encoding.asScala) + def matches(encoding: jm.headers.HttpEncoding): Boolean = matches(encoding.asScala) } object HttpEncodingRange { @@ -38,7 +39,7 @@ object HttpEncodingRange { def apply(encoding: HttpEncoding, qValue: Float): HttpEncodingRange = One(encoding, qValue) } -final case class HttpEncoding private[http] (value: String) extends japi.headers.HttpEncoding with LazyValueBytesRenderable with WithQValue[HttpEncodingRange] { +final case class HttpEncoding private[http] (value: String) extends jm.headers.HttpEncoding with LazyValueBytesRenderable with WithQValue[HttpEncodingRange] { def withQValue(qValue: Float): HttpEncodingRange = HttpEncodingRange(this, qValue.toFloat) } diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/HttpOrigin.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpOrigin.scala similarity index 71% rename from akka-http-core/src/main/scala/akka/http/model/headers/HttpOrigin.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpOrigin.scala index 08e42a0ab2..0f1c9cbe8a 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/HttpOrigin.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpOrigin.scala @@ -2,22 +2,22 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import language.implicitConversions import scala.collection.immutable import akka.parboiled2.UTF8 -import akka.http.model.parser.UriParser -import akka.http.util._ +import akka.http.impl.model.parser.UriParser +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.model.Uri +import akka.http.impl.util.JavaMapping.Implicits._ -import akka.http.model.japi.JavaMapping.Implicits._ - -abstract class HttpOriginRange extends japi.headers.HttpOriginRange with ValueRenderable { +abstract class HttpOriginRange extends jm.headers.HttpOriginRange with ValueRenderable { def matches(origin: HttpOrigin): Boolean /** Java API */ - def matches(origin: japi.headers.HttpOrigin): Boolean = matches(origin.asScala) + def matches(origin: jm.headers.HttpOrigin): Boolean = matches(origin.asScala) } object HttpOriginRange { case object `*` extends HttpOriginRange { @@ -33,7 +33,7 @@ object HttpOriginRange { } } -final case class HttpOrigin(scheme: String, host: Host) extends japi.headers.HttpOrigin with ValueRenderable { +final case class HttpOrigin(scheme: String, host: Host) extends jm.headers.HttpOrigin with ValueRenderable { def render[R <: Rendering](r: R): r.type = host.renderValue(r ~~ scheme ~~ "://") } object HttpOrigin { diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/LanguageRange.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala similarity index 74% rename from akka-http-core/src/main/scala/akka/http/model/headers/LanguageRange.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala index 2f61225c7d..f9dbe60c03 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/LanguageRange.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import scala.collection.immutable -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.scaladsl.model.WithQValue +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ -import akka.http.model.japi.JavaMapping.Implicits._ - -sealed trait LanguageRange extends japi.headers.LanguageRange with ValueRenderable with WithQValue[LanguageRange] { +sealed trait LanguageRange extends jm.headers.LanguageRange with ValueRenderable with WithQValue[LanguageRange] { def qValue: Float def primaryTag: String def subTags: immutable.Seq[String] @@ -23,7 +23,7 @@ sealed trait LanguageRange extends japi.headers.LanguageRange with ValueRenderab } /** Java API */ - def matches(language: japi.headers.Language): Boolean = matches(language.asScala) + def matches(language: jm.headers.Language): Boolean = matches(language.asScala) def getSubTags: java.lang.Iterable[String] = subTags.asJava } object LanguageRange { @@ -38,7 +38,7 @@ object LanguageRange { object `*` extends `*`(1.0f) } -final case class Language(primaryTag: String, subTags: immutable.Seq[String], qValue: Float = 1.0f) extends japi.headers.Language with LanguageRange { +final case class Language(primaryTag: String, subTags: immutable.Seq[String], qValue: Float = 1.0f) extends jm.headers.Language with LanguageRange { require(0.0f <= qValue && qValue <= 1.0f, "qValue must be >= 0 and <= 1.0") def matches(lang: Language): Boolean = lang.primaryTag == this.primaryTag && lang.subTags == this.subTags def withQValue(qValue: Float): Language = Language(primaryTag, subTags, qValue) diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/LinkValue.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LinkValue.scala similarity index 87% rename from akka-http-core/src/main/scala/akka/http/model/headers/LinkValue.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LinkValue.scala index 891cb70b37..1f243decbd 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/LinkValue.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LinkValue.scala @@ -2,32 +2,32 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import scala.collection.immutable import akka.parboiled2.CharPredicate -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.scaladsl.model._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.util.JavaMapping.Implicits._ import UriRendering.UriRenderer -import akka.http.model.japi.JavaMapping.Implicits._ - -final case class LinkValue(uri: Uri, params: immutable.Seq[LinkParam]) extends japi.headers.LinkValue with ValueRenderable { +final case class LinkValue(uri: Uri, params: immutable.Seq[LinkParam]) extends jm.headers.LinkValue with ValueRenderable { def render[R <: Rendering](r: R): r.type = { r ~~ '<' ~~ uri ~~ '>' if (params.nonEmpty) r ~~ "; " ~~ params r } - def getUri: japi.Uri = uri.asJava - def getParams: java.lang.Iterable[japi.headers.LinkParam] = params.asJava + def getUri: jm.Uri = uri.asJava + def getParams: java.lang.Iterable[jm.headers.LinkParam] = params.asJava } object LinkValue { def apply(uri: Uri, params: LinkParam*): LinkValue = apply(uri, immutable.Seq(params: _*)) } -sealed abstract class LinkParam extends japi.headers.LinkParam with ToStringRenderable { +sealed abstract class LinkParam extends jm.headers.LinkParam with ToStringRenderable { val key: String = getClass.getSimpleName def value: AnyRef } diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/ProductVersion.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala similarity index 82% rename from akka-http-core/src/main/scala/akka/http/model/headers/ProductVersion.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala index 9b4eeb59fe..e1b6becd01 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/ProductVersion.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala @@ -2,17 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.headers - -import akka.http.model.japi +package akka.http.scaladsl.model.headers import scala.collection.immutable import scala.util.{ Failure, Success } import akka.parboiled2.ParseError -import akka.http.model.parser.HeaderParser -import akka.http.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.impl.model.parser.HeaderParser +import akka.http.impl.util._ -final case class ProductVersion(product: String = "", version: String = "", comment: String = "") extends japi.headers.ProductVersion with ValueRenderable { +final case class ProductVersion(product: String = "", version: String = "", comment: String = "") extends jm.headers.ProductVersion with ValueRenderable { def render[R <: Rendering](r: R): r.type = { r ~~ product if (!version.isEmpty) r ~~ '/' ~~ version diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/RangeUnit.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/RangeUnit.scala similarity index 62% rename from akka-http-core/src/main/scala/akka/http/model/headers/RangeUnit.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/RangeUnit.scala index bfc84a7aa9..c7297be281 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/RangeUnit.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/RangeUnit.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers -import akka.http.util.{ Rendering, ValueRenderable } +import akka.http.impl.util.{ Rendering, ValueRenderable } +import akka.http.javadsl.{ model ⇒ jm } -sealed abstract class RangeUnit extends japi.headers.RangeUnit with ValueRenderable { +sealed abstract class RangeUnit extends jm.headers.RangeUnit with ValueRenderable { def name: String } diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/UpgradeProtocol.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/UpgradeProtocol.scala similarity index 74% rename from akka-http-core/src/main/scala/akka/http/model/headers/UpgradeProtocol.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/UpgradeProtocol.scala index f506c1bcda..b9c3dbb73c 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/UpgradeProtocol.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/UpgradeProtocol.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.headers +package akka.http.scaladsl.model.headers -import akka.http.util.{ Rendering, ValueRenderable } +import akka.http.impl.util.{ Rendering, ValueRenderable } final case class UpgradeProtocol(name: String, version: Option[String] = None) extends ValueRenderable { def render[R <: Rendering](r: R): r.type = { diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/WebsocketExtension.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/WebsocketExtension.scala similarity index 84% rename from akka-http-core/src/main/scala/akka/http/model/headers/WebsocketExtension.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/WebsocketExtension.scala index 5fcdf6bd8e..f11f0bbaba 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/WebsocketExtension.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/WebsocketExtension.scala @@ -2,11 +2,10 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.headers - -import akka.http.util.{ Rendering, ValueRenderable } +package akka.http.scaladsl.model.headers import scala.collection.immutable +import akka.http.impl.util.{ Rendering, ValueRenderable } /** * A websocket extension as defined in http://tools.ietf.org/html/rfc6455#section-4.3 diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/headers.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/headers.scala similarity index 86% rename from akka-http-core/src/main/scala/akka/http/model/headers/headers.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/headers.scala index 55d928b5c4..156fba395d 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/headers.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/headers.scala @@ -2,18 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package headers +package akka.http.scaladsl.model.headers import java.lang.Iterable import java.net.InetSocketAddress import java.security.MessageDigest import java.util -import akka.parboiled2.util.Base64 - import scala.annotation.tailrec import scala.collection.immutable -import akka.http.util._ +import akka.parboiled2.util.Base64 +import akka.http.impl.util._ +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.model._ sealed abstract class ModeledCompanion extends Renderable { val name = getClass.getSimpleName.replace("$minus", "-").dropRight(1) // trailing $ @@ -34,7 +34,7 @@ sealed trait ModeledHeader extends HttpHeader with Serializable { /** * Superclass for user-defined custom headers defined by implementing `name` and `value`. */ -abstract class CustomHeader extends japi.headers.CustomHeader { +abstract class CustomHeader extends jm.headers.CustomHeader { /** Override to return true if this header shouldn't be rendered */ def suppressRendering: Boolean = false @@ -42,7 +42,7 @@ abstract class CustomHeader extends japi.headers.CustomHeader { final def render[R <: Rendering](r: R): r.type = r ~~ name ~~ ':' ~~ ' ' ~~ value } -import japi.JavaMapping.Implicits._ +import akka.http.impl.util.JavaMapping.Implicits._ // http://tools.ietf.org/html/rfc7230#section-6.1 object Connection extends ModeledCompanion { @@ -95,7 +95,7 @@ object Host extends ModeledCompanion { def apply(host: String, port: Int): Host = apply(Uri.Host(host), port) val empty = Host("") } -final case class Host(host: Uri.Host, port: Int = 0) extends japi.headers.Host with ModeledHeader { +final case class Host(host: Uri.Host, port: Int = 0) extends jm.headers.Host with ModeledHeader { import UriRendering.HostRenderer require((port >> 16) == 0, "Illegal port: " + port) def isEmpty = host.isEmpty @@ -119,7 +119,7 @@ final case class `If-Range`(entityTagOrDateTime: Either[EntityTag, DateTime]) ex } // FIXME: resurrect SSL-Session-Info header once akka.io.SslTlsSupport supports it -final case class RawHeader(name: String, value: String) extends japi.headers.RawHeader { +final case class RawHeader(name: String, value: String) extends jm.headers.RawHeader { val lowercaseName = name.toRootLowerCase def render[R <: Rendering](r: R): r.type = r ~~ name ~~ ':' ~~ ' ' ~~ value } @@ -129,14 +129,14 @@ object Accept extends ModeledCompanion { def apply(mediaRanges: MediaRange*): Accept = apply(immutable.Seq(mediaRanges: _*)) implicit val mediaRangesRenderer = Renderer.defaultSeqRenderer[MediaRange] // cache } -final case class Accept(mediaRanges: immutable.Seq[MediaRange]) extends japi.headers.Accept with ModeledHeader { +final case class Accept(mediaRanges: immutable.Seq[MediaRange]) extends jm.headers.Accept with ModeledHeader { import Accept.mediaRangesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ mediaRanges protected def companion = Accept def acceptsAll = mediaRanges.exists(mr ⇒ mr.isWildcard && mr.qValue > 0f) /** Java API */ - def getMediaRanges: Iterable[japi.MediaRange] = mediaRanges.asJava + def getMediaRanges: Iterable[jm.MediaRange] = mediaRanges.asJava } // http://tools.ietf.org/html/rfc7231#section-5.3.3 @@ -144,14 +144,14 @@ object `Accept-Charset` extends ModeledCompanion { def apply(first: HttpCharsetRange, more: HttpCharsetRange*): `Accept-Charset` = apply(immutable.Seq(first +: more: _*)) implicit val charsetRangesRenderer = Renderer.defaultSeqRenderer[HttpCharsetRange] // cache } -final case class `Accept-Charset`(charsetRanges: immutable.Seq[HttpCharsetRange]) extends japi.headers.AcceptCharset with ModeledHeader { +final case class `Accept-Charset`(charsetRanges: immutable.Seq[HttpCharsetRange]) extends jm.headers.AcceptCharset with ModeledHeader { require(charsetRanges.nonEmpty, "charsetRanges must not be empty") import `Accept-Charset`.charsetRangesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ charsetRanges protected def companion = `Accept-Charset` /** Java API */ - def getCharsetRanges: Iterable[japi.HttpCharsetRange] = charsetRanges.asJava + def getCharsetRanges: Iterable[jm.HttpCharsetRange] = charsetRanges.asJava } // http://tools.ietf.org/html/rfc7231#section-5.3.4 @@ -159,13 +159,13 @@ object `Accept-Encoding` extends ModeledCompanion { def apply(encodings: HttpEncodingRange*): `Accept-Encoding` = apply(immutable.Seq(encodings: _*)) implicit val encodingsRenderer = Renderer.defaultSeqRenderer[HttpEncodingRange] // cache } -final case class `Accept-Encoding`(encodings: immutable.Seq[HttpEncodingRange]) extends japi.headers.AcceptEncoding with ModeledHeader { +final case class `Accept-Encoding`(encodings: immutable.Seq[HttpEncodingRange]) extends jm.headers.AcceptEncoding with ModeledHeader { import `Accept-Encoding`.encodingsRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ encodings protected def companion = `Accept-Encoding` /** Java API */ - def getEncodings: Iterable[japi.headers.HttpEncodingRange] = encodings.asJava + def getEncodings: Iterable[jm.headers.HttpEncodingRange] = encodings.asJava } // http://tools.ietf.org/html/rfc7231#section-5.3.5 @@ -173,14 +173,14 @@ object `Accept-Language` extends ModeledCompanion { def apply(first: LanguageRange, more: LanguageRange*): `Accept-Language` = apply(immutable.Seq(first +: more: _*)) implicit val languagesRenderer = Renderer.defaultSeqRenderer[LanguageRange] // cache } -final case class `Accept-Language`(languages: immutable.Seq[LanguageRange]) extends japi.headers.AcceptLanguage with ModeledHeader { +final case class `Accept-Language`(languages: immutable.Seq[LanguageRange]) extends jm.headers.AcceptLanguage with ModeledHeader { require(languages.nonEmpty, "languages must not be empty") import `Accept-Language`.languagesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ languages protected def companion = `Accept-Language` /** Java API */ - def getLanguages: Iterable[japi.headers.LanguageRange] = languages.asJava + def getLanguages: Iterable[jm.headers.LanguageRange] = languages.asJava } // http://tools.ietf.org/html/rfc7233#section-2.3 @@ -188,18 +188,18 @@ object `Accept-Ranges` extends ModeledCompanion { def apply(rangeUnits: RangeUnit*): `Accept-Ranges` = apply(immutable.Seq(rangeUnits: _*)) implicit val rangeUnitsRenderer = Renderer.defaultSeqRenderer[RangeUnit] // cache } -final case class `Accept-Ranges`(rangeUnits: immutable.Seq[RangeUnit]) extends japi.headers.AcceptRanges with ModeledHeader { +final case class `Accept-Ranges`(rangeUnits: immutable.Seq[RangeUnit]) extends jm.headers.AcceptRanges with ModeledHeader { import `Accept-Ranges`.rangeUnitsRenderer def renderValue[R <: Rendering](r: R): r.type = if (rangeUnits.isEmpty) r ~~ "none" else r ~~ rangeUnits protected def companion = `Accept-Ranges` /** Java API */ - def getRangeUnits: Iterable[japi.headers.RangeUnit] = rangeUnits.asJava + def getRangeUnits: Iterable[jm.headers.RangeUnit] = rangeUnits.asJava } // http://www.w3.org/TR/cors/#access-control-allow-credentials-response-header object `Access-Control-Allow-Credentials` extends ModeledCompanion -final case class `Access-Control-Allow-Credentials`(allow: Boolean) extends japi.headers.AccessControlAllowCredentials with ModeledHeader { +final case class `Access-Control-Allow-Credentials`(allow: Boolean) extends jm.headers.AccessControlAllowCredentials with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ allow.toString protected def companion = `Access-Control-Allow-Credentials` } @@ -209,7 +209,7 @@ object `Access-Control-Allow-Headers` extends ModeledCompanion { def apply(headers: String*): `Access-Control-Allow-Headers` = apply(immutable.Seq(headers: _*)) implicit val headersRenderer = Renderer.defaultSeqRenderer[String] // cache } -final case class `Access-Control-Allow-Headers`(headers: immutable.Seq[String]) extends japi.headers.AccessControlAllowHeaders with ModeledHeader { +final case class `Access-Control-Allow-Headers`(headers: immutable.Seq[String]) extends jm.headers.AccessControlAllowHeaders with ModeledHeader { import `Access-Control-Allow-Headers`.headersRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ headers protected def companion = `Access-Control-Allow-Headers` @@ -223,13 +223,13 @@ object `Access-Control-Allow-Methods` extends ModeledCompanion { def apply(methods: HttpMethod*): `Access-Control-Allow-Methods` = apply(immutable.Seq(methods: _*)) implicit val methodsRenderer = Renderer.defaultSeqRenderer[HttpMethod] // cache } -final case class `Access-Control-Allow-Methods`(methods: immutable.Seq[HttpMethod]) extends japi.headers.AccessControlAllowMethods with ModeledHeader { +final case class `Access-Control-Allow-Methods`(methods: immutable.Seq[HttpMethod]) extends jm.headers.AccessControlAllowMethods with ModeledHeader { import `Access-Control-Allow-Methods`.methodsRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ methods protected def companion = `Access-Control-Allow-Methods` /** Java API */ - def getMethods: Iterable[japi.HttpMethod] = methods.asJava + def getMethods: Iterable[jm.HttpMethod] = methods.asJava } // http://www.w3.org/TR/cors/#access-control-allow-origin-response-header @@ -247,7 +247,7 @@ object `Access-Control-Allow-Origin` extends ModeledCompanion { */ def forRange(range: HttpOriginRange) = new `Access-Control-Allow-Origin`(range) } -final case class `Access-Control-Allow-Origin` private (range: HttpOriginRange) extends japi.headers.AccessControlAllowOrigin with ModeledHeader { +final case class `Access-Control-Allow-Origin` private (range: HttpOriginRange) extends jm.headers.AccessControlAllowOrigin with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ range protected def companion = `Access-Control-Allow-Origin` } @@ -257,7 +257,7 @@ object `Access-Control-Expose-Headers` extends ModeledCompanion { def apply(headers: String*): `Access-Control-Expose-Headers` = apply(immutable.Seq(headers: _*)) implicit val headersRenderer = Renderer.defaultSeqRenderer[String] // cache } -final case class `Access-Control-Expose-Headers`(headers: immutable.Seq[String]) extends japi.headers.AccessControlExposeHeaders with ModeledHeader { +final case class `Access-Control-Expose-Headers`(headers: immutable.Seq[String]) extends jm.headers.AccessControlExposeHeaders with ModeledHeader { import `Access-Control-Expose-Headers`.headersRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ headers protected def companion = `Access-Control-Expose-Headers` @@ -268,7 +268,7 @@ final case class `Access-Control-Expose-Headers`(headers: immutable.Seq[String]) // http://www.w3.org/TR/cors/#access-control-max-age-response-header object `Access-Control-Max-Age` extends ModeledCompanion -final case class `Access-Control-Max-Age`(deltaSeconds: Long) extends japi.headers.AccessControlMaxAge with ModeledHeader { +final case class `Access-Control-Max-Age`(deltaSeconds: Long) extends jm.headers.AccessControlMaxAge with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ deltaSeconds protected def companion = `Access-Control-Max-Age` } @@ -278,7 +278,7 @@ object `Access-Control-Request-Headers` extends ModeledCompanion { def apply(headers: String*): `Access-Control-Request-Headers` = apply(immutable.Seq(headers: _*)) implicit val headersRenderer = Renderer.defaultSeqRenderer[String] // cache } -final case class `Access-Control-Request-Headers`(headers: immutable.Seq[String]) extends japi.headers.AccessControlRequestHeaders with ModeledHeader { +final case class `Access-Control-Request-Headers`(headers: immutable.Seq[String]) extends jm.headers.AccessControlRequestHeaders with ModeledHeader { import `Access-Control-Request-Headers`.headersRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ headers protected def companion = `Access-Control-Request-Headers` @@ -289,14 +289,14 @@ final case class `Access-Control-Request-Headers`(headers: immutable.Seq[String] // http://www.w3.org/TR/cors/#access-control-request-method-request-header object `Access-Control-Request-Method` extends ModeledCompanion -final case class `Access-Control-Request-Method`(method: HttpMethod) extends japi.headers.AccessControlRequestMethod with ModeledHeader { +final case class `Access-Control-Request-Method`(method: HttpMethod) extends jm.headers.AccessControlRequestMethod with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ method protected def companion = `Access-Control-Request-Method` } // http://tools.ietf.org/html/rfc7234#section-5.1 object Age extends ModeledCompanion -final case class Age(deltaSeconds: Long) extends japi.headers.Age with ModeledHeader { +final case class Age(deltaSeconds: Long) extends jm.headers.Age with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ deltaSeconds protected def companion = Age } @@ -306,18 +306,18 @@ object Allow extends ModeledCompanion { def apply(methods: HttpMethod*): Allow = apply(immutable.Seq(methods: _*)) implicit val methodsRenderer = Renderer.defaultSeqRenderer[HttpMethod] // cache } -final case class Allow(methods: immutable.Seq[HttpMethod]) extends japi.headers.Allow with ModeledHeader { +final case class Allow(methods: immutable.Seq[HttpMethod]) extends jm.headers.Allow with ModeledHeader { import Allow.methodsRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ methods protected def companion = Allow /** Java API */ - def getMethods: Iterable[japi.HttpMethod] = methods.asJava + def getMethods: Iterable[jm.HttpMethod] = methods.asJava } // http://tools.ietf.org/html/rfc7235#section-4.2 object Authorization extends ModeledCompanion -final case class Authorization(credentials: HttpCredentials) extends japi.headers.Authorization with ModeledHeader { +final case class Authorization(credentials: HttpCredentials) extends jm.headers.Authorization with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ credentials protected def companion = Authorization } @@ -327,19 +327,19 @@ object `Cache-Control` extends ModeledCompanion { def apply(first: CacheDirective, more: CacheDirective*): `Cache-Control` = apply(immutable.Seq(first +: more: _*)) implicit val directivesRenderer = Renderer.defaultSeqRenderer[CacheDirective] // cache } -final case class `Cache-Control`(directives: immutable.Seq[CacheDirective]) extends japi.headers.CacheControl with ModeledHeader { +final case class `Cache-Control`(directives: immutable.Seq[CacheDirective]) extends jm.headers.CacheControl with ModeledHeader { require(directives.nonEmpty, "directives must not be empty") import `Cache-Control`.directivesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ directives protected def companion = `Cache-Control` /** Java API */ - def getDirectives: Iterable[japi.headers.CacheDirective] = directives.asJava + def getDirectives: Iterable[jm.headers.CacheDirective] = directives.asJava } // http://tools.ietf.org/html/rfc6266 object `Content-Disposition` extends ModeledCompanion -final case class `Content-Disposition`(dispositionType: ContentDispositionType, params: Map[String, String] = Map.empty) extends japi.headers.ContentDisposition with ModeledHeader { +final case class `Content-Disposition`(dispositionType: ContentDispositionType, params: Map[String, String] = Map.empty) extends jm.headers.ContentDisposition with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = { r ~~ dispositionType; params foreach { case (k, v) ⇒ r ~~ "; " ~~ k ~~ '=' ~~# v }; r } protected def companion = `Content-Disposition` @@ -352,21 +352,21 @@ object `Content-Encoding` extends ModeledCompanion { def apply(first: HttpEncoding, more: HttpEncoding*): `Content-Encoding` = apply(immutable.Seq(first +: more: _*)) implicit val encodingsRenderer = Renderer.defaultSeqRenderer[HttpEncoding] // cache } -final case class `Content-Encoding`(encodings: immutable.Seq[HttpEncoding]) extends japi.headers.ContentEncoding with ModeledHeader { +final case class `Content-Encoding`(encodings: immutable.Seq[HttpEncoding]) extends jm.headers.ContentEncoding with ModeledHeader { require(encodings.nonEmpty, "encodings must not be empty") import `Content-Encoding`.encodingsRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ encodings protected def companion = `Content-Encoding` /** Java API */ - def getEncodings: Iterable[japi.headers.HttpEncoding] = encodings.asJava + def getEncodings: Iterable[jm.headers.HttpEncoding] = encodings.asJava } // http://tools.ietf.org/html/rfc7233#section-4.2 object `Content-Range` extends ModeledCompanion { def apply(byteContentRange: ByteContentRange): `Content-Range` = apply(RangeUnits.Bytes, byteContentRange) } -final case class `Content-Range`(rangeUnit: RangeUnit, contentRange: ContentRange) extends japi.headers.ContentRange with ModeledHeader { +final case class `Content-Range`(rangeUnit: RangeUnit, contentRange: ContentRange) extends jm.headers.ContentRange with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ rangeUnit ~~ ' ' ~~ contentRange protected def companion = `Content-Range` } @@ -377,7 +377,7 @@ object `Content-Type` extends ModeledCompanion * Instances of this class will only be created transiently during header parsing and will never appear * in HttpMessage.header. To access the Content-Type, see subclasses of HttpEntity. */ -final case class `Content-Type` private[http] (contentType: ContentType) extends japi.headers.ContentType with ModeledHeader { +final case class `Content-Type` private[http] (contentType: ContentType) extends jm.headers.ContentType with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ contentType protected def companion = `Content-Type` } @@ -390,19 +390,19 @@ object Cookie extends ModeledCompanion { def apply(first: HttpCookie, more: HttpCookie*): Cookie = apply(immutable.Seq(first +: more: _*)) implicit val cookiesRenderer = Renderer.seqRenderer[HttpCookie](separator = "; ") // cache } -final case class Cookie(cookies: immutable.Seq[HttpCookie]) extends japi.headers.Cookie with ModeledHeader { +final case class Cookie(cookies: immutable.Seq[HttpCookie]) extends jm.headers.Cookie with ModeledHeader { require(cookies.nonEmpty, "cookies must not be empty") import Cookie.cookiesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ cookies protected def companion = Cookie /** Java API */ - def getCookies: Iterable[japi.headers.HttpCookie] = cookies.asJava + def getCookies: Iterable[jm.headers.HttpCookie] = cookies.asJava } // http://tools.ietf.org/html/rfc7231#section-7.1.1.2 object Date extends ModeledCompanion -final case class Date(date: DateTime) extends japi.headers.Date with ModeledHeader { +final case class Date(date: DateTime) extends jm.headers.Date with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = date.renderRfc1123DateTimeString(r) protected def companion = Date } @@ -412,14 +412,14 @@ object ETag extends ModeledCompanion { def apply(tag: String, weak: Boolean = false): ETag = ETag(EntityTag(tag, weak)) } -final case class ETag(etag: EntityTag) extends japi.headers.ETag with ModeledHeader { +final case class ETag(etag: EntityTag) extends jm.headers.ETag with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ etag protected def companion = ETag } // http://tools.ietf.org/html/rfc7234#section-5.3 object Expires extends ModeledCompanion -final case class Expires(date: DateTime) extends japi.headers.Expires with ModeledHeader { +final case class Expires(date: DateTime) extends jm.headers.Expires with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = date.renderRfc1123DateTimeString(r) protected def companion = Expires } @@ -430,14 +430,14 @@ object `If-Match` extends ModeledCompanion { def apply(first: EntityTag, more: EntityTag*): `If-Match` = `If-Match`(EntityTagRange(first +: more: _*)) } -final case class `If-Match`(m: EntityTagRange) extends japi.headers.IfMatch with ModeledHeader { +final case class `If-Match`(m: EntityTagRange) extends jm.headers.IfMatch with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ m protected def companion = `If-Match` } // http://tools.ietf.org/html/rfc7232#section-3.3 object `If-Modified-Since` extends ModeledCompanion -final case class `If-Modified-Since`(date: DateTime) extends japi.headers.IfModifiedSince with ModeledHeader { +final case class `If-Modified-Since`(date: DateTime) extends jm.headers.IfModifiedSince with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = date.renderRfc1123DateTimeString(r) protected def companion = `If-Modified-Since` } @@ -448,21 +448,21 @@ object `If-None-Match` extends ModeledCompanion { def apply(first: EntityTag, more: EntityTag*): `If-None-Match` = `If-None-Match`(EntityTagRange(first +: more: _*)) } -final case class `If-None-Match`(m: EntityTagRange) extends japi.headers.IfNoneMatch with ModeledHeader { +final case class `If-None-Match`(m: EntityTagRange) extends jm.headers.IfNoneMatch with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ m protected def companion = `If-None-Match` } // http://tools.ietf.org/html/rfc7232#section-3.4 object `If-Unmodified-Since` extends ModeledCompanion -final case class `If-Unmodified-Since`(date: DateTime) extends japi.headers.IfUnmodifiedSince with ModeledHeader { +final case class `If-Unmodified-Since`(date: DateTime) extends jm.headers.IfUnmodifiedSince with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = date.renderRfc1123DateTimeString(r) protected def companion = `If-Unmodified-Since` } // http://tools.ietf.org/html/rfc7232#section-2.2 object `Last-Modified` extends ModeledCompanion -final case class `Last-Modified`(date: DateTime) extends japi.headers.LastModified with ModeledHeader { +final case class `Last-Modified`(date: DateTime) extends jm.headers.LastModified with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = date.renderRfc1123DateTimeString(r) protected def companion = `Last-Modified` } @@ -473,35 +473,35 @@ object Link extends ModeledCompanion { def apply(values: LinkValue*): Link = apply(immutable.Seq(values: _*)) implicit val valuesRenderer = Renderer.defaultSeqRenderer[LinkValue] // cache } -final case class Link(values: immutable.Seq[LinkValue]) extends japi.headers.Link with ModeledHeader { +final case class Link(values: immutable.Seq[LinkValue]) extends jm.headers.Link with ModeledHeader { import Link.valuesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ values protected def companion = Link /** Java API */ - def getValues: Iterable[japi.headers.LinkValue] = values.asJava + def getValues: Iterable[jm.headers.LinkValue] = values.asJava } // http://tools.ietf.org/html/rfc7231#section-7.1.2 object Location extends ModeledCompanion -final case class Location(uri: Uri) extends japi.headers.Location with ModeledHeader { +final case class Location(uri: Uri) extends jm.headers.Location with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = { import UriRendering.UriRenderer; r ~~ uri } protected def companion = Location /** Java API */ - def getUri: akka.http.model.japi.Uri = uri.asJava + def getUri: akka.http.javadsl.model.Uri = uri.asJava } // http://tools.ietf.org/html/rfc6454#section-7 object Origin extends ModeledCompanion { def apply(origins: HttpOrigin*): Origin = apply(immutable.Seq(origins: _*)) } -final case class Origin(origins: immutable.Seq[HttpOrigin]) extends japi.headers.Origin with ModeledHeader { +final case class Origin(origins: immutable.Seq[HttpOrigin]) extends jm.headers.Origin with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = if (origins.isEmpty) r ~~ "null" else r ~~ origins protected def companion = Origin /** Java API */ - def getOrigins: Iterable[japi.headers.HttpOrigin] = origins.asJava + def getOrigins: Iterable[jm.headers.HttpOrigin] = origins.asJava } // http://tools.ietf.org/html/rfc7235#section-4.3 @@ -509,19 +509,19 @@ object `Proxy-Authenticate` extends ModeledCompanion { def apply(first: HttpChallenge, more: HttpChallenge*): `Proxy-Authenticate` = apply(immutable.Seq(first +: more: _*)) implicit val challengesRenderer = Renderer.defaultSeqRenderer[HttpChallenge] // cache } -final case class `Proxy-Authenticate`(challenges: immutable.Seq[HttpChallenge]) extends japi.headers.ProxyAuthenticate with ModeledHeader { +final case class `Proxy-Authenticate`(challenges: immutable.Seq[HttpChallenge]) extends jm.headers.ProxyAuthenticate with ModeledHeader { require(challenges.nonEmpty, "challenges must not be empty") import `Proxy-Authenticate`.challengesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ challenges protected def companion = `Proxy-Authenticate` /** Java API */ - def getChallenges: Iterable[japi.headers.HttpChallenge] = challenges.asJava + def getChallenges: Iterable[jm.headers.HttpChallenge] = challenges.asJava } // http://tools.ietf.org/html/rfc7235#section-4.4 object `Proxy-Authorization` extends ModeledCompanion -final case class `Proxy-Authorization`(credentials: HttpCredentials) extends japi.headers.ProxyAuthorization with ModeledHeader { +final case class `Proxy-Authorization`(credentials: HttpCredentials) extends jm.headers.ProxyAuthorization with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ credentials protected def companion = `Proxy-Authorization` } @@ -532,31 +532,31 @@ object Range extends ModeledCompanion { def apply(ranges: immutable.Seq[ByteRange]): Range = Range(RangeUnits.Bytes, ranges) implicit val rangesRenderer = Renderer.defaultSeqRenderer[ByteRange] // cache } -final case class Range(rangeUnit: RangeUnit, ranges: immutable.Seq[ByteRange]) extends japi.headers.Range with ModeledHeader { +final case class Range(rangeUnit: RangeUnit, ranges: immutable.Seq[ByteRange]) extends jm.headers.Range with ModeledHeader { require(ranges.nonEmpty, "ranges must not be empty") import Range.rangesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ rangeUnit ~~ '=' ~~ ranges protected def companion = Range /** Java API */ - def getRanges: Iterable[japi.headers.ByteRange] = ranges.asJava + def getRanges: Iterable[jm.headers.ByteRange] = ranges.asJava } object `Raw-Request-URI` extends ModeledCompanion -final case class `Raw-Request-URI`(uri: String) extends japi.headers.RawRequestURI with ModeledHeader { +final case class `Raw-Request-URI`(uri: String) extends jm.headers.RawRequestURI with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ uri protected def companion = `Raw-Request-URI` } object `Remote-Address` extends ModeledCompanion -final case class `Remote-Address`(address: RemoteAddress) extends japi.headers.RemoteAddress with ModeledHeader { +final case class `Remote-Address`(address: RemoteAddress) extends jm.headers.RemoteAddress with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ address protected def companion = `Remote-Address` } // http://tools.ietf.org/html/rfc7231#section-5.5.2 object Referer extends ModeledCompanion -final case class Referer(uri: Uri) extends japi.headers.Referer with ModeledHeader { +final case class Referer(uri: Uri) extends jm.headers.Referer with ModeledHeader { require(uri.fragment == None, "Referer header URI must not contain a fragment") require(uri.authority.userinfo.isEmpty, "Referer header URI must not contain a userinfo component") @@ -564,7 +564,7 @@ final case class Referer(uri: Uri) extends japi.headers.Referer with ModeledHead protected def companion = Referer /** Java API */ - def getUri: akka.http.model.japi.Uri = uri.asJava + def getUri: akka.http.javadsl.model.Uri = uri.asJava } /** @@ -670,19 +670,19 @@ object Server extends ModeledCompanion { def apply(first: ProductVersion, more: ProductVersion*): Server = apply(immutable.Seq(first +: more: _*)) implicit val productsRenderer = Renderer.seqRenderer[ProductVersion](separator = " ") // cache } -final case class Server(products: immutable.Seq[ProductVersion]) extends japi.headers.Server with ModeledHeader { +final case class Server(products: immutable.Seq[ProductVersion]) extends jm.headers.Server with ModeledHeader { require(products.nonEmpty, "products must not be empty") import Server.productsRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ products protected def companion = Server /** Java API */ - def getProducts: Iterable[japi.headers.ProductVersion] = products.asJava + def getProducts: Iterable[jm.headers.ProductVersion] = products.asJava } // https://tools.ietf.org/html/rfc6265 object `Set-Cookie` extends ModeledCompanion -final case class `Set-Cookie`(cookie: HttpCookie) extends japi.headers.SetCookie with ModeledHeader { +final case class `Set-Cookie`(cookie: HttpCookie) extends jm.headers.SetCookie with ModeledHeader { def renderValue[R <: Rendering](r: R): r.type = r ~~ cookie protected def companion = `Set-Cookie` } @@ -692,7 +692,7 @@ object `Transfer-Encoding` extends ModeledCompanion { def apply(first: TransferEncoding, more: TransferEncoding*): `Transfer-Encoding` = apply(immutable.Seq(first +: more: _*)) implicit val encodingsRenderer = Renderer.defaultSeqRenderer[TransferEncoding] // cache } -final case class `Transfer-Encoding`(encodings: immutable.Seq[TransferEncoding]) extends japi.headers.TransferEncoding with ModeledHeader { +final case class `Transfer-Encoding`(encodings: immutable.Seq[TransferEncoding]) extends jm.headers.TransferEncoding with ModeledHeader { require(encodings.nonEmpty, "encodings must not be empty") import `Transfer-Encoding`.encodingsRenderer def isChunked: Boolean = encodings.last == TransferEncodings.chunked @@ -709,7 +709,7 @@ final case class `Transfer-Encoding`(encodings: immutable.Seq[TransferEncoding]) protected def companion = `Transfer-Encoding` /** Java API */ - def getEncodings: Iterable[japi.TransferEncoding] = encodings.asJava + def getEncodings: Iterable[jm.TransferEncoding] = encodings.asJava } // http://tools.ietf.org/html/rfc7230#section-6.7 @@ -731,14 +731,14 @@ object `User-Agent` extends ModeledCompanion { def apply(first: ProductVersion, more: ProductVersion*): `User-Agent` = apply(immutable.Seq(first +: more: _*)) implicit val productsRenderer = Renderer.seqRenderer[ProductVersion](separator = " ") // cache } -final case class `User-Agent`(products: immutable.Seq[ProductVersion]) extends japi.headers.UserAgent with ModeledHeader { +final case class `User-Agent`(products: immutable.Seq[ProductVersion]) extends jm.headers.UserAgent with ModeledHeader { require(products.nonEmpty, "products must not be empty") import `User-Agent`.productsRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ products protected def companion = `User-Agent` /** Java API */ - def getProducts: Iterable[japi.headers.ProductVersion] = products.asJava + def getProducts: Iterable[jm.headers.ProductVersion] = products.asJava } // http://tools.ietf.org/html/rfc7235#section-4.1 @@ -746,14 +746,14 @@ object `WWW-Authenticate` extends ModeledCompanion { def apply(first: HttpChallenge, more: HttpChallenge*): `WWW-Authenticate` = apply(immutable.Seq(first +: more: _*)) implicit val challengesRenderer = Renderer.defaultSeqRenderer[HttpChallenge] // cache } -final case class `WWW-Authenticate`(challenges: immutable.Seq[HttpChallenge]) extends japi.headers.WWWAuthenticate with ModeledHeader { +final case class `WWW-Authenticate`(challenges: immutable.Seq[HttpChallenge]) extends jm.headers.WWWAuthenticate with ModeledHeader { require(challenges.nonEmpty, "challenges must not be empty") import `WWW-Authenticate`.challengesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ challenges protected def companion = `WWW-Authenticate` /** Java API */ - def getChallenges: Iterable[japi.headers.HttpChallenge] = challenges.asJava + def getChallenges: Iterable[jm.headers.HttpChallenge] = challenges.asJava } // http://en.wikipedia.org/wiki/X-Forwarded-For @@ -762,13 +762,13 @@ object `X-Forwarded-For` extends ModeledCompanion { def apply(first: RemoteAddress, more: RemoteAddress*): `X-Forwarded-For` = apply(immutable.Seq(first +: more: _*)) implicit val addressesRenderer = Renderer.defaultSeqRenderer[RemoteAddress] // cache } -final case class `X-Forwarded-For`(addresses: immutable.Seq[RemoteAddress]) extends japi.headers.XForwardedFor with ModeledHeader { +final case class `X-Forwarded-For`(addresses: immutable.Seq[RemoteAddress]) extends jm.headers.XForwardedFor with ModeledHeader { require(addresses.nonEmpty, "addresses must not be empty") import `X-Forwarded-For`.addressesRenderer def renderValue[R <: Rendering](r: R): r.type = r ~~ addresses protected def companion = `X-Forwarded-For` /** Java API */ - def getAddresses: Iterable[japi.RemoteAddress] = addresses.asJava + def getAddresses: Iterable[jm.RemoteAddress] = addresses.asJava } diff --git a/akka-http-core/src/main/scala/akka/http/model/package.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/package.scala similarity index 89% rename from akka-http-core/src/main/scala/akka/http/model/package.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/package.scala index 7a7b82814d..d78f8d99c9 100644 --- a/akka-http-core/src/main/scala/akka/http/model/package.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.scaladsl package object model { /** An entity that can be used for every HttpMessage, i.e. for requests and responses. */ diff --git a/akka-http-core/src/main/scala/akka/http/model/ws/Message.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala similarity index 96% rename from akka-http-core/src/main/scala/akka/http/model/ws/Message.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala index a8b73116f7..36808e4daf 100644 --- a/akka-http-core/src/main/scala/akka/http/model/ws/Message.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.ws +package akka.http.scaladsl.model.ws import akka.stream.scaladsl.Source import akka.util.ByteString diff --git a/akka-http-core/src/main/scala/akka/http/model/ws/UpgradeToWebsocket.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebsocket.scala similarity index 68% rename from akka-http-core/src/main/scala/akka/http/model/ws/UpgradeToWebsocket.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebsocket.scala index 9dd4288f3d..8b30c0e423 100644 --- a/akka-http-core/src/main/scala/akka/http/model/ws/UpgradeToWebsocket.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebsocket.scala @@ -2,25 +2,22 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.model.ws +package akka.http.scaladsl.model.ws import java.lang.Iterable - -import akka.http.javadsl -import akka.stream - import scala.collection.immutable +import akka.stream import akka.stream.FlowMaterializer import akka.stream.scaladsl.Flow - -import akka.http.model.HttpResponse +import akka.http.javadsl.{ model ⇒ jm } +import akka.http.scaladsl.model.HttpResponse /** * A custom header that will be added to an Websocket upgrade HttpRequest that * enables a request handler to upgrade this connection to a Websocket connection and * registers a Websocket handler. */ -trait UpgradeToWebsocket extends javadsl.model.ws.UpgradeToWebsocket { +trait UpgradeToWebsocket extends jm.ws.UpgradeToWebsocket { /** * A sequence of protocols the client accepts. * @@ -40,12 +37,12 @@ trait UpgradeToWebsocket extends javadsl.model.ws.UpgradeToWebsocket { import scala.collection.JavaConverters._ def getRequestedProtocols(): Iterable[String] = requestedProtocols.asJava - def handleMessagesWith(handlerFlow: stream.javadsl.Flow[javadsl.model.ws.Message, javadsl.model.ws.Message, _], materializer: FlowMaterializer): HttpResponse = + def handleMessagesWith(handlerFlow: stream.javadsl.Flow[jm.ws.Message, jm.ws.Message, _], materializer: FlowMaterializer): HttpResponse = handleMessages(adaptJavaFlow(handlerFlow))(materializer) - def handleMessagesWith(handlerFlow: stream.javadsl.Flow[javadsl.model.ws.Message, javadsl.model.ws.Message, _], subprotocol: String, materializer: FlowMaterializer): HttpResponse = + def handleMessagesWith(handlerFlow: stream.javadsl.Flow[jm.ws.Message, jm.ws.Message, _], subprotocol: String, materializer: FlowMaterializer): HttpResponse = handleMessages(adaptJavaFlow(handlerFlow), subprotocol = Some(subprotocol))(materializer) - private[this] def adaptJavaFlow(handlerFlow: stream.javadsl.Flow[javadsl.model.ws.Message, javadsl.model.ws.Message, _]): Flow[Message, Message, Any] = - Flow[Message].map(javadsl.model.ws.Message.adapt).via(handlerFlow.asScala).map(_.asScala) + private[this] def adaptJavaFlow(handlerFlow: stream.javadsl.Flow[jm.ws.Message, jm.ws.Message, _]): Flow[Message, Message, Any] = + Flow[Message].map(jm.ws.Message.adapt).via(handlerFlow.asScala).map(_.asScala) } diff --git a/akka-http-core/src/main/scala/akka/http/util/FastFuture.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala similarity index 99% rename from akka-http-core/src/main/scala/akka/http/util/FastFuture.scala rename to akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala index 100235cdf5..ebee3e3af4 100644 --- a/akka-http-core/src/main/scala/akka/http/util/FastFuture.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.util +package akka.http.scaladsl.util import scala.language.{ implicitConversions, higherKinds } import scala.util.control.NonFatal diff --git a/akka-http-core/src/test/java/akka/http/model/japi/JavaApiTestCases.java b/akka-http-core/src/test/java/akka/http/javadsl/model/JavaApiTestCases.java similarity index 92% rename from akka-http-core/src/test/java/akka/http/model/japi/JavaApiTestCases.java rename to akka-http-core/src/test/java/akka/http/javadsl/model/JavaApiTestCases.java index 4b3981f0d9..1b09a0123a 100644 --- a/akka-http-core/src/test/java/akka/http/model/japi/JavaApiTestCases.java +++ b/akka-http-core/src/test/java/akka/http/javadsl/model/JavaApiTestCases.java @@ -2,10 +2,11 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; -import akka.http.model.japi.headers.Authorization; -import akka.http.model.japi.headers.HttpCredentials; +import akka.http.impl.util.Util; +import akka.http.javadsl.model.headers.Authorization; +import akka.http.javadsl.model.headers.HttpCredentials; public class JavaApiTestCases { /** Builds a request for use on the client side */ diff --git a/akka-http-core/src/test/java/akka/http/model/japi/JavaTestServer.java b/akka-http-core/src/test/java/akka/http/javadsl/model/JavaTestServer.java similarity index 94% rename from akka-http-core/src/test/java/akka/http/model/japi/JavaTestServer.java rename to akka-http-core/src/test/java/akka/http/javadsl/model/JavaTestServer.java index e828fddbf4..dbd7a52a81 100644 --- a/akka-http-core/src/test/java/akka/http/model/japi/JavaTestServer.java +++ b/akka-http-core/src/test/java/akka/http/javadsl/model/JavaTestServer.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi; +package akka.http.javadsl.model; import akka.actor.ActorSystem; -import akka.japi.function.Function; -import akka.japi.function.Procedure; -import akka.http.engine.server.ServerSettings; +import akka.http.javadsl.Http; +import akka.http.javadsl.ServerBinding; +import akka.japi.Function; import akka.http.javadsl.model.ws.Message; import akka.http.javadsl.model.ws.TextMessage; import akka.http.javadsl.model.ws.Websocket; @@ -15,7 +15,6 @@ import akka.japi.JavaPartialFunction; import akka.stream.ActorFlowMaterializer; import akka.stream.FlowMaterializer; import akka.stream.javadsl.Flow; -import akka.stream.javadsl.Sink; import akka.stream.javadsl.Source; import scala.concurrent.Await; import scala.concurrent.Future; diff --git a/akka-http-core/src/test/scala/akka/http/engine/client/ConnectionPoolSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala similarity index 97% rename from akka-http-core/src/test/scala/akka/http/engine/client/ConnectionPoolSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala index d54402e4dc..0ed980f8d6 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/client/ConnectionPoolSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala @@ -2,24 +2,20 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client -import java.net.InetAddress import java.util.concurrent.atomic.AtomicInteger -import akka.http.engine.client.PoolGateway - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.{ Failure, Success, Try } -import akka.http.engine.server.ServerSettings -import akka.http.util.{ SingletonException, StreamUtils } +import akka.http.scaladsl.{ TestUtils, Http, ServerSettings } +import akka.http.impl.util.{ SingletonException, StreamUtils } import akka.util.ByteString import akka.stream.{ BidiShape, ActorFlowMaterializer } -import akka.stream.testkit._ +import akka.stream.testkit.{ TestPublisher, TestSubscriber, AkkaSpec } import akka.stream.scaladsl._ -import akka.http.{ Http, TestUtils } -import akka.http.model.headers._ -import akka.http.model._ +import akka.http.scaladsl.model.headers._ +import akka.http.scaladsl.model._ class ConnectionPoolSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF\n akka.io.tcp.trace-logging = off") { implicit val materializer = ActorFlowMaterializer() diff --git a/akka-http-core/src/test/scala/akka/http/engine/client/HighLevelOutgoingConnectionSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala similarity index 94% rename from akka-http-core/src/test/scala/akka/http/engine/client/HighLevelOutgoingConnectionSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala index cccd88455c..ed98173171 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/client/HighLevelOutgoingConnectionSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala @@ -2,13 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import scala.concurrent.Await import scala.concurrent.duration._ -import akka.http.{ Http, TestUtils } -import akka.http.model.HttpEntity._ -import akka.http.model._ +import akka.http.scaladsl.{ Http, TestUtils } +import akka.http.scaladsl.model._ import akka.stream.ActorFlowMaterializer import akka.stream.scaladsl._ import akka.stream.testkit.AkkaSpec diff --git a/akka-http-core/src/test/scala/akka/http/engine/client/LowLevelOutgoingConnectionSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/engine/client/LowLevelOutgoingConnectionSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala index 7becf4a8ee..d15ab5a601 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/client/LowLevelOutgoingConnectionSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.client +package akka.http.impl.engine.client import java.net.InetSocketAddress import org.scalatest.Inside @@ -11,11 +11,11 @@ import akka.event.NoLogging import akka.stream.ActorFlowMaterializer import akka.stream.testkit._ import akka.stream.scaladsl._ -import akka.http.model.HttpEntity._ -import akka.http.model.HttpMethods._ -import akka.http.model._ -import akka.http.model.headers._ -import akka.http.util._ +import akka.http.scaladsl.model.HttpEntity._ +import akka.http.scaladsl.model.HttpMethods._ +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers._ +import akka.http.impl.util._ class LowLevelOutgoingConnectionSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF") with Inside { implicit val materializer = ActorFlowMaterializer() diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/BoyerMooreSpec.scala similarity index 97% rename from akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/parsing/BoyerMooreSpec.scala index e0418444a5..8c6561f79c 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/BoyerMooreSpec.scala @@ -2,18 +2,13 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import java.util.regex.Pattern - -import akka.parboiled2.CharPredicate - import scala.annotation.tailrec +import scala.util.Random import org.scalatest.{ Matchers, WordSpec } import akka.util.ByteString -import akka.http.util._ - -import scala.util.Random class BoyerMooreSpec extends WordSpec with Matchers { diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ContentLengthHeaderParserSpec.scala similarity index 87% rename from akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ContentLengthHeaderParserSpec.scala index 7b54ff0d7b..687ffb2bf1 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ContentLengthHeaderParserSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import org.scalatest.{ WordSpec, Matchers } import akka.util.ByteString -import akka.http.model.headers.`Content-Length` -import akka.http.engine.parsing.SpecializedHeaderValueParsers.ContentLengthParser +import akka.http.scaladsl.model.headers.`Content-Length` +import akka.http.impl.engine.parsing.SpecializedHeaderValueParsers.ContentLengthParser class ContentLengthHeaderParserSpec extends WordSpec with Matchers { diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserSpec.scala index 713b0e86fe..ea73debc48 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import java.lang.{ StringBuilder ⇒ JStringBuilder } import com.typesafe.config.{ ConfigFactory, Config } @@ -11,10 +11,10 @@ import scala.util.Random import org.scalatest.{ BeforeAndAfterAll, WordSpec, Matchers } import akka.util.ByteString import akka.actor.ActorSystem -import akka.http.model.parser.CharacterClasses -import akka.http.model.HttpHeader -import akka.http.model.headers._ -import akka.http.util._ +import akka.http.scaladsl.model.HttpHeader +import akka.http.scaladsl.model.headers._ +import akka.http.impl.model.parser.CharacterClasses +import akka.http.impl.util._ class HttpHeaderParserSpec extends WordSpec with Matchers with BeforeAndAfterAll { diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserTestBed.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserTestBed.scala similarity index 96% rename from akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserTestBed.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserTestBed.scala index 655a9763a8..69799308d5 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserTestBed.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserTestBed.scala @@ -1,4 +1,4 @@ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing import akka.actor.ActorSystem import com.typesafe.config.{ ConfigFactory, Config } diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/RequestParserSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/parsing/RequestParserSpec.scala index 1c57e46b52..080683266c 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/RequestParserSpec.scala @@ -2,21 +2,22 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing +import akka.http.scaladsl.util.FastFuture import com.typesafe.config.{ ConfigFactory, Config } -import scala.concurrent.{ Future, Await } +import scala.concurrent.Future import scala.concurrent.duration._ import org.scalatest.{ BeforeAndAfterAll, FreeSpec, Matchers } import org.scalatest.matchers.Matcher +import akka.actor.ActorSystem +import akka.util.ByteString import akka.stream.scaladsl._ -import akka.stream.OperationAttributes._ import akka.stream.scaladsl.FlattenStrategy import akka.stream.ActorFlowMaterializer -import akka.util.ByteString -import akka.actor.ActorSystem -import akka.http.util._ -import akka.http.model._ +import akka.http.scaladsl.util.FastFuture._ +import akka.http.scaladsl.model._ +import akka.http.impl.util._ import headers._ import MediaTypes._ import HttpMethods._ @@ -24,7 +25,6 @@ import HttpProtocols._ import StatusCodes._ import HttpEntity._ import ParserOutput._ -import FastFuture._ class RequestParserSpec extends FreeSpec with Matchers with BeforeAndAfterAll { val testConf: Config = ConfigFactory.parseString(""" diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala index b2e4348641..344c713273 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala @@ -2,21 +2,22 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.parsing +package akka.http.impl.engine.parsing +import akka.http.scaladsl.util.FastFuture import com.typesafe.config.{ ConfigFactory, Config } import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import org.scalatest.{ BeforeAndAfterAll, FreeSpec, Matchers } import org.scalatest.matchers.Matcher -import akka.stream.scaladsl._ -import akka.stream.OperationAttributes._ -import akka.stream.scaladsl.FlattenStrategy -import akka.stream.ActorFlowMaterializer import akka.util.ByteString import akka.actor.ActorSystem -import akka.http.util._ -import akka.http.model._ +import akka.stream.scaladsl._ +import akka.stream.scaladsl.FlattenStrategy +import akka.stream.ActorFlowMaterializer +import akka.http.scaladsl.util.FastFuture._ +import akka.http.impl.util._ +import akka.http.scaladsl.model._ import headers._ import MediaTypes._ import HttpMethods._ @@ -24,7 +25,6 @@ import HttpProtocols._ import StatusCodes._ import HttpEntity._ import ParserOutput._ -import FastFuture._ class ResponseParserSpec extends FreeSpec with Matchers with BeforeAndAfterAll { val testConf: Config = ConfigFactory.parseString(""" diff --git a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/RequestRendererSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/rendering/RequestRendererSpec.scala index c0657f2f26..014c89f31d 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/RequestRendererSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.rendering +package akka.http.impl.engine.rendering import com.typesafe.config.{ Config, ConfigFactory } import java.net.InetSocketAddress @@ -12,11 +12,10 @@ import org.scalatest.{ FreeSpec, Matchers, BeforeAndAfterAll } import org.scalatest.matchers.Matcher import akka.actor.ActorSystem import akka.event.NoLogging -import akka.http.model._ -import akka.http.model.headers._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers._ +import akka.http.impl.util._ import akka.stream.scaladsl._ -import akka.stream.OperationAttributes._ import akka.stream.ActorFlowMaterializer import HttpEntity._ import HttpMethods._ diff --git a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala index 3077ec6cea..af50b7170a 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.rendering +package akka.http.impl.engine.rendering import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.duration._ @@ -11,12 +11,11 @@ import org.scalatest.{ FreeSpec, Matchers, BeforeAndAfterAll } import org.scalatest.matchers.Matcher import akka.actor.ActorSystem import akka.event.NoLogging -import akka.http.model._ -import akka.http.model.headers._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers._ +import akka.http.impl.util._ import akka.util.ByteString import akka.stream.scaladsl._ -import akka.stream.OperationAttributes._ import akka.stream.ActorFlowMaterializer import HttpEntity._ diff --git a/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/engine/server/HttpServerSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala index ce48671848..d44ca00238 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.engine.server +package akka.http.impl.engine.server import scala.util.Random import scala.annotation.tailrec @@ -13,8 +13,9 @@ import akka.util.ByteString import akka.stream.scaladsl._ import akka.stream.ActorFlowMaterializer import akka.stream.testkit._ -import akka.http.model._ -import akka.http.util._ +import akka.http.scaladsl.ServerSettings +import akka.http.scaladsl.model._ +import akka.http.impl.util._ import headers._ import HttpEntity._ import MediaTypes._ diff --git a/akka-http-core/src/test/scala/akka/http/engine/ws/BitBuilder.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/BitBuilder.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/engine/ws/BitBuilder.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/ws/BitBuilder.scala index 4edd0181ee..0a8f8a29fd 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/ws/BitBuilder.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/BitBuilder.scala @@ -2,14 +2,13 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws - -import akka.parboiled2 -import parboiled2._ -import akka.util.ByteString +package akka.http.impl.engine.ws import scala.annotation.tailrec import scala.util.{ Try, Failure, Success } +import akka.util.ByteString +import akka.parboiled2 +import parboiled2._ object BitBuilder { implicit class BitBuilderContext(val ctx: StringContext) { diff --git a/akka-http-core/src/test/scala/akka/http/engine/ws/FramingSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/FramingSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/engine/ws/FramingSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/ws/FramingSpec.scala index 14c7e3a444..703d16b528 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/ws/FramingSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/FramingSpec.scala @@ -2,20 +2,16 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import scala.collection.immutable import scala.concurrent.duration._ - import org.scalatest.matchers.Matcher import org.scalatest.{ FreeSpec, Matchers } - import akka.util.ByteString - import akka.stream.scaladsl.Source import akka.stream.stage.Stage - -import akka.http.util._ +import akka.http.impl.util._ import Protocol.Opcode diff --git a/akka-http-core/src/test/scala/akka/http/engine/ws/MessageSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/engine/ws/MessageSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala index 0a97eb662c..5826516493 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/ws/MessageSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala @@ -2,20 +2,17 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import scala.annotation.tailrec import scala.concurrent.duration._ - +import scala.util.Random +import org.scalatest.{ Matchers, FreeSpec } import akka.stream.FlowShape import akka.stream.scaladsl._ import akka.stream.testkit._ import akka.util.ByteString -import org.scalatest.{ Matchers, FreeSpec } - -import scala.util.Random - -import akka.http.model.ws._ +import akka.http.scaladsl.model.ws._ import Protocol.Opcode class MessageSpec extends FreeSpec with Matchers with WithMaterializerSpec { @@ -969,6 +966,6 @@ class MessageSpec extends FreeSpec with Matchers with WithMaterializerSpec { val trace = false // set to `true` for debugging purposes def printEvent[T](marker: String): Flow[T, T, Unit] = - if (trace) akka.http.util.printEvent(marker) + if (trace) akka.http.impl.util.printEvent(marker) else Flow[T] } diff --git a/akka-http-core/src/test/scala/akka/http/engine/ws/Utf8CodingSpecs.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/Utf8CodingSpecs.scala similarity index 96% rename from akka-http-core/src/test/scala/akka/http/engine/ws/Utf8CodingSpecs.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/ws/Utf8CodingSpecs.scala index df99981e2e..6d0d5c4b14 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/ws/Utf8CodingSpecs.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/Utf8CodingSpecs.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws import org.scalacheck.Gen @@ -10,7 +10,7 @@ import scala.concurrent.duration._ import akka.stream.scaladsl.Source import akka.util.ByteString -import akka.http.util._ +import akka.http.impl.util._ import org.scalatest.prop.PropertyChecks import org.scalatest.{ FreeSpec, Matchers } diff --git a/akka-http-core/src/test/scala/akka/http/engine/ws/WithMaterializerSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WithMaterializerSpec.scala similarity index 95% rename from akka-http-core/src/test/scala/akka/http/engine/ws/WithMaterializerSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/engine/ws/WithMaterializerSpec.scala index ac165086fe..aea60df504 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/ws/WithMaterializerSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WithMaterializerSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.http.engine.ws +package akka.http.impl.engine.ws -import akka.actor.ActorSystem -import akka.stream.ActorFlowMaterializer import com.typesafe.config.{ ConfigFactory, Config } import org.scalatest.{ Suite, BeforeAndAfterAll } +import akka.actor.ActorSystem +import akka.stream.ActorFlowMaterializer trait WithMaterializerSpec extends BeforeAndAfterAll { _: Suite ⇒ lazy val testConf: Config = ConfigFactory.parseString(""" diff --git a/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala index 3406f51953..842c13df34 100644 --- a/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model -package parser +package akka.http.impl.model.parser import org.scalatest.{ Matchers, FreeSpec } import org.scalatest.matchers.{ Matcher, MatchResult } -import akka.http.util._ +import akka.http.impl.util._ +import akka.http.scaladsl.model._ import headers._ import CacheDirectives._ import MediaTypes._ diff --git a/akka-http-core/src/test/scala/akka/http/util/RenderingSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/util/RenderingSpec.scala similarity index 97% rename from akka-http-core/src/test/scala/akka/http/util/RenderingSpec.scala rename to akka-http-core/src/test/scala/akka/http/impl/util/RenderingSpec.scala index 4cc7084ca4..6e8787f01c 100644 --- a/akka-http-core/src/test/scala/akka/http/util/RenderingSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/util/RenderingSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.impl.util import org.scalatest.{ Matchers, WordSpec } diff --git a/akka-http-core/src/test/scala/akka/http/model/japi/JavaApiSpec.scala b/akka-http-core/src/test/scala/akka/http/javadsl/JavaApiSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/model/japi/JavaApiSpec.scala rename to akka-http-core/src/test/scala/akka/http/javadsl/JavaApiSpec.scala index 6c366b28cd..30e22d4a1e 100644 --- a/akka-http-core/src/test/scala/akka/http/model/japi/JavaApiSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/javadsl/JavaApiSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.javadsl.model import org.scalatest.{ MustMatchers, FreeSpec } import scala.collection.JavaConverters._ diff --git a/akka-http-core/src/test/scala/akka/http/model/japi/JavaApiTestCaseSpecs.scala b/akka-http-core/src/test/scala/akka/http/javadsl/JavaApiTestCaseSpecs.scala similarity index 94% rename from akka-http-core/src/test/scala/akka/http/model/japi/JavaApiTestCaseSpecs.scala rename to akka-http-core/src/test/scala/akka/http/javadsl/JavaApiTestCaseSpecs.scala index 10afd57575..ef41c53f79 100644 --- a/akka-http-core/src/test/scala/akka/http/model/japi/JavaApiTestCaseSpecs.scala +++ b/akka-http-core/src/test/scala/akka/http/javadsl/JavaApiTestCaseSpecs.scala @@ -2,13 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model.japi +package akka.http.javadsl.model import scala.collection.immutable - -import akka.http.model import org.scalatest.{ MustMatchers, FreeSpec } -import akka.http.model.headers.BasicHttpCredentials +import akka.http.scaladsl.model.headers.BasicHttpCredentials +import akka.http.scaladsl.model class JavaApiTestCaseSpecs extends FreeSpec with MustMatchers { "JavaApiTestCases should work as intended" - { diff --git a/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala similarity index 93% rename from akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala index b8cc1fc82e..2f9f462d6d 100644 --- a/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala @@ -2,28 +2,26 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.scaladsl import java.io.{ BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter } import java.net.Socket -import akka.testkit.EventFilter +import com.typesafe.config.{ Config, ConfigFactory } import scala.annotation.tailrec import scala.concurrent.Await import scala.concurrent.duration._ +import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec } import akka.actor.ActorSystem -import akka.http.TestUtils._ -import akka.http.engine.client.ClientConnectionSettings -import akka.http.engine.server.ServerSettings -import akka.http.model.HttpEntity._ -import akka.http.model.HttpMethods._ -import akka.http.model._ -import akka.http.model.headers._ -import akka.http.util._ +import akka.testkit.EventFilter import akka.stream.{ ActorFlowMaterializer, BindFailedException } import akka.stream.scaladsl._ import akka.stream.testkit._ -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec } +import akka.http.impl.engine.client.ClientConnectionSettings +import akka.http.scaladsl.model.HttpEntity._ +import akka.http.scaladsl.model.HttpMethods._ +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers._ +import akka.http.impl.util._ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { val testConf: Config = ConfigFactory.parseString(""" @@ -38,7 +36,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { "The low-level HTTP infrastructure" should { "properly bind a server" in { - val (_, hostname, port) = temporaryServerHostnameAndPort() + val (_, hostname, port) = TestUtils.temporaryServerHostnameAndPort() val probe = TestSubscriber.manualProbe[Http.IncomingConnection]() val binding = Http().bind(hostname, port).toMat(Sink(probe))(Keep.left).run() val sub = probe.expectSubscription() // if we get it we are bound @@ -47,7 +45,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { } "report failure if bind fails" in { - val (_, hostname, port) = temporaryServerHostnameAndPort() + val (_, hostname, port) = TestUtils.temporaryServerHostnameAndPort() val binding = Http().bind(hostname, port) val probe1 = TestSubscriber.manualProbe[Http.IncomingConnection]() // Bind succeeded, we have a local address @@ -78,7 +76,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { } "run with bindAndHandleSync" in { - val (_, hostname, port) = temporaryServerHostnameAndPort() + val (_, hostname, port) = TestUtils.temporaryServerHostnameAndPort() val binding = Http().bindAndHandleSync(_ ⇒ HttpResponse(), hostname, port) val b1 = Await.result(binding, 3.seconds) @@ -91,7 +89,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { "log materialization errors in `bindAndHandle`" which { "are triggered in `transform`" in { - val (_, hostname, port) = temporaryServerHostnameAndPort() + val (_, hostname, port) = TestUtils.temporaryServerHostnameAndPort() val flow = Flow[HttpRequest].transform[HttpResponse](() ⇒ sys.error("BOOM")) val binding = Http().bindAndHandle(flow, hostname, port) val b1 = Await.result(binding, 3.seconds) @@ -103,7 +101,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { Await.result(b1.unbind(), 1.second) } "are triggered in `mapMaterialized`" in { - val (_, hostname, port) = temporaryServerHostnameAndPort() + val (_, hostname, port) = TestUtils.temporaryServerHostnameAndPort() val flow = Flow[HttpRequest].map(_ ⇒ HttpResponse()).mapMaterialized(_ ⇒ sys.error("BOOM")) val binding = Http().bindAndHandle(flow, hostname, port) val b1 = Await.result(binding, 3.seconds) @@ -213,7 +211,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll { override def afterAll() = system.shutdown() class TestSetup { - val (_, hostname, port) = temporaryServerHostnameAndPort() + val (_, hostname, port) = TestUtils.temporaryServerHostnameAndPort() def configOverrides = "" // automatically bind a server diff --git a/akka-http-core/src/test/scala/akka/http/TestClient.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/TestClient.scala similarity index 95% rename from akka-http-core/src/test/scala/akka/http/TestClient.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/TestClient.scala index 074e95c011..6958f0b80c 100644 --- a/akka-http-core/src/test/scala/akka/http/TestClient.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/TestClient.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.scaladsl import com.typesafe.config.{ Config, ConfigFactory } import scala.util.{ Failure, Success } import akka.actor.{ UnhandledMessage, ActorSystem } import akka.stream.ActorFlowMaterializer import akka.stream.scaladsl.{ Sink, Source } -import akka.http.model._ -import akka.http.util._ +import akka.http.scaladsl.model._ +import akka.http.impl.util._ object TestClient extends App { val testConf: Config = ConfigFactory.parseString(""" diff --git a/akka-http-core/src/test/scala/akka/http/TestServer.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/TestServer.scala similarity index 96% rename from akka-http-core/src/test/scala/akka/http/TestServer.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/TestServer.scala index 73aa641eb1..4bb5c6b765 100644 --- a/akka-http-core/src/test/scala/akka/http/TestServer.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/TestServer.scala @@ -2,19 +2,18 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.scaladsl import scala.concurrent.duration._ +import scala.concurrent.Await import akka.actor.ActorSystem -import akka.http.model._ -import akka.http.model.ws._ +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.ws._ import akka.stream.ActorFlowMaterializer import akka.stream.scaladsl.{ Source, Flow } import com.typesafe.config.{ ConfigFactory, Config } import HttpMethods._ -import scala.concurrent.Await - object TestServer extends App { val testConf: Config = ConfigFactory.parseString(""" akka.loglevel = INFO diff --git a/akka-http-core/src/test/scala/akka/http/TestUtils.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/TestUtils.scala similarity index 96% rename from akka-http-core/src/test/scala/akka/http/TestUtils.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/TestUtils.scala index d4c4fd2ed1..aaab21d1d9 100644 --- a/akka-http-core/src/test/scala/akka/http/TestUtils.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/TestUtils.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http +package akka.http.scaladsl import java.net.InetSocketAddress import java.nio.channels.ServerSocketChannel diff --git a/akka-http-core/src/test/scala/akka/http/util/DateTimeSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/util/DateTimeSpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala index 5f7e6d1e88..0b9d082b31 100644 --- a/akka-http-core/src/test/scala/akka/http/util/DateTimeSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util +package akka.http.scaladsl.model import java.util.TimeZone import scala.util.Random diff --git a/akka-http-core/src/test/scala/akka/http/model/HttpEntitySpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala similarity index 97% rename from akka-http-core/src/test/scala/akka/http/model/HttpEntitySpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala index e18761681d..ec0567e6f4 100644 --- a/akka-http-core/src/test/scala/akka/http/model/HttpEntitySpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.util.concurrent.TimeoutException import com.typesafe.config.{ ConfigFactory, Config } @@ -14,8 +14,8 @@ import akka.util.ByteString import akka.actor.ActorSystem import akka.stream.scaladsl._ import akka.stream.ActorFlowMaterializer -import akka.http.model.HttpEntity._ -import akka.http.util.StreamUtils +import akka.http.scaladsl.model.HttpEntity._ +import akka.http.impl.util.StreamUtils class HttpEntitySpec extends FreeSpec with MustMatchers with BeforeAndAfterAll { val tpe: ContentType = ContentTypes.`application/octet-stream` diff --git a/akka-http-core/src/test/scala/akka/http/model/MultipartSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/model/MultipartSpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala index c3de649a23..cd6ffacab2 100644 --- a/akka-http-core/src/test/scala/akka/http/model/MultipartSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.Await diff --git a/akka-http-core/src/test/scala/akka/http/model/SerializabilitySpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/SerializabilitySpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/model/SerializabilitySpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/model/SerializabilitySpec.scala index 07b1412f0b..fd1ed6ff84 100644 --- a/akka-http-core/src/test/scala/akka/http/model/SerializabilitySpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/SerializabilitySpec.scala @@ -2,13 +2,12 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.io._ import headers._ import org.scalatest.{ Matchers, WordSpec } import org.scalatest.matchers.{ MatchResult, Matcher } -import akka.http.util.DateTime import scala.util.Try import akka.util.ByteString diff --git a/akka-http-core/src/test/scala/akka/http/model/TurkishISpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/TurkishISpec.scala similarity index 84% rename from akka-http-core/src/test/scala/akka/http/model/TurkishISpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/model/TurkishISpec.scala index 83355ba135..061117a169 100644 --- a/akka-http-core/src/test/scala/akka/http/model/TurkishISpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/TurkishISpec.scala @@ -2,18 +2,16 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.util.Locale - -import akka.http.util._ - import org.scalatest.{ Matchers, WordSpec } +import akka.http.impl.util._ class TurkishISpec extends WordSpec with Matchers { "Model" should { "not suffer from turkish-i problem" in { - val charsetCons = Class.forName("akka.http.model.HttpCharsets$").getDeclaredConstructor() + val charsetCons = Class.forName("akka.http.scaladsl.model.HttpCharsets$").getDeclaredConstructor() charsetCons.setAccessible(true) val previousLocale = Locale.getDefault diff --git a/akka-http-core/src/test/scala/akka/http/model/UriSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala similarity index 99% rename from akka-http-core/src/test/scala/akka/http/model/UriSpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala index b511dc778b..08881c40ca 100644 --- a/akka-http-core/src/test/scala/akka/http/model/UriSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.model +package akka.http.scaladsl.model import java.nio.charset.Charset import java.net.InetAddress -import akka.http.util.StringRendering +import akka.http.impl.util.StringRendering import org.scalatest.matchers.{ MatchResult, Matcher } import org.scalatest.{ Matchers, WordSpec } import akka.parboiled2.UTF8 diff --git a/akka-http-core/src/test/scala/akka/http/util/FastFutureSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/util/FastFutureSpec.scala similarity index 98% rename from akka-http-core/src/test/scala/akka/http/util/FastFutureSpec.scala rename to akka-http-core/src/test/scala/akka/http/scaladsl/util/FastFutureSpec.scala index e1a474ca0f..c189bdb821 100644 --- a/akka-http-core/src/test/scala/akka/http/util/FastFutureSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/util/FastFutureSpec.scala @@ -2,17 +2,15 @@ * Copyright (C) 2009-2014 Typesafe Inc. */ -package akka.http.util - -import org.scalatest.{ FreeSpec, Matchers } +package akka.http.scaladsl.util +import scala.util.control.NoStackTrace import scala.concurrent.{ Await, Promise, Future } import scala.concurrent.duration._ -import scala.util.{ Try, Failure, Success } -import akka.http.util.FastFuture._ - import scala.concurrent.ExecutionContext.Implicits.global -import scala.util.control.NoStackTrace +import org.scalatest.{ FreeSpec, Matchers } +import scala.util.{ Try, Failure, Success } +import akka.http.scaladsl.util.FastFuture._ class FastFutureSpec extends FreeSpec with Matchers { object TheException extends RuntimeException("Expected exception") with NoStackTrace diff --git a/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala b/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala index cf084addee..28364eff5b 100644 --- a/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala +++ b/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala @@ -9,9 +9,8 @@ import scala.concurrent.Await import scala.concurrent.duration._ import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec } import akka.util.ByteString -import akka.stream.ActorFlowMaterializer import akka.actor.ActorSystem -import akka.http.model._ +import akka.http.scaladsl.model._ import akka.stream.ActorFlowMaterializer import akka.stream.scaladsl._ import headers._