renamed current rest package as legacyrest

.gitignore

@@ -90,7 +90,7 @@ buildNumber.properties
 ## Plugin-specific files:
 
 # IntelliJ
-/out/
+out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/

.travis.yml

@@ -23,7 +23,6 @@ script:
 
 jdk:
   - oraclejdk8
-
 scala:
   - 2.11.12
   - 2.12.7

macros/src/main/scala/io/udash/rest/macros/RESTMacros.scala → macros/src/main/scala/io/udash/legacyrest/macros/RESTMacros.scala

@@ -1,4 +1,4 @@
-package io.udash.rest.macros
+package io.udash.legacyrest.macros
 
 import com.avsystem.commons.macros.rpc.RpcMacros
 
@@ -16,7 +16,7 @@ class RESTMacros(val ctx: blackbox.Context) extends RpcMacros(ctx) {
   }
 
   val FrameworkObj: Tree = c.prefix.tree
-  val RestPackage = q"_root_.io.udash.rest"
+  val RestPackage = q"_root_.io.udash.legacyrest"
 
   val RESTFrameworkType = getType(tq"$RestPackage.UdashRESTFramework")
   val ValidRESTCls = tq"$FrameworkObj.ValidREST"

rest/.js/src/main/scala/io/udash/rest/DefaultSttpBackend.scala → rest/.js/src/main/scala/io/udash/legacyrest/DefaultSttpBackend.scala

@@ -1,9 +1,9 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.softwaremill.sttp.{FetchBackend, SttpBackend}
 
 import scala.concurrent.Future
 
