percolate API changed, deprecated gateway snapshot api

bsadeh · Apr 11, 2014 · 18f12df · 18f12df
1 parent 5a67772
commit 18f12df
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/main/scala/scalastic/elasticsearch/IndexCrud.scala b/src/main/scala/scalastic/elasticsearch/IndexCrud.scala
@@ -501,6 +501,7 @@ trait Close {
   }
 }
 
+@deprecated(message="use the new snapshot/restore API instead", since="1.1.0")
 trait GatewaySnapshot {
   self: Indexer =>
   def gatewaySnapshot(indices: String*) = gatewaySnapshot_send(indices.toArray: _*).actionGet

diff --git a/src/main/scala/scalastic/elasticsearch/Indexing.scala b/src/main/scala/scalastic/elasticsearch/Indexing.scala
@@ -66,7 +66,7 @@ trait Index {
     timestamp: Option[String] = None,
     ttl: Option[Long] = None,
     version: Option[Long] = None,
-    versionType: Option[VersionType] = None) = index_prepare(index, `type`, id, source, parent, consistencyLevel, contentType, create, listenerThreaded, operationThreaded, opType, percolate, refresh, replicationType, routing, timeout, timestamp, ttl, version, versionType).execute
+    versionType: Option[VersionType] = None) = index_prepare(index, `type`, id, source, parent, consistencyLevel, contentType, create, listenerThreaded, operationThreaded, opType, refresh, replicationType, routing, timeout, timestamp, ttl, version, versionType).execute
 
   def index_prepare(
     index: String,
@@ -80,7 +80,6 @@ trait Index {
     listenerThreaded: Option[Boolean] = None,
     operationThreaded: Option[Boolean] = None,
     opType: Option[IndexRequest.OpType] = None,
-    percolate: Option[String] = None,
     refresh: Option[Boolean] = None,
     replicationType: Option[ReplicationType] = None,
     routing: Option[String] = None,
@@ -99,7 +98,6 @@ trait Index {
     listenerThreaded foreach { request.setListenerThreaded(_) }
     operationThreaded foreach { request.setOperationThreaded(_) }
     opType foreach { request.setOpType(_) }
-    percolate foreach { request.setPercolate(_) }
     refresh foreach { request.setRefresh(_) }
     replicationType foreach { request.setReplicationType(_) }
     routing foreach { request.setRouting(_) }
@@ -335,7 +333,6 @@ trait Update {
       request.setScriptParams(scriptParams)
       scriptLanguage foreach { request.setScriptLang(_) }
     }
-    percolate foreach { request.setPercolate(_) }
     replicationType foreach { request.setReplicationType(_) }
     consistencyLevel foreach { request.setConsistencyLevel(_) }
     request

diff --git a/src/main/scala/scalastic/elasticsearch/Searching.scala b/src/main/scala/scalastic/elasticsearch/Searching.scala
@@ -393,33 +393,36 @@ trait Percolate {
     index: String,
     `type`: String,
     listenerThreaded: Option[Boolean] = None,
-    operationThreaded: Option[Boolean] = None,
-    preferLocal: Option[Boolean] = None,
+    operationThreaded: Option[String] = None,
+    preferLocal: Option[String] = None,
     source: Option[String] = None) = percolate_send(index, `type`, listenerThreaded, operationThreaded, preferLocal, source).actionGet
 
   def percolate_send(
     index: String,
     `type`: String,
     listenerThreaded: Option[Boolean] = None,
-    operationThreaded: Option[Boolean] = None,
-    preferLocal: Option[Boolean] = None,
+    operationThreaded: Option[String] = None,
+    preferLocal: Option[String] = None,
     source: Option[String] = None) = percolate_prepare(index, `type`, listenerThreaded, operationThreaded, preferLocal, source).execute
 
   def percolate_prepare(
     index: String,
     `type`: String,
     listenerThreaded: Option[Boolean] = None,
-    operationThreaded: Option[Boolean] = None,
-    preferLocal: Option[Boolean] = None,
+    operationThreaded: Option[String] = None,
+    preferLocal: Option[String] = None,
     source: Option[String] = None) = {
       /* method body */
     val request = client.preparePercolate
     request.setIndices(index)
     request.setDocumentType(`type`)
-    
+
     listenerThreaded foreach { request.setListenerThreaded(_) }
     operationThreaded foreach { request.setOperationThreading(_) }
-    preferLocal foreach { request.setPreferLocal(_) }
+
+    // local, primary, or custom value (changed from setPreferLocal in 1.0+)
+    preferLocal foreach { request.setPreference(_) }
+
     source foreach { request.setSource(_) }
     request
   }
@@ -434,23 +437,23 @@ trait ValidateQuery {
     query: QueryBuilder = matchAllQuery,
     explain: Option[Boolean] = None,
     listenerThreaded: Option[Boolean] = None,
-    operationThreading: Option[BroadcastOperationThreading] = None) = validateQuery_send(indices, types, query, explain, listenerThreaded, operationThreading).actionGet
+    operationThreading: Option[String] = None) = validateQuery_send(indices, types, query, explain, listenerThreaded, operationThreading).actionGet
 
   def validateQuery_send(
     indices: Iterable[String] = Nil,
     types: Iterable[String] = Nil,
     query: QueryBuilder = matchAllQuery,
     explain: Option[Boolean] = None,
     listenerThreaded: Option[Boolean] = None,
-    operationThreading: Option[BroadcastOperationThreading] = None) = validateQuery_prepare(indices, types, query, explain, listenerThreaded, operationThreading).execute
+    operationThreading: Option[String] = None) = validateQuery_prepare(indices, types, query, explain, listenerThreaded, operationThreading).execute
 
   def validateQuery_prepare(
     indices: Iterable[String] = Nil,
     types: Iterable[String] = Nil,
     query: QueryBuilder = matchAllQuery,
     explain: Option[Boolean] = None,
     listenerThreaded: Option[Boolean] = None,
-    operationThreading: Option[BroadcastOperationThreading] = None) = {
+    operationThreading: Option[String] = None) = {
       /* method body */
     val request = client.admin.indices.prepareValidateQuery(indices.toArray: _*)
     request.setTypes(types.toArray: _*)

diff --git a/src/test/scala/org/elasticsearch/test/integration/cluster/NoMasterNodeTests.scala b/src/test/scala/org/elasticsearch/test/integration/cluster/NoMasterNodeTests.scala
@@ -48,7 +48,9 @@ class NoMasterNodeTests extends MultiNodesBasedTests {
       case e: ClusterBlockException => e.status() should equal (RestStatus.SERVICE_UNAVAILABLE)
     }
     try {
-      node.client().preparePercolate(indexName, "type1").setSource("""{}""").execute.actionGet
+      node.client().preparePercolate()
+        .setIndices(indexName).setDocumentType("type1")
+      	.setSource("""{}""").execute.actionGet
       fail()
     } catch {
       case e: ClusterBlockException => e.status() should equal (RestStatus.SERVICE_UNAVAILABLE)