Rename remove index to delete index

lambdaworks · Nov 30, 2022 · 72cb2fa · 72cb2fa
1 parent c67bcb2
commit 72cb2fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/modules/library/src/main/scala/zio/elasticsearch/ElasticRequest.scala b/modules/library/src/main/scala/zio/elasticsearch/ElasticRequest.scala
@@ -54,7 +54,7 @@ object ElasticRequest {
     definition: Option[String]
   ): ElasticRequest[Unit] = CreateIndex(name, definition)
 
-  def removeIndex(name: IndexName): ElasticRequest[Unit] = RemoveIndex(name)
+  def deleteIndex(name: IndexName): ElasticRequest[Unit] = DeleteIndex(name)
 
   private[elasticsearch] final case class Create(
     index: IndexName,
@@ -82,12 +82,10 @@ object ElasticRequest {
     routing: Option[Routing] = None
   ) extends ElasticRequest[Option[Document]]
 
-<<<<<<< HEAD
   private[elasticsearch] final case class CreateIndex(name: IndexName, definition: Option[String])
       extends ElasticRequest[Unit]
-=======
-  private[elasticsearch] final case class RemoveIndex(name: IndexName) extends ElasticRequest[Unit]
->>>>>>> 99ffeca (Add removing index)
+
+  private[elasticsearch] final case class DeleteIndex(name: IndexName) extends ElasticRequest[Unit]
 
   private[elasticsearch] final case class Map[A, B](request: ElasticRequest[A], mapper: A => B)
       extends ElasticRequest[B]

diff --git a/modules/library/src/main/scala/zio/elasticsearch/HttpElasticExecutor.scala b/modules/library/src/main/scala/zio/elasticsearch/HttpElasticExecutor.scala
@@ -20,9 +20,9 @@ private[elasticsearch] final class HttpElasticExecutor private (config: ElasticC
       case r: Create         => executeCreate(r)
       case r: CreateIndex    => executeCreateIndex(r)
       case r: CreateOrUpdate => executeCreateOrUpdate(r)
+      case r: DeleteIndex    => executeDeleteIndex(r)
       case r: Exists         => executeExists(r)
       case r: GetById        => executeGetById(r)
-      case r: RemoveIndex    => executeRemoveIndex(r)
       case map @ Map(_, _)   => execute(map.request).map(map.mapper)
     }
 
@@ -83,11 +83,9 @@ private[elasticsearch] final class HttpElasticExecutor private (config: ElasticC
       .map(_.code.equals(Ok))
   }
 
-  private def executeRemoveIndex(r: RemoveIndex): Task[Unit] =
-    request.delete(uri"$basePath/${r.name}").send(client).map { response =>
-      println(response)
-      println(response.body)
-    }
+  private def executeDeleteIndex(r: DeleteIndex): Task[Unit] =
+    request.delete(uri"$basePath/${r.name}").send(client).unit
+
 }
 
 private[elasticsearch] object HttpElasticExecutor {