Author: bvahdat
Date: Thu Mar 15 13:24:22 2012
New Revision: 1300971
URL: http://svn.apache.org/viewvc?rev=1300971&view=rev
Log:
CAMEL-5078: Fixed the Apache Lucene deprecated API usage after upgrade to the
version 3.5.0.
Modified:
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
Modified:
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java?rev=1300971&r1=1300970&r2=1300971&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
(original)
+++
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
Thu Mar 15 13:24:22 2012
@@ -35,7 +35,7 @@ public class LuceneConfiguration {
private File indexDirectory;
private Analyzer analyzer;
private int maxHits;
- private Version luceneVersion = Version.LUCENE_30;
+ private Version luceneVersion = Version.LUCENE_35;
public LuceneConfiguration() {
}
Modified:
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java?rev=1300971&r1=1300970&r2=1300971&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
(original)
+++
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
Thu Mar 15 13:24:22 2012
@@ -27,7 +27,10 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.NIOFSDirectory;
+import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,16 +143,18 @@ public class LuceneIndexer {
}
private void openIndexWriter() throws IOException {
+ IndexWriterConfig indexWriterConfig;
if (!indexCreated) {
- indexWriter = new IndexWriter(niofsDirectory, getAnalyzer(), true,
IndexWriter.MaxFieldLength.UNLIMITED);
+ indexWriterConfig = new IndexWriterConfig(Version.LUCENE_35,
getAnalyzer()).setOpenMode(OpenMode.CREATE);
+ indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
indexCreated = true;
return;
}
- indexWriter = new IndexWriter(niofsDirectory, getAnalyzer(), false,
IndexWriter.MaxFieldLength.UNLIMITED);
+ indexWriterConfig = new IndexWriterConfig(Version.LUCENE_35,
getAnalyzer()).setOpenMode(OpenMode.APPEND);
+ indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
}
private void closeIndexWriter() throws IOException {
- indexWriter.optimize();
indexWriter.commit();
indexWriter.close();
}
Modified:
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java?rev=1300971&r1=1300970&r2=1300971&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
(original)
+++
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
Thu Mar 15 13:24:22 2012
@@ -23,6 +23,7 @@ import org.apache.camel.processor.lucene
import org.apache.camel.processor.lucene.support.Hits;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
@@ -42,9 +43,9 @@ public class LuceneSearcher {
public void open(File indexDirectory, Analyzer analyzer) throws
IOException {
if (indexDirectory != null) {
- indexSearcher = new IndexSearcher(new
NIOFSDirectory(indexDirectory), true);
+ indexSearcher = new IndexSearcher(IndexReader.open(new
NIOFSDirectory(indexDirectory), true));
} else {
- indexSearcher = new IndexSearcher(new NIOFSDirectory(new
File("./indexDirectory")), true);
+ indexSearcher = new IndexSearcher(IndexReader.open(new
NIOFSDirectory(new File("./indexDirectory")), true));
}
this.analyzer = analyzer;
}
@@ -54,7 +55,7 @@ public class LuceneSearcher {
}
public Hits search(String searchPhrase, int maxNumberOfHits) throws
Exception {
- return search(searchPhrase, maxNumberOfHits, Version.LUCENE_30);
+ return search(searchPhrase, maxNumberOfHits, Version.LUCENE_35);
}
public Hits search(String searchPhrase, int maxNumberOfHits, Version
luenceVersion) throws Exception {
Modified:
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java?rev=1300971&r1=1300970&r2=1300971&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
(original)
+++
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
Thu Mar 15 13:24:22 2012
@@ -53,11 +53,11 @@ public class LuceneIndexAndQueryProducer
JndiRegistry registry = new JndiRegistry(createJndiContext());
registry.bind("std", new File("target/stdindexDir"));
registry.bind("load_dir", new File("src/test/resources/sources"));
- registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_30));
+ registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_35));
registry.bind("simple", new File("target/simpleindexDir"));
- registry.bind("simpleAnalyzer", new SimpleAnalyzer());
+ registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_35));
registry.bind("whitespace", new File("target/whitespaceindexDir"));
- registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer());
+ registry.bind("whitespaceAnalyzer", new
WhitespaceAnalyzer(Version.LUCENE_35));
return registry;
}
Modified:
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java?rev=1300971&r1=1300970&r2=1300971&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
(original)
+++
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
Thu Mar 15 13:24:22 2012
@@ -53,7 +53,7 @@ public class LuceneQueryProcessorTest ex
@Test
public void testPhraseSearcher() throws Exception {
- final StandardAnalyzer analyzer = new
StandardAnalyzer(Version.LUCENE_30);
+ final StandardAnalyzer analyzer = new
StandardAnalyzer(Version.LUCENE_35);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
@@ -97,7 +97,7 @@ public class LuceneQueryProcessorTest ex
@Test
public void testWildcardSearcher() throws Exception {
- final SimpleAnalyzer analyzer = new SimpleAnalyzer();
+ final SimpleAnalyzer analyzer = new SimpleAnalyzer(Version.LUCENE_35);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
