This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch import-nouveau-reorg-wip in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b885db643f7bc61f1b7ce9b29a77be6653d4d1d1 Author: Robert Newson <[email protected]> AuthorDate: Sat Dec 17 21:16:42 2022 +0000 create shaded versions of lucene --- java/nouveau/lucene-4.6.1/pom.xml | 101 +++++++++++++++++++ java/nouveau/lucene-9/pom.xml | 108 +++++++++++++++++++++ java/nouveau/pom.xml | 2 + java/nouveau/server/pom.xml | 91 ++--------------- .../couchdb/nouveau/api/DocumentUpdateRequest.java | 2 +- .../org/apache/couchdb/nouveau/api/SearchHit.java | 4 +- .../apache/couchdb/nouveau/api/SearchRequest.java | 4 +- .../apache/couchdb/nouveau/api/SearchResults.java | 2 +- .../couchdb/nouveau/core/AnalyzerFactory.java | 80 +++++++-------- .../couchdb/nouveau/core/DocumentFactory.java | 16 +-- .../apache/couchdb/nouveau/core/IndexManager.java | 20 ++-- .../couchdb/nouveau/core/NouveauQueryParser.java | 68 ++++++------- .../nouveau/core/NumericRangeQueryProcessor.java | 16 +-- .../nouveau/core/ParallelSearcherFactory.java | 6 +- .../apache/couchdb/nouveau/core/QueryParser.java | 2 +- .../nouveau/core/ser/BytesRefDeserializer.java | 2 +- .../nouveau/core/ser/BytesRefSerializer.java | 2 +- .../nouveau/core/ser/DoubleRangeDeserializer.java | 2 +- .../nouveau/core/ser/DoubleRangeSerializer.java | 2 +- .../nouveau/core/ser/FieldDocDeserializer.java | 4 +- .../nouveau/core/ser/FieldDocSerializer.java | 4 +- .../core/ser/IndexableFieldDeserializer.java | 40 ++++---- .../nouveau/core/ser/IndexableFieldSerializer.java | 8 +- .../couchdb/nouveau/core/ser/LuceneModule.java | 8 +- .../couchdb/nouveau/core/ser/SupportedType.java | 36 +++---- .../nouveau/core/ser/TotalHitsDeserializer.java | 4 +- .../nouveau/health/IndexManagerHealthCheck.java | 4 +- .../couchdb/nouveau/resources/AnalyzeResource.java | 6 +- .../couchdb/nouveau/resources/IndexResource.java | 8 +- .../couchdb/nouveau/resources/SearchResource.java | 44 ++++----- .../apache/couchdb/nouveau/IntegrationTest.java | 16 +-- .../nouveau/api/DocumentUpdateRequestTest.java | 10 +- .../couchdb/nouveau/api/SearchRequestTest.java | 2 +- .../couchdb/nouveau/core/AnalyzerFactoryTest.java | 78 +++++++-------- .../couchdb/nouveau/core/ser/LuceneModuleTest.java | 14 +-- 35 files changed, 478 insertions(+), 338 deletions(-) diff --git a/java/nouveau/lucene-4.6.1/pom.xml b/java/nouveau/lucene-4.6.1/pom.xml new file mode 100644 index 000000000..d982309bd --- /dev/null +++ b/java/nouveau/lucene-4.6.1/pom.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.couchdb.nouveau</groupId> + <artifactId>lucene-4.6.1</artifactId> + <version>1.0-SNAPSHOT</version> + <name>${project.artifactId}</name> + + <parent> + <groupId>org.apache.couchdb.nouveau</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <properties> + <lucene.version>4.6.1</lucene.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-grouping</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queryparser</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-common</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-stempel</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-smartcn</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-kuromoji</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-facet</artifactId> + <version>${lucene.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.4.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <relocations> + <relocation> + <pattern>org.</pattern> + <shadedPattern>v461.org.</shadedPattern> + </relocation> + <relocation> + <pattern>com.</pattern> + <shadedPattern>v461.com.</shadedPattern> + </relocation> + </relocations> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/java/nouveau/lucene-9/pom.xml b/java/nouveau/lucene-9/pom.xml new file mode 100644 index 000000000..85b85de73 --- /dev/null +++ b/java/nouveau/lucene-9/pom.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.couchdb.nouveau</groupId> + <artifactId>lucene-9</artifactId> + <version>1.0-SNAPSHOT</version> + <name>${project.artifactId}</name> + + <parent> + <groupId>org.apache.couchdb.nouveau</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <properties> + <lucene.version>9.4.2</lucene.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-grouping</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queryparser</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analysis-common</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analysis-stempel</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analysis-smartcn</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analysis-kuromoji</artifactId> + <version>${lucene.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-facet</artifactId> + <version>${lucene.version}</version> + </dependency> + + <!-- For DirectIODirectory --> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-misc</artifactId> + <version>${lucene.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.4.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <relocations> + <relocation> + <pattern>org.</pattern> + <shadedPattern>v9.org.</shadedPattern> + </relocation> + <relocation> + <pattern>com.</pattern> + <shadedPattern>v9.com.</shadedPattern> + </relocation> + </relocations> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/java/nouveau/pom.xml b/java/nouveau/pom.xml index 72b3dfbab..4004a659e 100644 --- a/java/nouveau/pom.xml +++ b/java/nouveau/pom.xml @@ -30,6 +30,8 @@ </properties> <modules> + <module>lucene-9</module> + <module>lucene-4.6.1</module> <module>server</module> </modules> diff --git a/java/nouveau/server/pom.xml b/java/nouveau/server/pom.xml index c258e3254..5fb859c53 100644 --- a/java/nouveau/server/pom.xml +++ b/java/nouveau/server/pom.xml @@ -31,7 +31,6 @@ <maven.compiler.target>11</maven.compiler.target> <argLine>-Duser.language=en -Duser.region=US -Duser.timezone=UTC</argLine> <dropwizard.version>2.1.4</dropwizard.version> - <lucene.version>9.4.2</lucene.version> <slf4j.version>1.7.32</slf4j.version> <junit5.version>5.8.2</junit5.version> </properties> @@ -56,56 +55,18 @@ </dependencyManagement> <dependencies> - <!-- Lucene --> + <!-- Lucene 4.6.1 --> <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-grouping</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queryparser</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-common</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-stempel</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-smartcn</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-kuromoji</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-facet</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-spatial-extras</artifactId> - <version>${lucene.version}</version> + <groupId>${project.groupId}</groupId> + <artifactId>lucene-4.6.1</artifactId> + <version>${project.version}</version> </dependency> + + <!-- Lucene 9 --> <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-misc</artifactId> - <version>${lucene.version}</version> + <groupId>${project.groupId}</groupId> + <artifactId>lucene-9</artifactId> + <version>${project.version}</version> </dependency> <!-- Dropwizard --> @@ -167,40 +128,6 @@ <artifactId>maven-release-plugin</artifactId> <version>3.0.0-M5</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <configuration> - <createDependencyReducedPom>true</createDependencyReducedPom> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.apache.couchdb.nouveau.NouveauApplication</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java index d312b9d7f..8267dcb6a 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java @@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.index.IndexableField; import io.dropwizard.jackson.JsonSnakeCase; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java index aa8b064bb..6311bbb87 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java @@ -18,8 +18,8 @@ import java.util.Collection; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.search.FieldDoc; import io.dropwizard.jackson.JsonSnakeCase; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java index 2de199ce2..49e955037 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java @@ -23,8 +23,8 @@ import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.lucene.facet.range.DoubleRange; -import org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.search.FieldDoc; import io.dropwizard.jackson.JsonSnakeCase; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java index 931adac81..e7e25d7bf 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.jackson.JsonSnakeCase; -import org.apache.lucene.search.TotalHits; +import v9.org.apache.lucene.search.TotalHits; @JsonSnakeCase public class SearchResults { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java index 0ad6c0311..9892a1698 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java @@ -21,46 +21,46 @@ import javax.ws.rs.core.Response.Status; import org.apache.couchdb.nouveau.api.IndexDefinition; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.ar.ArabicAnalyzer; -import org.apache.lucene.analysis.bg.BulgarianAnalyzer; -import org.apache.lucene.analysis.ca.CatalanAnalyzer; -import org.apache.lucene.analysis.cjk.CJKAnalyzer; -import org.apache.lucene.analysis.classic.ClassicAnalyzer; -import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer; -import org.apache.lucene.analysis.core.KeywordAnalyzer; -import org.apache.lucene.analysis.core.SimpleAnalyzer; -import org.apache.lucene.analysis.core.WhitespaceAnalyzer; -import org.apache.lucene.analysis.cz.CzechAnalyzer; -import org.apache.lucene.analysis.da.DanishAnalyzer; -import org.apache.lucene.analysis.de.GermanAnalyzer; -import org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer; -import org.apache.lucene.analysis.en.EnglishAnalyzer; -import org.apache.lucene.analysis.es.SpanishAnalyzer; -import org.apache.lucene.analysis.eu.BasqueAnalyzer; -import org.apache.lucene.analysis.fa.PersianAnalyzer; -import org.apache.lucene.analysis.fi.FinnishAnalyzer; -import org.apache.lucene.analysis.fr.FrenchAnalyzer; -import org.apache.lucene.analysis.ga.IrishAnalyzer; -import org.apache.lucene.analysis.gl.GalicianAnalyzer; -import org.apache.lucene.analysis.hi.HindiAnalyzer; -import org.apache.lucene.analysis.hu.HungarianAnalyzer; -import org.apache.lucene.analysis.hy.ArmenianAnalyzer; -import org.apache.lucene.analysis.id.IndonesianAnalyzer; -import org.apache.lucene.analysis.it.ItalianAnalyzer; -import org.apache.lucene.analysis.ja.JapaneseAnalyzer; -import org.apache.lucene.analysis.lv.LatvianAnalyzer; -import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper; -import org.apache.lucene.analysis.nl.DutchAnalyzer; -import org.apache.lucene.analysis.no.NorwegianAnalyzer; -import org.apache.lucene.analysis.pl.PolishAnalyzer; -import org.apache.lucene.analysis.pt.PortugueseAnalyzer; -import org.apache.lucene.analysis.ro.RomanianAnalyzer; -import org.apache.lucene.analysis.ru.RussianAnalyzer; -import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.analysis.sv.SwedishAnalyzer; -import org.apache.lucene.analysis.th.ThaiAnalyzer; -import org.apache.lucene.analysis.tr.TurkishAnalyzer; +import v9.org.apache.lucene.analysis.Analyzer; +import v9.org.apache.lucene.analysis.ar.ArabicAnalyzer; +import v9.org.apache.lucene.analysis.bg.BulgarianAnalyzer; +import v9.org.apache.lucene.analysis.ca.CatalanAnalyzer; +import v9.org.apache.lucene.analysis.cjk.CJKAnalyzer; +import v9.org.apache.lucene.analysis.classic.ClassicAnalyzer; +import v9.org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer; +import v9.org.apache.lucene.analysis.core.KeywordAnalyzer; +import v9.org.apache.lucene.analysis.core.SimpleAnalyzer; +import v9.org.apache.lucene.analysis.core.WhitespaceAnalyzer; +import v9.org.apache.lucene.analysis.cz.CzechAnalyzer; +import v9.org.apache.lucene.analysis.da.DanishAnalyzer; +import v9.org.apache.lucene.analysis.de.GermanAnalyzer; +import v9.org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer; +import v9.org.apache.lucene.analysis.en.EnglishAnalyzer; +import v9.org.apache.lucene.analysis.es.SpanishAnalyzer; +import v9.org.apache.lucene.analysis.eu.BasqueAnalyzer; +import v9.org.apache.lucene.analysis.fa.PersianAnalyzer; +import v9.org.apache.lucene.analysis.fi.FinnishAnalyzer; +import v9.org.apache.lucene.analysis.fr.FrenchAnalyzer; +import v9.org.apache.lucene.analysis.ga.IrishAnalyzer; +import v9.org.apache.lucene.analysis.gl.GalicianAnalyzer; +import v9.org.apache.lucene.analysis.hi.HindiAnalyzer; +import v9.org.apache.lucene.analysis.hu.HungarianAnalyzer; +import v9.org.apache.lucene.analysis.hy.ArmenianAnalyzer; +import v9.org.apache.lucene.analysis.id.IndonesianAnalyzer; +import v9.org.apache.lucene.analysis.it.ItalianAnalyzer; +import v9.org.apache.lucene.analysis.ja.JapaneseAnalyzer; +import v9.org.apache.lucene.analysis.lv.LatvianAnalyzer; +import v9.org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper; +import v9.org.apache.lucene.analysis.nl.DutchAnalyzer; +import v9.org.apache.lucene.analysis.no.NorwegianAnalyzer; +import v9.org.apache.lucene.analysis.pl.PolishAnalyzer; +import v9.org.apache.lucene.analysis.pt.PortugueseAnalyzer; +import v9.org.apache.lucene.analysis.ro.RomanianAnalyzer; +import v9.org.apache.lucene.analysis.ru.RussianAnalyzer; +import v9.org.apache.lucene.analysis.standard.StandardAnalyzer; +import v9.org.apache.lucene.analysis.sv.SwedishAnalyzer; +import v9.org.apache.lucene.analysis.th.ThaiAnalyzer; +import v9.org.apache.lucene.analysis.tr.TurkishAnalyzer; public class AnalyzerFactory { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java index 904a215c0..69ba0b657 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java @@ -17,10 +17,12 @@ import java.io.IOException; import org.apache.couchdb.nouveau.api.DocumentUpdateRequest; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field.Store; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.document.Document; +import v9.org.apache.lucene.document.Field.Store; +import v9.org.apache.lucene.document.StringField; +import v9.org.apache.lucene.document.SortedDocValuesField; +import v9.org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.util.BytesRef; public class DocumentFactory { @@ -28,12 +30,12 @@ public class DocumentFactory { final Document result = new Document(); // id - result.add(new org.apache.lucene.document.StringField("_id", docId, Store.YES)); - result.add(new org.apache.lucene.document.SortedDocValuesField("_id", new BytesRef(docId))); + result.add(new StringField("_id", docId, Store.YES)); + result.add(new SortedDocValuesField("_id", new BytesRef(docId))); // partition (optional) if (request.hasPartition()) { - result.add(new org.apache.lucene.document.StringField("_partition", request.getPartition(), Store.NO)); + result.add(new StringField("_partition", request.getPartition(), Store.NO)); } for (IndexableField field : request.getFields()) { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java index 5ab636f63..109ac2e05 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java @@ -34,16 +34,16 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response.Status; import org.apache.couchdb.nouveau.api.IndexDefinition; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.misc.store.DirectIODirectory; -import org.apache.lucene.search.SearcherFactory; -import org.apache.lucene.search.SearcherManager; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.util.IOUtils; +import v9.org.apache.lucene.analysis.Analyzer; +import v9.org.apache.lucene.index.IndexWriter; +import v9.org.apache.lucene.index.IndexWriterConfig; +import v9.org.apache.lucene.misc.store.DirectIODirectory; +import v9.org.apache.lucene.search.SearcherFactory; +import v9.org.apache.lucene.search.SearcherManager; +import v9.org.apache.lucene.store.Directory; +import v9.org.apache.lucene.store.FSDirectory; +import v9.org.apache.lucene.store.LockObtainFailedException; +import v9.org.apache.lucene.util.IOUtils; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java index e5fa80718..44cd07c5e 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java @@ -14,40 +14,40 @@ package org.apache.couchdb.nouveau.core; import org.apache.couchdb.nouveau.api.SearchRequest; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryparser.flexible.core.QueryNodeException; -import org.apache.lucene.queryparser.flexible.core.QueryParserHelper; -import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; -import org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; -import org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor; -import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder; -import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; -import org.apache.lucene.queryparser.flexible.standard.processors.AllowLeadingWildcardProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.AnalyzerQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.BooleanQuery2ModifierNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.BooleanSingleChildOptimizationQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.BoostQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.DefaultPhraseSlopQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.FuzzyQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.IntervalQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.MatchAllDocsQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.MultiFieldQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.OpenRangeQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.PhraseSlopQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.PointQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.RegexpQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.RemoveEmptyNonLeafQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.TermRangeQueryNodeProcessor; -import org.apache.lucene.queryparser.flexible.standard.processors.WildcardQueryNodeProcessor; -import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; +import v9.org.apache.lucene.analysis.Analyzer; +import v9.org.apache.lucene.index.Term; +import v9.org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import v9.org.apache.lucene.queryparser.flexible.core.QueryParserHelper; +import v9.org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import v9.org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; +import v9.org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder; +import v9.org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import v9.org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import v9.org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.AllowLeadingWildcardProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.AnalyzerQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.BooleanQuery2ModifierNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.BooleanSingleChildOptimizationQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.BoostQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.DefaultPhraseSlopQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.FuzzyQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.IntervalQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.MatchAllDocsQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.MultiFieldQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.OpenRangeQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.PhraseSlopQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.PointQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.RegexpQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.RemoveEmptyNonLeafQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.TermRangeQueryNodeProcessor; +import v9.org.apache.lucene.queryparser.flexible.standard.processors.WildcardQueryNodeProcessor; +import v9.org.apache.lucene.search.BooleanClause.Occur; +import v9.org.apache.lucene.search.BooleanQuery; +import v9.org.apache.lucene.search.Query; +import v9.org.apache.lucene.search.TermQuery; public class NouveauQueryParser extends QueryParserHelper implements QueryParser { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java index 8618e1721..6dc01dc3d 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java @@ -17,14 +17,14 @@ import java.text.NumberFormat; import java.text.ParsePosition; import java.util.List; -import org.apache.lucene.queryparser.flexible.core.QueryNodeException; -import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; -import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; -import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryparser.flexible.standard.config.PointsConfig; -import org.apache.lucene.queryparser.flexible.standard.nodes.PointQueryNode; -import org.apache.lucene.queryparser.flexible.standard.nodes.PointRangeQueryNode; -import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode; +import v9.org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import v9.org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import v9.org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import v9.org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import v9.org.apache.lucene.queryparser.flexible.standard.config.PointsConfig; +import v9.org.apache.lucene.queryparser.flexible.standard.nodes.PointQueryNode; +import v9.org.apache.lucene.queryparser.flexible.standard.nodes.PointRangeQueryNode; +import v9.org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode; public class NumericRangeQueryProcessor extends QueryNodeProcessorImpl { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java index bd31801fd..f4d93e86a 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java @@ -16,9 +16,9 @@ package org.apache.couchdb.nouveau.core; import java.io.IOException; import java.util.concurrent.Executor; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.SearcherFactory; +import v9.org.apache.lucene.index.IndexReader; +import v9.org.apache.lucene.search.IndexSearcher; +import v9.org.apache.lucene.search.SearcherFactory; public class ParallelSearcherFactory extends SearcherFactory { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java index d13d1acd5..6923a6d04 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java @@ -13,7 +13,7 @@ package org.apache.couchdb.nouveau.core; -import org.apache.lucene.search.Query; +import v9.org.apache.lucene.search.Query; import org.apache.couchdb.nouveau.api.SearchRequest; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java index 2c56c31f2..efde6d165 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java @@ -15,7 +15,7 @@ package org.apache.couchdb.nouveau.core.ser; import java.io.IOException; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.util.BytesRef; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java index 84850614b..d9ce4607e 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.util.BytesRef; public class BytesRefSerializer extends StdSerializer<BytesRef> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java index 264002b33..886606d58 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.facet.range.DoubleRange; class DoubleRangeDeserializer extends StdDeserializer<DoubleRange> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java index f7aeee263..d1f680a0b 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.facet.range.DoubleRange; class DoubleRangeSerializer extends StdSerializer<DoubleRange> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java index 51fb8699f..68832fb2d 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.ArrayNode; -import org.apache.lucene.search.FieldDoc; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.util.BytesRef; public class FieldDocDeserializer extends StdDeserializer<FieldDoc> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java index 29f86ee11..1d01be3bf 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.apache.lucene.search.FieldDoc; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.util.BytesRef; public class FieldDocSerializer extends StdSerializer<FieldDoc> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java index d2b066331..9b4b9b2c8 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java @@ -21,26 +21,26 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import org.apache.lucene.document.BinaryDocValuesField; -import org.apache.lucene.document.DoubleDocValuesField; -import org.apache.lucene.document.DoublePoint; -import org.apache.lucene.document.FloatDocValuesField; -import org.apache.lucene.document.Field.Store; -import org.apache.lucene.document.FloatPoint; -import org.apache.lucene.document.IntPoint; -import org.apache.lucene.document.LatLonDocValuesField; -import org.apache.lucene.document.LatLonPoint; -import org.apache.lucene.document.LongPoint; -import org.apache.lucene.document.SortedDocValuesField; -import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.document.SortedSetDocValuesField; -import org.apache.lucene.document.StoredField; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; -import org.apache.lucene.document.XYDocValuesField; -import org.apache.lucene.document.XYPointField; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.document.BinaryDocValuesField; +import v9.org.apache.lucene.document.DoubleDocValuesField; +import v9.org.apache.lucene.document.DoublePoint; +import v9.org.apache.lucene.document.FloatDocValuesField; +import v9.org.apache.lucene.document.Field.Store; +import v9.org.apache.lucene.document.FloatPoint; +import v9.org.apache.lucene.document.IntPoint; +import v9.org.apache.lucene.document.LatLonDocValuesField; +import v9.org.apache.lucene.document.LatLonPoint; +import v9.org.apache.lucene.document.LongPoint; +import v9.org.apache.lucene.document.SortedDocValuesField; +import v9.org.apache.lucene.document.SortedNumericDocValuesField; +import v9.org.apache.lucene.document.SortedSetDocValuesField; +import v9.org.apache.lucene.document.StoredField; +import v9.org.apache.lucene.document.StringField; +import v9.org.apache.lucene.document.TextField; +import v9.org.apache.lucene.document.XYDocValuesField; +import v9.org.apache.lucene.document.XYPointField; +import v9.org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.util.BytesRef; class IndexableFieldDeserializer extends StdDeserializer<IndexableField> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java index 477513b38..53ed30ff9 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java @@ -6,10 +6,10 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.apache.lucene.geo.GeoEncodingUtils; -import org.apache.lucene.geo.XYEncodingUtils; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.geo.GeoEncodingUtils; +import v9.org.apache.lucene.geo.XYEncodingUtils; +import v9.org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.util.BytesRef; class IndexableFieldSerializer extends StdSerializer<IndexableField> { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java index f78cfb02e..f7400f840 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java @@ -16,10 +16,10 @@ package org.apache.couchdb.nouveau.core.ser; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.module.SimpleModule; -import org.apache.lucene.facet.range.DoubleRange; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.search.FieldDoc; -import org.apache.lucene.search.TotalHits; +import v9.org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.search.TotalHits; public class LuceneModule extends SimpleModule { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java index 9f652df26..c6aaca16f 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java @@ -13,24 +13,24 @@ package org.apache.couchdb.nouveau.core.ser; -import org.apache.lucene.document.BinaryDocValuesField; -import org.apache.lucene.document.DoubleDocValuesField; -import org.apache.lucene.document.DoublePoint; -import org.apache.lucene.document.FloatDocValuesField; -import org.apache.lucene.document.FloatPoint; -import org.apache.lucene.document.IntPoint; -import org.apache.lucene.document.LatLonDocValuesField; -import org.apache.lucene.document.LatLonPoint; -import org.apache.lucene.document.LongPoint; -import org.apache.lucene.document.SortedDocValuesField; -import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.document.SortedSetDocValuesField; -import org.apache.lucene.document.StoredField; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; -import org.apache.lucene.document.XYDocValuesField; -import org.apache.lucene.document.XYPointField; -import org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.document.BinaryDocValuesField; +import v9.org.apache.lucene.document.DoubleDocValuesField; +import v9.org.apache.lucene.document.DoublePoint; +import v9.org.apache.lucene.document.FloatDocValuesField; +import v9.org.apache.lucene.document.FloatPoint; +import v9.org.apache.lucene.document.IntPoint; +import v9.org.apache.lucene.document.LatLonDocValuesField; +import v9.org.apache.lucene.document.LatLonPoint; +import v9.org.apache.lucene.document.LongPoint; +import v9.org.apache.lucene.document.SortedDocValuesField; +import v9.org.apache.lucene.document.SortedNumericDocValuesField; +import v9.org.apache.lucene.document.SortedSetDocValuesField; +import v9.org.apache.lucene.document.StoredField; +import v9.org.apache.lucene.document.StringField; +import v9.org.apache.lucene.document.TextField; +import v9.org.apache.lucene.document.XYDocValuesField; +import v9.org.apache.lucene.document.XYPointField; +import v9.org.apache.lucene.index.IndexableField; enum SupportedType { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java index eb4976018..6296fe90d 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java @@ -14,8 +14,8 @@ package org.apache.couchdb.nouveau.core.ser; import java.io.IOException; -import org.apache.lucene.search.TotalHits; -import org.apache.lucene.search.TotalHits.Relation; +import v9.org.apache.lucene.search.TotalHits; +import v9.org.apache.lucene.search.TotalHits.Relation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java index 98ac5988e..0cdb11b67 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java @@ -20,8 +20,8 @@ import org.apache.couchdb.nouveau.core.IndexManager; import org.apache.couchdb.nouveau.core.IndexManager.Index; import com.codahale.metrics.health.HealthCheck; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.IndexWriter; +import v9.org.apache.lucene.document.Document; +import v9.org.apache.lucene.index.IndexWriter; public class IndexManagerHealthCheck extends HealthCheck { diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java index 60e8c8ca3..9ff8f6c9c 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java @@ -32,9 +32,9 @@ import org.apache.couchdb.nouveau.api.AnalyzeResponse; import org.apache.couchdb.nouveau.core.AnalyzerFactory; import com.codahale.metrics.annotation.Timed; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import v9.org.apache.lucene.analysis.Analyzer; +import v9.org.apache.lucene.analysis.TokenStream; +import v9.org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @Path("/analyze") @Consumes(MediaType.APPLICATION_JSON) diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java index cd10226db..7d7c34bb9 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java @@ -35,10 +35,10 @@ import org.apache.couchdb.nouveau.core.IndexManager; import org.apache.couchdb.nouveau.core.IndexManager.Index; import com.codahale.metrics.annotation.Timed; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.TermQuery; +import v9.org.apache.lucene.document.Document; +import v9.org.apache.lucene.index.IndexWriter; +import v9.org.apache.lucene.index.Term; +import v9.org.apache.lucene.search.TermQuery; @Path("/index/{name}") @Consumes(MediaType.APPLICATION_JSON) diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java index dd78e861c..28b97d3c2 100644 --- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java +++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java @@ -41,28 +41,28 @@ import org.apache.couchdb.nouveau.core.IndexManager.Index; import org.apache.couchdb.nouveau.core.QueryParserException; import com.codahale.metrics.annotation.Timed; -import org.apache.lucene.document.Document; -import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.facet.Facets; -import org.apache.lucene.facet.FacetsCollector; -import org.apache.lucene.facet.FacetsCollectorManager; -import org.apache.lucene.facet.LabelAndValue; -import org.apache.lucene.facet.StringDocValuesReaderState; -import org.apache.lucene.facet.StringValueFacetCounts; -import org.apache.lucene.facet.range.DoubleRange; -import org.apache.lucene.facet.range.DoubleRangeFacetCounts; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.search.CollectorManager; -import org.apache.lucene.search.FieldDoc; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MultiCollectorManager; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.ScoreDoc; -import org.apache.lucene.search.SearcherManager; -import org.apache.lucene.search.Sort; -import org.apache.lucene.search.SortField; -import org.apache.lucene.search.TopDocs; -import org.apache.lucene.search.TopFieldCollector; +import v9.org.apache.lucene.document.Document; +import v9.org.apache.lucene.facet.FacetResult; +import v9.org.apache.lucene.facet.Facets; +import v9.org.apache.lucene.facet.FacetsCollector; +import v9.org.apache.lucene.facet.FacetsCollectorManager; +import v9.org.apache.lucene.facet.LabelAndValue; +import v9.org.apache.lucene.facet.StringDocValuesReaderState; +import v9.org.apache.lucene.facet.StringValueFacetCounts; +import v9.org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.facet.range.DoubleRangeFacetCounts; +import v9.org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.search.CollectorManager; +import v9.org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.search.IndexSearcher; +import v9.org.apache.lucene.search.MultiCollectorManager; +import v9.org.apache.lucene.search.Query; +import v9.org.apache.lucene.search.ScoreDoc; +import v9.org.apache.lucene.search.SearcherManager; +import v9.org.apache.lucene.search.Sort; +import v9.org.apache.lucene.search.SortField; +import v9.org.apache.lucene.search.TopDocs; +import v9.org.apache.lucene.search.TopFieldCollector; @Path("/index/{name}") @Consumes(MediaType.APPLICATION_JSON) diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java index c353fe7da..0dda50448 100644 --- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java +++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java @@ -27,14 +27,14 @@ import org.apache.couchdb.nouveau.api.IndexDefinition; import org.apache.couchdb.nouveau.api.SearchRequest; import org.apache.couchdb.nouveau.api.SearchResults; -import org.apache.lucene.document.DoubleDocValuesField; -import org.apache.lucene.document.DoublePoint; -import org.apache.lucene.document.SortedSetDocValuesField; -import org.apache.lucene.facet.range.DoubleRange; -import org.apache.lucene.search.FieldDoc; -import org.apache.lucene.search.TotalHits; -import org.apache.lucene.search.TotalHits.Relation; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.document.DoubleDocValuesField; +import v9.org.apache.lucene.document.DoublePoint; +import v9.org.apache.lucene.document.SortedSetDocValuesField; +import v9.org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.search.TotalHits; +import v9.org.apache.lucene.search.TotalHits.Relation; +import v9.org.apache.lucene.util.BytesRef; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java index 35b813392..9151920ec 100644 --- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java +++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java @@ -22,11 +22,11 @@ import java.util.List; import org.apache.couchdb.nouveau.core.ser.LuceneModule; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.lucene.document.DoublePoint; -import org.apache.lucene.document.Field.Store; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; -import org.apache.lucene.index.IndexableField; +import v9.org.apache.lucene.document.DoublePoint; +import v9.org.apache.lucene.document.Field.Store; +import v9.org.apache.lucene.document.StringField; +import v9.org.apache.lucene.document.TextField; +import v9.org.apache.lucene.index.IndexableField; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java index 9544b6f6e..42552cadd 100644 --- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java +++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java @@ -9,7 +9,7 @@ import java.util.Map; import org.apache.couchdb.nouveau.core.ser.LuceneModule; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.lucene.facet.range.DoubleRange; +import v9.org.apache.lucene.facet.range.DoubleRange; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java index 43bdb4e14..2027a436b 100644 --- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java +++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java @@ -15,45 +15,45 @@ package org.apache.couchdb.nouveau.core; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.ar.ArabicAnalyzer; -import org.apache.lucene.analysis.bg.BulgarianAnalyzer; -import org.apache.lucene.analysis.ca.CatalanAnalyzer; -import org.apache.lucene.analysis.cjk.CJKAnalyzer; -import org.apache.lucene.analysis.classic.ClassicAnalyzer; -import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer; -import org.apache.lucene.analysis.core.KeywordAnalyzer; -import org.apache.lucene.analysis.core.SimpleAnalyzer; -import org.apache.lucene.analysis.core.WhitespaceAnalyzer; -import org.apache.lucene.analysis.cz.CzechAnalyzer; -import org.apache.lucene.analysis.da.DanishAnalyzer; -import org.apache.lucene.analysis.de.GermanAnalyzer; -import org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer; -import org.apache.lucene.analysis.en.EnglishAnalyzer; -import org.apache.lucene.analysis.es.SpanishAnalyzer; -import org.apache.lucene.analysis.eu.BasqueAnalyzer; -import org.apache.lucene.analysis.fa.PersianAnalyzer; -import org.apache.lucene.analysis.fi.FinnishAnalyzer; -import org.apache.lucene.analysis.fr.FrenchAnalyzer; -import org.apache.lucene.analysis.ga.IrishAnalyzer; -import org.apache.lucene.analysis.gl.GalicianAnalyzer; -import org.apache.lucene.analysis.hi.HindiAnalyzer; -import org.apache.lucene.analysis.hu.HungarianAnalyzer; -import org.apache.lucene.analysis.hy.ArmenianAnalyzer; -import org.apache.lucene.analysis.id.IndonesianAnalyzer; -import org.apache.lucene.analysis.it.ItalianAnalyzer; -import org.apache.lucene.analysis.ja.JapaneseAnalyzer; -import org.apache.lucene.analysis.lv.LatvianAnalyzer; -import org.apache.lucene.analysis.nl.DutchAnalyzer; -import org.apache.lucene.analysis.no.NorwegianAnalyzer; -import org.apache.lucene.analysis.pl.PolishAnalyzer; -import org.apache.lucene.analysis.pt.PortugueseAnalyzer; -import org.apache.lucene.analysis.ro.RomanianAnalyzer; -import org.apache.lucene.analysis.ru.RussianAnalyzer; -import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.analysis.sv.SwedishAnalyzer; -import org.apache.lucene.analysis.th.ThaiAnalyzer; -import org.apache.lucene.analysis.tr.TurkishAnalyzer; +import v9.org.apache.lucene.analysis.Analyzer; +import v9.org.apache.lucene.analysis.ar.ArabicAnalyzer; +import v9.org.apache.lucene.analysis.bg.BulgarianAnalyzer; +import v9.org.apache.lucene.analysis.ca.CatalanAnalyzer; +import v9.org.apache.lucene.analysis.cjk.CJKAnalyzer; +import v9.org.apache.lucene.analysis.classic.ClassicAnalyzer; +import v9.org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer; +import v9.org.apache.lucene.analysis.core.KeywordAnalyzer; +import v9.org.apache.lucene.analysis.core.SimpleAnalyzer; +import v9.org.apache.lucene.analysis.core.WhitespaceAnalyzer; +import v9.org.apache.lucene.analysis.cz.CzechAnalyzer; +import v9.org.apache.lucene.analysis.da.DanishAnalyzer; +import v9.org.apache.lucene.analysis.de.GermanAnalyzer; +import v9.org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer; +import v9.org.apache.lucene.analysis.en.EnglishAnalyzer; +import v9.org.apache.lucene.analysis.es.SpanishAnalyzer; +import v9.org.apache.lucene.analysis.eu.BasqueAnalyzer; +import v9.org.apache.lucene.analysis.fa.PersianAnalyzer; +import v9.org.apache.lucene.analysis.fi.FinnishAnalyzer; +import v9.org.apache.lucene.analysis.fr.FrenchAnalyzer; +import v9.org.apache.lucene.analysis.ga.IrishAnalyzer; +import v9.org.apache.lucene.analysis.gl.GalicianAnalyzer; +import v9.org.apache.lucene.analysis.hi.HindiAnalyzer; +import v9.org.apache.lucene.analysis.hu.HungarianAnalyzer; +import v9.org.apache.lucene.analysis.hy.ArmenianAnalyzer; +import v9.org.apache.lucene.analysis.id.IndonesianAnalyzer; +import v9.org.apache.lucene.analysis.it.ItalianAnalyzer; +import v9.org.apache.lucene.analysis.ja.JapaneseAnalyzer; +import v9.org.apache.lucene.analysis.lv.LatvianAnalyzer; +import v9.org.apache.lucene.analysis.nl.DutchAnalyzer; +import v9.org.apache.lucene.analysis.no.NorwegianAnalyzer; +import v9.org.apache.lucene.analysis.pl.PolishAnalyzer; +import v9.org.apache.lucene.analysis.pt.PortugueseAnalyzer; +import v9.org.apache.lucene.analysis.ro.RomanianAnalyzer; +import v9.org.apache.lucene.analysis.ru.RussianAnalyzer; +import v9.org.apache.lucene.analysis.standard.StandardAnalyzer; +import v9.org.apache.lucene.analysis.sv.SwedishAnalyzer; +import v9.org.apache.lucene.analysis.th.ThaiAnalyzer; +import v9.org.apache.lucene.analysis.tr.TurkishAnalyzer; import org.junit.jupiter.api.Test; public class AnalyzerFactoryTest { diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java index 39cc550ce..eafebba63 100644 --- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java +++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java @@ -18,13 +18,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.lucene.document.DoublePoint; -import org.apache.lucene.document.Field.Store; -import org.apache.lucene.document.StoredField; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; -import org.apache.lucene.search.FieldDoc; -import org.apache.lucene.util.BytesRef; +import v9.org.apache.lucene.document.DoublePoint; +import v9.org.apache.lucene.document.Field.Store; +import v9.org.apache.lucene.document.StoredField; +import v9.org.apache.lucene.document.StringField; +import v9.org.apache.lucene.document.TextField; +import v9.org.apache.lucene.search.FieldDoc; +import v9.org.apache.lucene.util.BytesRef; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;
