fix(client): Rename list indices to list indexes (#466)

Closes #453

src/main/scala/algolia/AlgoliaDsl.scala

@@ -26,6 +26,7 @@
 package algolia
 
 import algolia.definitions._
+import algolia.dsl._
 import algolia.objects._
 import org.json4s.{CustomSerializer, Formats}
 import org.json4s.JsonAST._
@@ -36,18 +37,18 @@ import scala.util.matching.Regex
 trait AlgoliaDsl
     extends Object //Just to have all trait DSL ordered `with`
     with KeyDefinitionDsl
-    with BatchDefinitionDsl
-    with BrowseIndexDsl
+    with dsl.BatchDsl
+    with BrowseDsl
     with ClearDsl
-    with CopyIndexDsl
+    with CopyDsl
     with DeleteDsl
     with GetDsl
     with IndexingBatchDsl
     with IndexingDsl
     with IndexSettingsDsl
     with ListDsl
     with LogsDsl
-    with MoveIndexDsl
+    with MoveDsl
     with MultiQueriesDefinitionDsl
     with PartialUpdateObjectDsl
     with RulesDsl

src/main/scala/algolia/AlgoliaSyncHelper.scala

@@ -121,7 +121,7 @@ case class AlgoliaSyncHelper(client: AlgoliaClient) {
         }
 
         val result = Await.result(future, duration).hits
-        page = if (result.size < hitsPerPage) {
+        page = if (result.lengthCompare(hitsPerPage) < 0) {
           PageState.End
         } else {
           page.nextPage()

src/main/scala/algolia/definitions/BatchDefinition.scala

@@ -118,25 +118,3 @@ case class BatchDefinition(
     }
   }
 }
-
-trait BatchDefinitionDsl {
-
-  implicit val formats: Formats
-
-  def batch(batches: Traversable[Definition]): BatchDefinition = {
-    BatchDefinition(batches)
-  }
-
-  def batch(batches: Definition*): BatchDefinition = {
-    BatchDefinition(batches)
-  }
-
-  implicit object BatchDefinitionExecutable
-      extends Executable[BatchDefinition, TasksMultipleIndex] {
-    override def apply(client: AlgoliaClient, query: BatchDefinition)(
-        implicit executor: ExecutionContext): Future[TasksMultipleIndex] = {
-      client.request[TasksMultipleIndex](query.build())
-    }
-  }
-
-}

src/main/scala/algolia/definitions/BrowseIndexDefinition.scala

@@ -61,24 +61,3 @@ case class BrowseIndexDefinition(
     )
   }
 }
-
-trait BrowseIndexDsl {
-
-  implicit val formats: Formats
-
-  case object browse {
-
-    def index(index: String): BrowseIndexDefinition =
-      BrowseIndexDefinition(index)
-
-  }
-
-  implicit object BrowseIndexDefinitionExecutable
-      extends Executable[BrowseIndexDefinition, BrowseResult] {
-    override def apply(client: AlgoliaClient, query: BrowseIndexDefinition)(
-        implicit executor: ExecutionContext): Future[BrowseResult] = {
-      client.request[BrowseResult](query.build())
-    }
-  }
-
-}

src/main/scala/algolia/definitions/ClearIndexDefinition.scala

@@ -0,0 +1,45 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Algolia
+ * http://www.algolia.com/
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package algolia.definitions
+
+import algolia.http.{HttpPayload, POST}
+import algolia.objects.RequestOptions
+
+case class ClearIndexDefinition(index: String, requestOptions: Option[RequestOptions] = None)
+    extends Definition {
+
+  type T = ClearIndexDefinition
+
+  override def options(requestOptions: RequestOptions): ClearIndexDefinition =
+    copy(requestOptions = Some(requestOptions))
+
+  override private[algolia] def build(): HttpPayload =
+    HttpPayload(POST,
+                Seq("1", "indexes", index, "clear"),
+                isSearch = false,
+                requestOptions = requestOptions)
+
+}

src/main/scala/algolia/definitions/CopyIndexDefinition.scala

@@ -69,22 +69,3 @@ case class CopyIndexDefinition(
     )
   }
 }
