From d88b5ed65f46c3f7da8fdd81e3cc8ed4ed755dc2 Mon Sep 17 00:00:00 2001
From: Raymond Bourges <raymond.bourges@univ-rennes1.fr>
Date: Fri, 28 Feb 2014 09:30:03 +0100
Subject: [PATCH] elasticsearch 1.0.1 compatibility

---
 .gitignore                                                  | 6 ++++++
 pom.xml                                                     | 2 +-
 .../java/org/elasticsearch/river/ldap/LdapRiverTest.java    | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..81f3b6f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.idea/
+*.iml
+data/
+rb/
+target/
+*~
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 98ddb62..8ae7555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
 	<properties>
-		<elasticsearch.version>0.90.2</elasticsearch.version>
+		<elasticsearch.version>1.0.1</elasticsearch.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	
diff --git a/src/test/java/org/elasticsearch/river/ldap/LdapRiverTest.java b/src/test/java/org/elasticsearch/river/ldap/LdapRiverTest.java
index 9a9740e..a3f432d 100644
--- a/src/test/java/org/elasticsearch/river/ldap/LdapRiverTest.java
+++ b/src/test/java/org/elasticsearch/river/ldap/LdapRiverTest.java
@@ -114,6 +114,7 @@
         "ref: ldap://localhost:10389/uid=clint,ou=users,ou=system",
         "ref: ldap://foo:10389/uid=clint,ou=users,ou=system",
         "ref: ldap://bar:10389/uid=clint,ou=users,ou=system" })
+
 public class LdapRiverTest extends AbstractLdapTestUnit {
 	
 	Node node = null;
@@ -165,10 +166,10 @@ public void testLdapRiver() throws Exception {
 		
 		// 4 people expected
 		assertEquals(4L, client.prepareCount("ldapserver0").setTypes("person").execute().actionGet().getCount());
-		assertEquals(3L, client.prepareSearch("ldapserver0").setTypes("person").setQuery(QueryBuilders.fieldQuery("groups", "uidObject")).execute().actionGet().getHits().totalHits());
+		assertEquals(3L, client.prepareSearch("ldapserver0").setTypes("person").setQuery(QueryBuilders.matchQuery("groups", "uidObject")).execute().actionGet().getHits().totalHits());
 				
 		// But Clint is definitley unique
-		assertEquals(1L, client.prepareSearch("ldapserver0").setTypes("person").setQuery(QueryBuilders.fieldQuery("name", "clint")).execute().actionGet().getHits().totalHits());
+		assertEquals(1L, client.prepareSearch("ldapserver0").setTypes("person").setQuery(QueryBuilders.matchQuery("name", "clint")).execute().actionGet().getHits().totalHits());
 
 		assertEquals(1L, client.prepareSearch("ldapserver0").setTypes("person").setQuery(QueryBuilders.queryString("woo")).execute().actionGet().getHits().totalHits());
 		assertEquals(2, client.prepareMultiGet().add("ldapserver0", "person", "christopher").add("ldapserver0", "person", "john").execute().actionGet().getResponses().length);