Skip to content

Commit

Permalink
rename httpClient project to httpApi
Browse files Browse the repository at this point in the history
  • Loading branch information
speedcom committed Mar 21, 2017
1 parent 44e36ff commit f39c076
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ lazy val core = (project in file("justin-core"))
.configs (MultiJvm)
.dependsOn(merkleTrees, vectorClocks, consistentHashing, crdts)

lazy val httpClient = (project in file("justin-http-client"))
lazy val httpApi = (project in file("justin-http-api"))
.enablePlugins(JavaAppPackaging)
.enablePlugins(BuildInfoPlugin)
.settings(
name := "justin-http-client",
name := "justin-http-api",
scalaVersion := Version.scala,
libraryDependencies ++= Dependencies.httpClient,
fork in Test := true,
Expand Down Expand Up @@ -102,4 +102,4 @@ lazy val consistentHashing = (project in file("justin-consistent-hashing")).sett
addCommandAlias("compileAll", ";compile;test:compile;multi-jvm:compile")

// RUN
run in Compile <<= (run in Compile in httpClient)
run in Compile <<= (run in Compile in httpApi)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Directives._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.model._
import akka.http.scaladsl.server.Directives._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Directives._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import java.util.UUID

Expand All @@ -11,7 +11,7 @@ import akka.stream.Materializer
import justin.db.Data
import justin.db.client.{ActorRefStorageNodeClient, GetValueResponse, WriteValueResponse}
import justin.db.replication.{R, W}
import justin.http_client.Unmarshallers.UUIDUnmarshaller
import justin.http_api.Unmarshallers.UUIDUnmarshaller
import spray.json.DefaultJsonProtocol._
import JustinDirectives._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.actor.ActorSystem
import akka.cluster.Cluster
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.NotUsed
import akka.actor.ActorSystem
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import com.typesafe.config.Config

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import java.util.UUID

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.model.headers.{ModeledCustomHeader, ModeledCustomHeaderCompanion}
import justin.consistent_hashing.NodeId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package justin.http_client
package justin.http_api

import akka.actor.Actor
import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Route
import akka.http.scaladsl.testkit.ScalatestRouteTest
import akka.testkit.TestActorRef
import justin.db.entropy.{ActiveAntiEntropyActorRef, ActiveAntiEntropyProtocol}
import justin.http_client.ActiveAntiEntropyRouterTest.StubActiveAntiEntropyActor
import justin.http_api.ActiveAntiEntropyRouterTest.StubActiveAntiEntropyActor
import org.scalatest.{FlatSpec, Matchers}

class ActiveAntiEntropyRouterTest extends FlatSpec with Matchers with ScalatestRouteTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Route
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Route
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import java.util.UUID

Expand All @@ -9,7 +9,7 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest
import justin.db.client.{ActorRefStorageNodeClient, GetValueResponse, WriteValueResponse}
import justin.db.replication.{R, W}
import justin.db.{Data, StorageNodeActorRef}
import justin.http_client.HttpRouter.PutValue
import justin.http_api.HttpRouter.PutValue
import org.scalatest.{FlatSpec, Matchers}
import spray.json.{JsString, _}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import akka.http.scaladsl.server.directives._
import akka.http.scaladsl.testkit.ScalatestRouteTest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import java.util.UUID

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package justin.http_client
package justin.http_api

import justin.consistent_hashing.NodeId
import justin.vector_clocks.{Counter, VectorClock}
Expand Down

0 comments on commit f39c076

Please sign in to comment.