ledger-api-common: Move the HealthService here.

digital-asset · mergify · Nov 22, 2019 · Nov 19, 2019 · Nov 19, 2019 · Nov 19, 2019
commit a0df5d9ee453064f509ce2a8dbe61c28a41cff2f
diff --git a/ledger/ledger-api-common/BUILD.bazel b/ledger/ledger-api-common/BUILD.bazel
@@ -61,9 +61,11 @@ testDependencies = [
     "//daml-lf/language",
     "//daml-lf/parser",
     "//language-support/scala/bindings",
-    "//ledger-api/testing-utils",
+    "//ledger/ledger-api-akka",
     "//ledger-api/rs-grpc-bridge",
     "//ledger-api/rs-grpc-akka",
+    "//ledger-api/rs-grpc-testing-utils",
+    "//ledger-api/testing-utils",
     "//ledger/ledger-api-domain:ledger-api-domain",
     "//ledger/participant-state",
     "//daml-lf/archive:daml_lf_archive_reader",
@@ -73,6 +75,7 @@ testDependencies = [
     "@maven//:com_typesafe_akka_akka_actor_2_12",
     "@maven//:com_typesafe_akka_akka_stream_2_12",
     "@maven//:com_typesafe_akka_akka_stream_testkit_2_12",
+    "@maven//:com_typesafe_akka_akka_testkit_2_12",
     "@maven//:com_typesafe_scala_logging_scala_logging_2_12",
     "@maven//:org_reactivestreams_reactive_streams",
     "@maven//:org_scalactic_scalactic_2_12",

diff --git a/...latform/sandbox/health/DropRepeated.scala → ...et/platform/server/api/DropRepeated.scala b/...latform/sandbox/health/DropRepeated.scala → ...et/platform/server/api/DropRepeated.scala
@@ -1,7 +1,7 @@
 // Copyright (c) 2019 The DAML Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.digitalasset.platform.sandbox.health
+package com.digitalasset.platform.server.api
 
 import akka.stream.stage.{GraphStage, GraphStageLogic, InHandler, OutHandler}
 import akka.stream.{Attributes, FlowShape, Inlet, Outlet}

diff --git a/...atform/sandbox/health/HealthService.scala → ...api/services/grpc/GrpcHealthService.scala b/...atform/sandbox/health/HealthService.scala → ...api/services/grpc/GrpcHealthService.scala
@@ -1,14 +1,15 @@
 // Copyright (c) 2019 The DAML Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.digitalasset.platform.sandbox.health
+package com.digitalasset.platform.server.api.services.grpc
 
 import akka.NotUsed
 import akka.stream.Materializer
 import akka.stream.scaladsl.Source
 import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
 import com.digitalasset.grpc.adapter.utils.DirectExecutionContext
 import com.digitalasset.platform.api.grpc.GrpcApiService
+import com.digitalasset.platform.server.api.DropRepeated
 import io.grpc.ServerServiceDefinition
 import io.grpc.health.v1.health.{
   HealthAkkaGrpc,
@@ -20,7 +21,7 @@ import io.grpc.health.v1.health.{
 import scala.concurrent.duration.DurationInt
 import scala.concurrent.{ExecutionContext, Future}
 
-class HealthService(
+class GrpcHealthService(
     implicit protected val esf: ExecutionSequencerFactory,
     protected val mat: Materializer,
     executionContext: ExecutionContext,

diff --git a/...orm/sandbox/health/DropRepeatedSpec.scala → ...latform/server/api/DropRepeatedSpec.scala b/...orm/sandbox/health/DropRepeatedSpec.scala → ...latform/server/api/DropRepeatedSpec.scala
@@ -1,7 +1,7 @@
 // Copyright (c) 2019 The DAML Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.digitalasset.platform.sandbox.health
+package com.digitalasset.platform.server.api
 
 import akka.actor.ActorSystem
 import akka.pattern.pipe

diff --git a/...rm/sandbox/health/HealthServiceSpec.scala → ...services/grpc/GrpcHealthServiceSpec.scala b/...rm/sandbox/health/HealthServiceSpec.scala → ...services/grpc/GrpcHealthServiceSpec.scala
@@ -1,25 +1,25 @@
 // Copyright (c) 2019 The DAML Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.digitalasset.platform.sandbox.health
+package com.digitalasset.platform.server.api.services.grpc
 
 import com.digitalasset.grpc.adapter.server.rs.MockServerCallStreamObserver
 import com.digitalasset.ledger.api.testing.utils.AkkaBeforeAndAfterAll
-import com.digitalasset.platform.sandbox.health.HealthServiceSpec._
+import com.digitalasset.platform.server.api.services.grpc.GrpcHealthServiceSpec._
 import io.grpc.health.v1.health.{HealthCheckRequest, HealthCheckResponse}
 import org.scalatest.concurrent.Eventually
 import org.scalatest.time.{Second, Span}
 import org.scalatest.{Matchers, WordSpec}
 
 import scala.concurrent.{Await, ExecutionContext}
 
-object HealthServiceSpec {
+object GrpcHealthServiceSpec {
   private val request = HealthCheckRequest()
 
   private val servingResponse = HealthCheckResponse(HealthCheckResponse.ServingStatus.SERVING)
 }
 
-final class HealthServiceSpec
+final class GrpcHealthServiceSpec
     extends WordSpec
     with Matchers
     with Eventually
@@ -32,7 +32,7 @@ final class HealthServiceSpec
 
   "HealthService" should {
     "check the current health" in {
-      val service = new HealthService()
+      val service = new GrpcHealthService()
 
       val response = Await.result(service.check(request), patienceConfig.timeout)
 
@@ -41,7 +41,7 @@ final class HealthServiceSpec
 
     "observe changes in health" in {
       val responseObserver = new MockServerCallStreamObserver[HealthCheckResponse]
-      val service = new HealthService()
+      val service = new GrpcHealthService()
 
       service.watch(request, responseObserver)
       responseObserver.demandResponse()

diff --git a/ledger/sandbox/BUILD.bazel b/ledger/sandbox/BUILD.bazel
@@ -34,7 +34,6 @@ compileDependencies = [
     "//language-support/scala/bindings",
     "//ledger-api/rs-grpc-akka",
     "//ledger-api/rs-grpc-bridge",
-    "//ledger-api/rs-grpc-testing-utils",
     "//ledger-service/jwt",
     "//ledger/ledger-api-akka",
     "//ledger/ledger-api-auth",
@@ -176,7 +175,6 @@ testDependencies = [
     "//ledger/ledger-api-common:ledger-api-common-scala-tests-lib",
     "//ledger/test-common:test-common",
     "//ledger-api/testing-utils",
-    "@maven//:com_typesafe_akka_akka_testkit_2_12",
     "@maven//:commons_io_commons_io",
     "@maven//:org_awaitility_awaitility",
     "@maven//:org_mockito_mockito_core",

diff --git a/ledger/sandbox/src/main/scala/com/digitalasset/ledger/server/apiserver/ApiServices.scala b/ledger/sandbox/src/main/scala/com/digitalasset/ledger/server/apiserver/ApiServices.scala
@@ -22,14 +22,14 @@ import com.digitalasset.ledger.api.v1.command_completion_service.CompletionEndRe
 import com.digitalasset.ledger.client.services.commands.CommandSubmissionFlow
 import com.digitalasset.platform.common.logging.NamedLoggerFactory
 import com.digitalasset.platform.sandbox.config.CommandConfiguration
-import com.digitalasset.platform.sandbox.health.HealthService
 import com.digitalasset.platform.sandbox.services._
 import com.digitalasset.platform.sandbox.services.admin.{
   ApiPackageManagementService,
   ApiPartyManagementService
 }
 import com.digitalasset.platform.sandbox.services.transaction.ApiTransactionService
 import com.digitalasset.platform.sandbox.stores.ledger.CommandExecutorImpl
+import com.digitalasset.platform.server.api.services.grpc.GrpcHealthService
 import com.digitalasset.platform.server.services.command.ApiCommandService
 import com.digitalasset.platform.server.services.identity.ApiLedgerIdentityService
 import com.digitalasset.platform.server.services.testing.{ApiTimeService, TimeServiceBackend}
@@ -162,7 +162,7 @@ object ApiServices {
 
       val apiReflectionService = ProtoReflectionService.newInstance()
 
-      val apiHealthService = new HealthService
+      val apiHealthService = new GrpcHealthService
 
       // Note: the command service uses the command submission, command completion, and transaction services internally.
       // These connections do not use authorization, authorization wrappers are only added here to all exposed services.