From 1ee9701ea62d1f858a354a34f26f22d901b8e666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20V=C3=A1squez?= <jorge.vasquez0123@proton.me>
Date: Mon, 30 Oct 2023 08:02:54 -0400
Subject: [PATCH] CLI uses description annotation from zio-schema (#2499)

---
 project/Dependencies.scala                                   | 2 +-
 .../scala-2.13/zio/http/benchmarks/EndpointBenchmark.scala   | 4 ++--
 .../src/main/scala/zio/http/endpoint/cli/HttpOptions.scala   | 1 +
 .../src/main/scala/zio/http/endpoint/cli/description.scala   | 5 -----
 zio-http-example/src/main/scala/example/CliExamples.scala    | 3 ++-
 .../src/main/scala/example/EndpointExamples.scala            | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 zio-http-cli/src/main/scala/zio/http/endpoint/cli/description.scala

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 9e7761376..3d116e277 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -8,7 +8,7 @@ object Dependencies {
   val ScalaCompactCollectionVersion = "2.11.0"
   val ZioVersion                    = "2.0.18"
   val ZioCliVersion                 = "0.5.0"
-  val ZioSchemaVersion              = "0.4.14"
+  val ZioSchemaVersion              = "0.4.15"
   val SttpVersion                   = "3.3.18"
 
   val `jwt-core`                 = "com.github.jwt-scala"   %% "jwt-core"                % JwtCoreVersion
diff --git a/zio-http-benchmarks/src/main/scala-2.13/zio/http/benchmarks/EndpointBenchmark.scala b/zio-http-benchmarks/src/main/scala-2.13/zio/http/benchmarks/EndpointBenchmark.scala
index 8a3b9cd9c..8e23412e8 100644
--- a/zio-http-benchmarks/src/main/scala-2.13/zio/http/benchmarks/EndpointBenchmark.scala
+++ b/zio-http-benchmarks/src/main/scala-2.13/zio/http/benchmarks/EndpointBenchmark.scala
@@ -11,8 +11,8 @@ import zio.{Scope => _, _}
 import zio.schema.{DeriveSchema, Schema}
 
 import zio.http._
-import zio.http.codec.{PathCodec, QueryCodec}
-import zio.http.endpoint._
+import zio.http.codec.QueryCodec
+import zio.http.endpoint.Endpoint
 
 import cats.effect.unsafe.implicits.global
 import cats.effect.{IO => CIO}
diff --git a/zio-http-cli/src/main/scala/zio/http/endpoint/cli/HttpOptions.scala b/zio-http-cli/src/main/scala/zio/http/endpoint/cli/HttpOptions.scala
index e7f393b45..daba42a56 100644
--- a/zio-http-cli/src/main/scala/zio/http/endpoint/cli/HttpOptions.scala
+++ b/zio-http-cli/src/main/scala/zio/http/endpoint/cli/HttpOptions.scala
@@ -9,6 +9,7 @@ import zio.cli._
 import zio.json.ast._
 
 import zio.schema._
+import zio.schema.annotation.description
 
 import zio.http._
 import zio.http.codec._
diff --git a/zio-http-cli/src/main/scala/zio/http/endpoint/cli/description.scala b/zio-http-cli/src/main/scala/zio/http/endpoint/cli/description.scala
deleted file mode 100644
index d36c380e2..000000000
--- a/zio-http-cli/src/main/scala/zio/http/endpoint/cli/description.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package zio.http.endpoint.cli
-
-import scala.annotation.StaticAnnotation
-
-class description(val text: String) extends StaticAnnotation // TODO move this to zio-schema
diff --git a/zio-http-example/src/main/scala/example/CliExamples.scala b/zio-http-example/src/main/scala/example/CliExamples.scala
index 3b5032b3f..0ee4c0d75 100644
--- a/zio-http-example/src/main/scala/example/CliExamples.scala
+++ b/zio-http-example/src/main/scala/example/CliExamples.scala
@@ -4,12 +4,13 @@ import zio._
 import zio.cli._
 
 import zio.schema._
+import zio.schema.annotation.description
 
 import zio.http.Header.Location
 import zio.http._
 import zio.http.codec._
-import zio.http.endpoint._
 import zio.http.endpoint.cli._
+import zio.http.endpoint.{Endpoint, EndpointExecutor}
 
 trait TestCliEndpoints {
   import zio.http.codec.PathCodec._
diff --git a/zio-http-example/src/main/scala/example/EndpointExamples.scala b/zio-http-example/src/main/scala/example/EndpointExamples.scala
index 1cbe14077..b76df7661 100644
--- a/zio-http-example/src/main/scala/example/EndpointExamples.scala
+++ b/zio-http-example/src/main/scala/example/EndpointExamples.scala
@@ -4,7 +4,7 @@ import zio._
 
 import zio.http.Header.Authorization
 import zio.http.codec.{HttpCodec, PathCodec}
-import zio.http.endpoint._
+import zio.http.endpoint.{Endpoint, EndpointExecutor, EndpointLocator, EndpointMiddleware}
 import zio.http.{int => _, _}
 
 object EndpointExamples extends ZIOAppDefault {