!htc move akka.http.{client,server,parsing,rendering} underneath akka.http.engine package

2014-09-17 16:39:55 +02:00 · 2014-09-17 16:39:55 +02:00 · 1f32faeb96
commit 1f32faeb96
parent b367613110
32 changed files with 53 additions and 54 deletions
--- a/akka-http-core/src/main/scala/akka/http/Http.scala
+++ b/akka-http-core/src/main/scala/akka/http/Http.scala
@ -10,8 +10,8 @@ import org.reactivestreams.{ Publisher, Subscriber }
 import scala.collection.immutable
 import akka.io.Inet
 import akka.stream.MaterializerSettings
-import akka.http.client.{ HttpClientProcessor, ClientConnectionSettings }
-import akka.http.server.ServerSettings
+import akka.http.engine.client.{ HttpClientProcessor, ClientConnectionSettings }
+import akka.http.engine.server.ServerSettings
 import akka.http.model.{ HttpResponse, HttpRequest, japi }
 import akka.http.util._
 import akka.actor._
--- a/akka-http-core/src/main/scala/akka/http/HttpManager.scala
+++ b/akka-http-core/src/main/scala/akka/http/HttpManager.scala
@ -7,8 +7,8 @@ package akka.http
 import scala.util.{ Failure, Success }
 import scala.concurrent.duration._
 import akka.actor._
-import akka.http.client._
-import akka.http.server.{ HttpServerPipeline, ServerSettings }
+import akka.http.engine.client._
+import akka.http.engine.server.{ HttpServerPipeline, ServerSettings }
 import akka.io.IO
 import akka.pattern.ask
 import akka.stream.FlowMaterializer