-
-trait CopyIndexDsl {
-
-  implicit val formats: Formats
-
-  case object copy {
-
-    def index(index: String): CopyIndexDefinition = CopyIndexDefinition(index)
-
-  }
-
-  implicit object CopyIndexDefinitionExecutable extends Executable[CopyIndexDefinition, Task] {
-    override def apply(client: AlgoliaClient, query: CopyIndexDefinition)(
-        implicit executor: ExecutionContext): Future[Task] = {
-      client.request[Task](query.build())
-    }
-  }
-
-}

src/main/scala/algolia/definitions/DeleteDefinition.scala

@@ -103,52 +103,3 @@ case class DeleteByDefinition(
   override def options(requestOptions: RequestOptions): DeleteByDefinition =
     copy(requestOptions = Some(requestOptions))
 }
-
-trait DeleteDsl {
-
-  implicit val formats: Formats
-
-  case object delete {
-
-    //Index
-    def index(index: String): DeleteIndexDefinition =
-      DeleteIndexDefinition(index)
-
-    //Object
-    def objectId(objectId: String) =
-      DeleteObjectDefinition(oid = Some(objectId))
-
-    //Object
-    def from(index: String) = DeleteObjectDefinition(index = Some(index))
-
-    def key(keyName: String) = DeleteKeyDefinition(keyName)
-
-    def synonym(synId: String) = DeleteSynonymDefinition(synId = synId)
-
-    def rule(ruleId: String) = DeleteRuleDefinition(objectId = ruleId)
-
-  }
-
-  implicit object DeleteObjectDefinitionExecutable
-      extends Executable[DeleteObjectDefinition, Task] {
-    override def apply(client: AlgoliaClient, query: DeleteObjectDefinition)(
-        implicit executor: ExecutionContext): Future[Task] = {
-      client.request[Task](query.build())
-    }
-  }
-
-  implicit object DeleteIndexDefinitionExecutable extends Executable[DeleteIndexDefinition, Task] {
-    override def apply(client: AlgoliaClient, query: DeleteIndexDefinition)(
-        implicit executor: ExecutionContext): Future[Task] = {
-      client.request[Task](query.build())
-    }
-  }
-
-  implicit object DeleteByDefinitionExecutable extends Executable[DeleteByDefinition, Task] {
-    override def apply(client: AlgoliaClient, query: DeleteByDefinition)(
-        implicit executor: ExecutionContext): Future[Task] = {
-      client.request[Task](query.build())
-    }
-  }
-
-}

src/main/scala/algolia/definitions/GetDefinition.scala

@@ -90,50 +90,3 @@ case class GetObjectsDefinition(
   }
 
 }
-
-trait GetDsl {
-
-  implicit val formats: Formats
-
-  case object get {
-
-    def objectId(objectId: String) = GetObjectDefinition(oid = Some(objectId))
-
-    def from(index: String) = GetObjectDefinition(index = Some(index))
-
-    def key(keyName: String) = GetKeyDefinition(keyName)
-
-    @deprecated("use list keys", "1.27.1")
-    def allKeys() = ListKeysDefinition()
-
-    @deprecated("use list keysFrom", "1.27.1")
-    def allKeysFrom(indexName: String) =
-      ListKeysDefinition(indexName = Some(indexName))
-
-    def synonym(synId: String) = GetSynonymDefinition(synId = synId)
-
-    def rule(ruleId: String) = GetRuleDefinition(objectId = ruleId)
-
-  }
-
-  implicit object GetObjectDefinitionExecutable
-      extends Executable[GetObjectDefinition, GetObject] {
-
-    override def apply(client: AlgoliaClient, query: GetObjectDefinition)(
-        implicit executor: ExecutionContext): Future[GetObject] = {
-      client.request[JObject](query.build()).map(GetObject)
-    }
-
-  }
-
-  implicit object GetObjectsDefinitionExecutable
-      extends Executable[GetObjectsDefinition, Results] {
-
-    override def apply(client: AlgoliaClient, query: GetObjectsDefinition)(
-        implicit executor: ExecutionContext): Future[Results] = {
-      client.request[Results](query.build())
-    }
-
-  }
-
-}

src/main/scala/algolia/definitions/IndexSettingsDefinition.scala

@@ -91,44 +91,3 @@ case class IndexChangeSettingsDefinition(
     )
   }
 }