-private[rest] object DefaultSttpBackend {
+private[legacyrest] object DefaultSttpBackend {
   implicit val backend: SttpBackend[Future, Nothing] = FetchBackend()
 }

rest/.jvm/src/main/scala/io/udash/rest/DefaultSttpBackend.scala → rest/.jvm/src/main/scala/io/udash/legacyrest/DefaultSttpBackend.scala

@@ -1,10 +1,10 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.softwaremill.sttp.SttpBackend
 import com.softwaremill.sttp.asynchttpclient.future.AsyncHttpClientFutureBackend
 
 import scala.concurrent.Future
 
-private[rest] object DefaultSttpBackend {
+private[legacyrest] object DefaultSttpBackend {
   implicit val backend: SttpBackend[Future, Nothing] = AsyncHttpClientFutureBackend()
 }

rest/.jvm/src/main/scala/io/udash/rest/server/DefaultExposesREST.scala → rest/.jvm/src/main/scala/io/udash/legacyrest/server/DefaultExposesREST.scala

@@ -1,6 +1,6 @@
-package io.udash.rest.server
+package io.udash.legacyrest.server
 
-import io.udash.rest.{DefaultRESTFramework, RESTConverters}
+import io.udash.legacyrest.{DefaultRESTFramework, RESTConverters}
 
 class DefaultExposesREST[ServerRPCType : DefaultRESTFramework.ValidServerREST : DefaultRESTFramework.RPCMetadata](localRest: ServerRPCType)(
   implicit protected val localRpcAsRaw: DefaultRESTFramework.AsRawRPC[ServerRPCType]

rest/.jvm/src/main/scala/io/udash/rest/server/ExposesREST.scala → rest/.jvm/src/main/scala/io/udash/legacyrest/server/ExposesREST.scala

@@ -1,8 +1,8 @@
-package io.udash.rest.server
+package io.udash.legacyrest.server
 
 import com.avsystem.commons.concurrent.RunNowEC
 import com.avsystem.commons.misc.Opt
-import io.udash.rest.{UdashRESTFramework, _}
+import io.udash.legacyrest.{UdashRESTFramework, _}
 import io.udash.rpc.JsonStr
 import javax.servlet.http.HttpServletRequest
 

rest/.jvm/src/main/scala/io/udash/rest/server/RestServlet.scala → rest/.jvm/src/main/scala/io/udash/legacyrest/server/RestServlet.scala

@@ -1,9 +1,9 @@
-package io.udash.rest.server
+package io.udash.legacyrest.server
 
 import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 
 import com.avsystem.commons.SharedExtensions._
-import io.udash.rest._
+import io.udash.legacyrest._
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}

rest/.jvm/src/test/scala/io/udash/rest/server/EndpointsIntegrationTest.scala → rest/.jvm/src/test/scala/io/udash/legacyrest/server/EndpointsIntegrationTest.scala

@@ -1,10 +1,10 @@
-package io.udash.rest.server
+package io.udash.legacyrest.server
 
 import java.net.ConnectException
 
-import io.udash.rest._
-import io.udash.rest.internal.RESTConnector
-import io.udash.rest.internal.RESTConnector.ClientException
+import io.udash.legacyrest._
+import io.udash.legacyrest.internal.RESTConnector
+import io.udash.legacyrest.internal.RESTConnector.ClientException
 import io.udash.testing.UdashSharedTest
 import javax.servlet.http.HttpServletRequest
 import org.eclipse.jetty.server.Server

rest/.jvm/src/test/scala/io/udash/rest/server/InterfaceVerificationTest.scala → rest/.jvm/src/test/scala/io/udash/legacyrest/server/InterfaceVerificationTest.scala

@@ -1,12 +1,12 @@
-package io.udash.rest.server
+package io.udash.legacyrest.server
 
 import io.udash.testing.UdashSharedTest
 
 class InterfaceVerificationTest extends UdashSharedTest {
   "Endpoint interface" should {
     "not use @RESTName annotation" in {
       """import io.udash.rpc._
-         |import io.udash.rest._
+         |import io.udash.legacyrest._
          |import scala.concurrent.Future
          |import com.avsystem.commons.rpc.rpcName
          |
@@ -32,7 +32,7 @@ class InterfaceVerificationTest extends UdashSharedTest {
        """.stripMargin should compile
 
       """import io.udash.rpc._
-         |import io.udash.rest._
+         |import io.udash.legacyrest._
          |import scala.concurrent.Future
          |import com.avsystem.commons.rpc.rpcName
          |
@@ -58,7 +58,7 @@ class InterfaceVerificationTest extends UdashSharedTest {
        """.stripMargin shouldNot typeCheck
 
       """import io.udash.rpc._
-         |import io.udash.rest._
+         |import io.udash.legacyrest._
          |import scala.concurrent.Future
          |import com.avsystem.commons.rpc.rpcName
          |
@@ -86,7 +86,7 @@ class InterfaceVerificationTest extends UdashSharedTest {
 
     "not mix @Body and @BodyValue" in {
       """import io.udash.rpc._
-        |import io.udash.rest._
+        |import io.udash.legacyrest._
         |import scala.concurrent.Future
         |import com.avsystem.commons.rpc.rpcName
         |
@@ -112,7 +112,7 @@ class InterfaceVerificationTest extends UdashSharedTest {
       """.stripMargin should compile
 
       """import io.udash.rpc._
-        |import io.udash.rest._
+        |import io.udash.legacyrest._
         |import scala.concurrent.Future
         |import com.avsystem.commons.rpc.rpcName
         |
@@ -138,7 +138,7 @@ class InterfaceVerificationTest extends UdashSharedTest {
       """.stripMargin shouldNot typeCheck
 
       """import io.udash.rpc._
-        |import io.udash.rest._
+        |import io.udash.legacyrest._
         |import scala.concurrent.Future
         |import com.avsystem.commons.rpc.rpcName
         |
@@ -164,7 +164,7 @@ class InterfaceVerificationTest extends UdashSharedTest {
       """.stripMargin shouldNot typeCheck
 
       """import io.udash.rpc._
-        |import io.udash.rest._
+        |import io.udash.legacyrest._
         |import scala.concurrent.Future
         |import com.avsystem.commons.rpc.rpcName
         |

rest/.jvm/src/test/scala/io/udash/rest/server/ServerTestRESTInterface.scala → rest/.jvm/src/test/scala/io/udash/legacyrest/server/ServerTestRESTInterface.scala

@@ -1,8 +1,8 @@
-package io.udash.rest.server
+package io.udash.legacyrest.server
 
 import com.avsystem.commons.rpc.rpcName
-import io.udash.rest.DefaultRESTFramework._
-import io.udash.rest._
+import io.udash.legacyrest.DefaultRESTFramework._
+import io.udash.legacyrest._
 
 import scala.concurrent.Future
 

rest/src/main/scala/io/udash/rest/DefaultRESTConnector.scala → rest/src/main/scala/io/udash/legacyrest/DefaultRESTConnector.scala

@@ -1,10 +1,10 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.avsystem.commons.concurrent.RunNowEC
 import com.avsystem.commons.misc.{AbstractValueEnum, AbstractValueEnumCompanion, EnumCtx, Opt}
 import com.softwaremill.sttp.Uri.QueryFragment.KeyValue
-import io.udash.rest.internal.RESTConnector
-import io.udash.rest.internal.RESTConnector.HttpMethod
+import io.udash.legacyrest.internal.RESTConnector
+import io.udash.legacyrest.internal.RESTConnector.HttpMethod
 
 import scala.concurrent.Future
 
@@ -15,12 +15,12 @@ object Protocol extends AbstractValueEnumCompanion[Protocol] {
   final val https: Value = new Protocol(443)
 }
 
-/** Default implementation of [[io.udash.rest.internal.RESTConnector]] for Udash REST. */
+/** Default implementation of [[io.udash.legacyrest.internal.RESTConnector]] for Udash REST. */
 class DefaultRESTConnector(val protocol: Protocol, val host: String, val port: Int, val pathPrefix: String) extends RESTConnector {
 
   override def send(url: String, method: HttpMethod, queryArguments: Map[String, String], headers: Map[String, String], body: String): Future[String] = {
     import com.softwaremill.sttp._
-    import io.udash.rest.DefaultSttpBackend.backend
+    import io.udash.legacyrest.DefaultSttpBackend.backend
 
     val sttpMethod = method match {
       case RESTConnector.HttpMethod.GET => Method.GET

rest/src/main/scala/io/udash/rest/DefaultRESTFramework.scala → rest/src/main/scala/io/udash/legacyrest/DefaultRESTFramework.scala

@@ -1,4 +1,4 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.avsystem.commons.serialization.GenCodec
 import com.avsystem.commons.serialization.json.{JsonStringInput, JsonStringOutput}

rest/src/main/scala/io/udash/rest/DefaultServerREST.scala → rest/src/main/scala/io/udash/legacyrest/DefaultServerREST.scala

@@ -1,10 +1,10 @@
-package io.udash.rest
+package io.udash.legacyrest
 
-import io.udash.rest.internal.{RESTConnector, UsesREST}
+import io.udash.legacyrest.internal.{RESTConnector, UsesREST}
 
 import scala.concurrent.ExecutionContext
 
-/** Default REST usage mechanism using [[io.udash.rest.DefaultRESTFramework]]. */
+/** Default REST usage mechanism using [[io.udash.legacyrest.DefaultRESTFramework]]. */
 class DefaultServerREST[ServerRPCType : DefaultRESTFramework.AsRealRPC : DefaultRESTFramework.RPCMetadata : DefaultRESTFramework.ValidREST]
                        (override protected val connector: RESTConnector)(implicit ec: ExecutionContext)
   extends UsesREST[ServerRPCType] with RESTConverters {
@@ -16,7 +16,7 @@ class DefaultServerREST[ServerRPCType : DefaultRESTFramework.AsRealRPC : Default
 }
 
 object DefaultServerREST {
-  /** Creates [[io.udash.rest.DefaultServerREST]] with [[io.udash.rest.DefaultRESTConnector]] for provided REST interfaces. */
+  /** Creates [[io.udash.legacyrest.DefaultServerREST]] with [[io.udash.legacyrest.DefaultRESTConnector]] for provided REST interfaces. */
   def apply[ServerRPCType : DefaultRESTFramework.AsRealRPC : DefaultRESTFramework.RPCMetadata : DefaultRESTFramework.ValidREST]
            (protocol: Protocol, host: String, port: Int, pathPrefix: String = "")(implicit ec: ExecutionContext): ServerRPCType = {
     val serverConnector = new DefaultRESTConnector(protocol, host, port, pathPrefix)

rest/src/main/scala/io/udash/rest/RESTConverters.scala → rest/src/main/scala/io/udash/legacyrest/RESTConverters.scala

@@ -1,4 +1,4 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import io.udash.rpc.JsonStr
 import io.udash.rpc.serialization.URLEncoder

rest/src/main/scala/io/udash/rest/UdashRESTFramework.scala → rest/src/main/scala/io/udash/legacyrest/UdashRESTFramework.scala

@@ -1,4 +1,4 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.avsystem.commons.rpc.StandardRPCFramework
 import io.udash.rpc.JsonStr

rest/src/main/scala/io/udash/rest/annotations.scala → rest/src/main/scala/io/udash/legacyrest/annotations.scala

@@ -1,4 +1,4 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.avsystem.commons.rpc.MetadataAnnotation
 

rest/src/main/scala/io/udash/rest/internal/RESTConnector.scala → rest/src/main/scala/io/udash/legacyrest/internal/RESTConnector.scala

@@ -1,4 +1,4 @@
-package io.udash.rest.internal
+package io.udash.legacyrest.internal
 
 import com.avsystem.commons.misc.{AbstractValueEnum, AbstractValueEnumCompanion, EnumCtx}
 
@@ -7,7 +7,7 @@ import scala.concurrent.Future
 /** Provides connection to REST server. */
 trait RESTConnector {
   /** Sends HTTP request to REST server.
-    * It should fail with [[io.udash.rest.internal.RESTConnector.RequestException]] if server returned code different than 2xx. */
+    * It should fail with [[io.udash.legacyrest.internal.RESTConnector.RequestException]] if server returned code different than 2xx. */
   def send(url: String, method: RESTConnector.HttpMethod, queryArguments: Map[String, String], headers: Map[String, String], body: String): Future[String]
 }
 

rest/src/main/scala/io/udash/rest/internal/UsesREST.scala → rest/src/main/scala/io/udash/legacyrest/internal/UsesREST.scala

@@ -1,7 +1,7 @@
-package io.udash.rest.internal
+package io.udash.legacyrest.internal
 
 import com.avsystem.commons.rpc.MetadataAnnotation
-import io.udash.rest._
+import io.udash.legacyrest._
 import io.udash.rpc.JsonStr
 import io.udash.rpc.serialization.URLEncoder
 

rest/src/test/scala/io/udash/rest/DefaultServerRESTTest.scala → rest/src/test/scala/io/udash/legacyrest/DefaultServerRESTTest.scala

@@ -1,8 +1,8 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.avsystem.commons.serialization.GenCodec
-import io.udash.rest.internal.RESTConnector
-import io.udash.rest.internal.RESTConnector.HttpMethod
+import io.udash.legacyrest.internal.RESTConnector
+import io.udash.legacyrest.internal.RESTConnector.HttpMethod
 import io.udash.rpc.JsonStr
 import io.udash.testing.AsyncUdashSharedTest
 import org.scalatest.Succeeded

rest/src/test/scala/io/udash/rest/HasFakeInstances.scala → rest/src/test/scala/io/udash/legacyrest/HasFakeInstances.scala

@@ -1,4 +1,4 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 trait HasFakeInstances
 object HasFakeInstances {

rest/src/test/scala/io/udash/rest/TestRESTInterface.scala → rest/src/test/scala/io/udash/legacyrest/TestRESTInterface.scala

@@ -1,4 +1,4 @@
-package io.udash.rest
+package io.udash.legacyrest
 
 import com.avsystem.commons.rpc.rpcName
 import com.avsystem.commons.serialization.HasGenCodec

selenium/.js/src/main/scala/io/udash/selenium/Launcher.scala

@@ -27,7 +27,7 @@ object Launcher {
   }
   val serverRpc = DefaultServerRPC[MainClientRPC, MainServerRPC](new RPCService, exceptionsRegistry = GuideExceptions.registry)
 
-  import io.udash.rest._
+  import io.udash.legacyrest._
   private val restProtocol = if (dom.window.location.protocol == "https:") Protocol.https else Protocol.http
   val restServer = DefaultServerREST[MainServerREST](
     restProtocol, dom.window.location.hostname, Try(dom.window.location.port.toInt).getOrElse(restProtocol.defaultPort), "/rest_api/"

selenium/.jvm/src/main/scala/io/udash/selenium/server/ApplicationServer.scala

@@ -1,7 +1,7 @@
 package io.udash.selenium.server
 
 
-import io.udash.rest.server.{DefaultExposesREST, DefaultRestServlet}
+import io.udash.legacyrest.server.{DefaultExposesREST, DefaultRestServlet}
 import io.udash.rpc._
 import io.udash.rpc.utils.{CallLogging, DefaultAtmosphereFramework}
 import io.udash.selenium.demos.activity.CallLogger

selenium/src/main/scala/io/udash/selenium/rpc/demos/rest/MainServerREST.scala

@@ -1,6 +1,6 @@
 package io.udash.selenium.rpc.demos.rest
 
-import io.udash.rest._
+import io.udash.legacyrest._
 
 import scala.concurrent.Future