--- a/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
@ -2,13 +2,13 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.client
+package akka.http.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.parsing.ParserSettings
+import akka.http.engine.parsing.ParserSettings
 import akka.http.util._

 final case class ClientConnectionSettings(
--- a/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.client
+package akka.http.engine.client

 import java.net.InetSocketAddress
 import scala.collection.immutable.Queue
@ -12,9 +12,9 @@ import akka.stream.io.StreamTcp
 import akka.stream.scaladsl.{ Flow, Duct }
 import akka.http.Http
 import akka.http.model.{ HttpMethod, HttpRequest, ErrorInfo, HttpResponse }
-import akka.http.rendering.{ RequestRenderingContext, HttpRequestRendererFactory }
-import akka.http.parsing.HttpResponseParser
-import akka.http.parsing.ParserOutput._
+import akka.http.engine.rendering.{ RequestRenderingContext, HttpRequestRendererFactory }
+import akka.http.engine.parsing.HttpResponseParser
+import akka.http.engine.parsing.ParserOutput._
 import akka.http.util._

 /**
--- a/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.client
+package akka.http.engine.client

 import akka.http.model.{ HttpResponse, HttpRequest }
 import org.reactivestreams.{ Subscription, Publisher, Subscriber, Processor }
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import scala.annotation.tailrec
 import akka.util.ByteString
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import java.util.Arrays.copyOf
 import java.lang.{ StringBuilder ⇒ JStringBuilder }
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import java.lang.{ StringBuilder ⇒ JStringBuilder }
 import org.reactivestreams.Publisher
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import org.reactivestreams.Publisher
 import akka.http.model._
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import com.typesafe.config.Config
 import scala.collection.JavaConverters._
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import scala.annotation.tailrec
 import akka.util.ByteString
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http
+package akka.http.engine

 import java.lang.{ StringBuilder ⇒ JStringBuilder }
 import scala.annotation.tailrec
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.rendering
+package akka.http.engine.rendering

 import java.nio.charset.Charset
 import org.reactivestreams.Publisher
@ -10,7 +10,7 @@ import scala.annotation.tailrec
 import akka.event.LoggingAdapter
 import akka.http.model._
 import akka.http.model.headers._
-import akka.http.rendering.RenderSupport._
+import akka.http.engine.rendering.RenderSupport._
 import akka.http.util._
 import akka.stream.impl.SynchronousPublisherFromIterable
 import akka.stream.scaladsl.Flow
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.rendering
+package akka.http.engine.rendering

 import java.net.InetSocketAddress
 import org.reactivestreams.Publisher
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.rendering
+package akka.http.engine.rendering

 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.rendering
+package akka.http.engine.rendering

 import org.reactivestreams.Publisher
 import akka.parboiled2.CharUtils
--- a/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
@ -2,17 +2,17 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.server
+package akka.http.engine.server

 import org.reactivestreams.Publisher
 import akka.event.LoggingAdapter
 import akka.stream.io.StreamTcp
 import akka.stream.{ FlattenStrategy, Transformer, FlowMaterializer }
 import akka.stream.scaladsl.{ Flow, Duct }
-import akka.http.parsing.HttpRequestParser
-import akka.http.rendering.{ ResponseRenderingContext, HttpResponseRendererFactory }
+import akka.http.engine.parsing.HttpRequestParser
+import akka.http.engine.rendering.{ ResponseRenderingContext, HttpResponseRendererFactory }
 import akka.http.model.{ StatusCode, ErrorInfo, HttpRequest, HttpResponse }
-import akka.http.parsing.ParserOutput._
+import akka.http.engine.parsing.ParserOutput._
 import akka.http.Http
 import akka.http.util._

--- a/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
@ -2,13 +2,13 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.server
+package akka.http.engine.server

 import language.implicitConversions
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 import akka.actor.ActorRefFactory
-import akka.http.parsing.ParserSettings
+import akka.http.engine.parsing.ParserSettings
 import akka.http.model.parser.HeaderParser
 import akka.http.model.headers.{ Server, Host, RawHeader }
 import akka.http.util._
--- a/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala
@ -19,8 +19,8 @@ import akka.stream.impl.SynchronousPublisherFromIterable
 import akka.stream.scaladsl.Flow
 import akka.stream.testkit.StreamTestKit
 import akka.stream.testkit.StreamTestKit.{ PublisherProbe, SubscriberProbe }
-import akka.http.client.ClientConnectionSettings
-import akka.http.server.ServerSettings
+import akka.http.engine.client.ClientConnectionSettings
+import akka.http.engine.server.ServerSettings
 import akka.http.model._
 import akka.http.util._
 import headers._
--- a/akka-http-core/src/test/scala/akka/http/TestClient.scala
+++ b/akka-http-core/src/test/scala/akka/http/TestClient.scala
@ -4,19 +4,18 @@

 package akka.http

-import akka.actor.ActorSystem
-import akka.http.model.HttpMethods._
-import akka.http.model._
-import akka.io.IO
-import akka.pattern.ask
-import akka.stream.FlowMaterializer
-import akka.stream.scaladsl.Flow
-import akka.util.Timeout
 import com.typesafe.config.{ Config, ConfigFactory }
-
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.{ Failure, Success }
+import akka.actor.ActorSystem
+import akka.pattern.ask
+import akka.util.Timeout
+import akka.stream.FlowMaterializer
+import akka.stream.scaladsl.Flow
+import akka.io.IO
+import akka.http.model.HttpMethods._
+import akka.http.model._

 object TestClient extends App {
  val testConf: Config = ConfigFactory.parseString("""
--- a/akka-http-core/src/test/scala/akka/http/TestServer.scala
+++ b/akka-http-core/src/test/scala/akka/http/TestServer.scala
@ -7,13 +7,13 @@ package akka.http
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.duration._
 import akka.stream.scaladsl.Flow
+import akka.stream.FlowMaterializer
 import akka.io.IO
 import akka.util.Timeout
 import akka.actor.ActorSystem
 import akka.pattern.ask
 import akka.http.model._
 import HttpMethods._
-import akka.stream.{ MaterializerSettings, FlowMaterializer }

 object TestServer extends App {
  val testConf: Config = ConfigFactory.parseString("""
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import java.util.regex.Pattern

--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
@ -2,12 +2,12 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import org.scalatest.{ WordSpec, Matchers }
 import akka.util.ByteString
 import akka.http.model.headers.`Content-Length`
-import akka.http.parsing.SpecializedHeaderValueParsers.ContentLengthParser
+import akka.http.engine.parsing.SpecializedHeaderValueParsers.ContentLengthParser

 class ContentLengthHeaderParserSpec extends WordSpec with Matchers {

--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import java.lang.{ StringBuilder ⇒ JStringBuilder }
 import com.typesafe.config.{ ConfigFactory, Config }
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.{ Future, Await }
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.parsing
+package akka.http.engine.parsing

 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.{ Future, Await }
--- a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.rendering
+package akka.http.engine.rendering

 import com.typesafe.config.{ Config, ConfigFactory }
 import java.net.InetSocketAddress
--- a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
@ -2,7 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http.rendering
+package akka.http.engine.rendering

 import com.typesafe.config.{ Config, ConfigFactory }
 import scala.concurrent.duration._
--- a/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala
@ -2,8 +2,7 @@
 * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
 */

-package akka.http
-package server
+package akka.http.engine.server

 import scala.concurrent.duration._
 import akka.event.NoLogging
@ -11,6 +10,7 @@ import akka.http.model.HttpEntity.{ Chunk, ChunkStreamPart, LastChunk }
 import akka.http.model._
 import akka.http.model.headers.Host
 import akka.http.util._
+import akka.http.Http
 import akka.stream.FlowMaterializer
 import akka.stream.io.StreamTcp
 import akka.stream.testkit.{ AkkaSpec, StreamTestKit }