-
-trait IndexSettingsDsl {
-
-  implicit val formats: Formats
-
-  case object settings {
-
-    def of(index: String) = IndexSettingsDefinition(index)
-
-  }
-
-  @deprecated("use setSettings", "1.27.1")
-  case object changeSettings {
-
-    def of(index: String) = IndexSettingsDefinition(index)
-
-  }
-
-  case object setSettings {
-
-    def of(index: String) = IndexSettingsDefinition(index)
-
-  }
-
-  implicit object IndexSettingsDefinitionExecutable
-      extends Executable[IndexSettingsDefinition, IndexSettings] {
-    override def apply(client: AlgoliaClient, settings: IndexSettingsDefinition)(
-        implicit executor: ExecutionContext): Future[IndexSettings] = {
-      client.request[IndexSettings](settings.build())
-    }
-  }
-
-  implicit object IndexChangeSettingsDefinitionExecutable
-      extends Executable[IndexChangeSettingsDefinition, Task] {
-    override def apply(client: AlgoliaClient, settings: IndexChangeSettingsDefinition)(
-        implicit executor: ExecutionContext): Future[Task] = {
-      client.request[Task](settings.build())
-    }
-  }
-
-}

src/main/scala/algolia/definitions/IndexingBatchDefinition.scala

@@ -68,15 +68,3 @@ case class IndexingBatchDefinition(
     )
   }
 }
-
-trait IndexingBatchDsl {
-
-  implicit object IndexingBatchDefinitionExecutable
-      extends Executable[IndexingBatchDefinition, TasksSingleIndex] {
-    override def apply(client: AlgoliaClient, batch: IndexingBatchDefinition)(
-        implicit executor: ExecutionContext): Future[TasksSingleIndex] = {
-      client.request[TasksSingleIndex](batch.build())
-    }
-  }
-
-}

src/main/scala/algolia/definitions/KeyDefinition.scala

@@ -176,43 +176,3 @@ case class ListKeysDefinition(indexName: Option[String] = None,
     )
   }
 }
-
-trait KeyDefinitionDsl {
-
-  implicit val formats: Formats
-
-  implicit object GetApiKeyDefinitionExecutable extends Executable[GetKeyDefinition, ApiKey] {
-    override def apply(client: AlgoliaClient, query: GetKeyDefinition)(
-        implicit executor: ExecutionContext): Future[ApiKey] =
-      client.request[ApiKey](query.build())
-  }
-
-  implicit object AddApiKeyDefinitionExecutable
-      extends Executable[AddKeyDefinition, CreateUpdateKey] {
-    override def apply(client: AlgoliaClient, query: AddKeyDefinition)(
-        implicit executor: ExecutionContext): Future[CreateUpdateKey] =
-      client.request[CreateUpdateKey](query.build())
-  }
-
-  implicit object DeleteApiKeyDefinitionExecutable
-      extends Executable[DeleteKeyDefinition, DeleteKey] {
-    override def apply(client: AlgoliaClient, query: DeleteKeyDefinition)(
-        implicit executor: ExecutionContext): Future[DeleteKey] =
-      client.request[DeleteKey](query.build())
-  }
-
-  implicit object UpdateApiKeyDefinitionExecutable
-      extends Executable[UpdateKeyDefinition, CreateUpdateKey] {
-    override def apply(client: AlgoliaClient, query: UpdateKeyDefinition)(
-        implicit executor: ExecutionContext): Future[CreateUpdateKey] =
-      client.request[CreateUpdateKey](query.build())
-  }
-
-  implicit object GetAllApiKeyDefinitionExecutable
-      extends Executable[ListKeysDefinition, AllKeys] {
-    override def apply(client: AlgoliaClient, query: ListKeysDefinition)(
-        implicit executor: ExecutionContext): Future[AllKeys] =
-      client.request[AllKeys](query.build())
-  }
-
-}

src/main/scala/algolia/definitions/LogsDefinition.scala

@@ -72,18 +72,3 @@ case class LogsDefinition(offset: Option[Int] = None,
     )
   }
 }
-
-trait LogsDsl {
-
-  implicit val formats: Formats
-
-  def logs() = LogsDefinition()
-
-  implicit object LogsDefinitionExecutable extends Executable[LogsDefinition, Logs] {
-    override def apply(client: AlgoliaClient, query: LogsDefinition)(
-        implicit executor: ExecutionContext): Future[Logs] = {
-      client.request[Logs](query.build())
-    }
-  }
-
-}