integrate new generic server api

Author: fupelaqu

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "scheduler"
 
-ThisBuild / version := "0.1.2"
+ThisBuild / version := "0.1.3"
 
 ThisBuild / scalaVersion := "2.12.15"
 

common/build.sbt

@@ -8,7 +8,7 @@ name := "scheduler-common"
 
 libraryDependencies ++= Seq(
   "com.markatta" %% "akron" % "1.2" excludeAll(ExclusionRule(organization = "com.typesafe.akka"), ExclusionRule(organization = "org.scala-lang.modules")),
-  "app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
+  "app.softnetwork.api" %% "generic-server-api" % Versions.server,
   "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.5"
 )
 

common/src/main/scala/app/softnetwork/scheduler/api/GrpcClient.scala

@@ -2,6 +2,7 @@ package app.softnetwork.scheduler.api
 
 import akka.actor.typed.ActorSystem
 import akka.grpc.GrpcClientSettings
+import app.softnetwork.api.server.client.{GrpcClient, GrpcClientFactory}
 import app.softnetwork.schedule.api.{
   AddScheduleRequest,
   RemoveScheduleRequest,

common/src/main/scala/app/softnetwork/scheduler/api/SchedulerClient.scala

@@ -4,5 +4,7 @@ object Versions {
 
   val genericPersistence = "0.2.5.15"
 
+  val server = "0.2.6.2"
+
   val scalatest = "3.1.1"
 }

project/src/main/scala/app/softnetwork/sbt/build/Versions.scala

@@ -7,6 +7,6 @@ organization := "app.softnetwork.scheduler"
 name := "scheduler-testkit"
 
 libraryDependencies ++= Seq(
-  "app.softnetwork.api" %% "generic-server-api-testkit" % Versions.genericPersistence,
+  "app.softnetwork.api" %% "generic-server-api-testkit" % Versions.server,
   "app.softnetwork.persistence" %% "persistence-core-testkit" % Versions.genericPersistence
 )

testkit/build.sbt

@@ -3,17 +3,14 @@ package app.softnetwork.scheduler.api
 import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
 import app.softnetwork.api.server.GrpcServices
+import app.softnetwork.api.server.scalatest.ServerTestKit
 import app.softnetwork.schedule.api.SchedulerServiceApiHandler
 import app.softnetwork.scheduler.launch.SchedulerGuardian
 
 import scala.concurrent.Future
 
 trait SchedulerGrpcServices extends GrpcServices {
-  _: SchedulerGuardian =>
-
-  def interface: String
-
-  def port: Int
+  _: SchedulerGuardian with ServerTestKit =>
 
   override def grpcServices
     : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] =