fix some deprecation warnings

nesteffe · Apr 12, 2012 · 453c434 · 453c434
1 parent 7c7f1cd
commit 453c434
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/github/rnewson/couchdb/lucene/DatabaseIndexer.java b/src/main/java/com/github/rnewson/couchdb/lucene/DatabaseIndexer.java
@@ -285,15 +285,15 @@ public void admin(final HttpServletRequest req,
 
 		if ("_expunge".equals(command)) {
 			logger.info("Expunging deletes from " + state);
-			state.writer.expungeDeletes(false);
+			state.writer.forceMergeDeletes(false);
 						resp.setStatus(202);
 			ServletUtils.sendJsonSuccess(req, resp);
 			return;
 		}
 
 		if ("_optimize".equals(command)) {
 			logger.info("Optimizing " + state);
-			state.writer.optimize(false);
+			state.writer.forceMerge(1, false);
 			resp.setStatus(202);
 			ServletUtils.sendJsonSuccess(req, resp);
 			return;

diff --git a/src/test/java/com/github/rnewson/couchdb/lucene/TikaTest.java b/src/test/java/com/github/rnewson/couchdb/lucene/TikaTest.java
@@ -40,19 +40,19 @@ public void setup() {
     @Test
     public void testPDF() throws IOException {
         parse("paxos-simple.pdf", "application/pdf", "foo");
-        assertThat(doc.getField("foo"), not(nullValue()));
+        assertThat(doc.getFieldable("foo"), not(nullValue()));
     }
 
     @Test
     public void testXML() throws IOException {
         parse("example.xml", "text/xml", "bar");
-        assertThat(doc.getField("bar"), not(nullValue()));
+        assertThat(doc.getFieldable("bar"), not(nullValue()));
     }
 
     @Test
     public void testWord() throws IOException {
         parse("example.doc", "application/msword", "bar");
-        assertThat(doc.getField("bar"), not(nullValue()));
+        assertThat(doc.getFieldable("bar"), not(nullValue()));
         assertThat(doc.get("bar"), containsString("The express mission of the organization"));
     }