Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

LUCENE-9319: Clean up package name conflicts for sandbox module (#2023)

Tomoko Uchida6a7131ee246d
diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index a16be0e25d2..35f400a0025 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -194,10 +194,9 @@ configure(project(":lucene:sandbox")) {
project.tasks.withType(RenderJavadocTask) {
// TODO: fix missing javadocs
javadocMissingLevel = "class"
- // TODO: clean up split packages
javadocMissingIgnore = [
- "org.apache.lucene.search",
- "org.apache.lucene.document"
+ "org.apache.lucene.sandbox.search",
+ "org.apache.lucene.sandbox.document"
]
}
}
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 206e945bcbb..eef4de49469 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -73,7 +73,7 @@ API Changes
in Lucenes IndexWriter. The interface is not sufficient to efficiently
replace the functionality with reasonable efforts. (Simon Willnauer)
-* LUCENE-9317 LUCENE-9318 LUCENE-9558: Clean up package name conflicts between modules.
+* LUCENE-9317 LUCENE-9318 LUCENE-9319 LUCENE-9558 : Clean up package name conflicts between modules.
See MIGRATE.md for details. (David Ryan, Tomoko Uchida, Uwe Schindler, Dawid Weiss)
Improvements
diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md
index 02ba210ce2b..c18d418fbca 100644
--- a/lucene/MIGRATE.md
+++ b/lucene/MIGRATE.md
@@ -1,5 +1,13 @@
# Apache Lucene Migration Guide
+## Packages in sandbox module are renamed (LUCENE-9319)
+
+Following package names in sandbox module are renamed.
+
+- o.a.l.codecs is renamed to o.a.l.sandbox.codecs
+- o.a.l.document is renamed to o.a.l.sandbox.document
+- o.a.l.search is renamed to o.a.l.sandbox.search
+
## Backward codecs are renamed (LUCENE-9318)
o.a.l.codecs package in `lucene-backward-codecs` module is renamed to o.a.l.backward_codecs.
diff --git a/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java b/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java
index 9f87862664c..2d3801ba51c 100644
--- a/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java
@@ -40,8 +40,9 @@ import org.apache.lucene.util.DocIdSetBuilder;
/**
* Query class for searching {@code RangeField} types by a defined {@link Relation}.
+ * @lucene.internal
*/
-abstract class RangeFieldQuery extends Query {
+public abstract class RangeFieldQuery extends Query {
/** field name */
final String field;
/** query relation
@@ -57,7 +58,7 @@ abstract class RangeFieldQuery extends Query {
final int bytesPerDim;
/** Used by {@code RangeFieldQuery} to check how each internal or leaf node relates to the query. */
- enum QueryType {
+ public enum QueryType {
/** Use this for intersects queries. */
INTERSECTS {
@@ -228,7 +229,7 @@ abstract class RangeFieldQuery extends Query {
* @param ranges encoded range values; this is done by the {@code RangeField} implementation
* @param queryType the query relation
*/
- RangeFieldQuery(String field, final byte[] ranges, final int numDims, final QueryType queryType) {
+ protected RangeFieldQuery(String field, final byte[] ranges, final int numDims, final QueryType queryType) {
checkArgs(field, ranges, numDims);
if (queryType == null) {
throw new IllegalArgumentException("Query type cannot be null");
@@ -404,6 +405,7 @@ abstract class RangeFieldQuery extends Query {
equalsTo(getClass().cast(o));
}
+ /** Check equality of two RangeFieldQuery objects */
protected boolean equalsTo(RangeFieldQuery other) {
return Objects.equals(field, other.field) &&
numDims == other.numDims &&
diff --git a/lucene/core/src/java/org/apache/lucene/search/ExactPhraseMatcher.java b/lucene/core/src/java/org/apache/lucene/search/ExactPhraseMatcher.java
index 2de5b09f153..a61f4fce460 100644
--- a/lucene/core/src/java/org/apache/lucene/search/ExactPhraseMatcher.java
+++ b/lucene/core/src/java/org/apache/lucene/search/ExactPhraseMatcher.java
@@ -33,7 +33,10 @@ import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.similarities.Similarity.SimScorer;
import org.apache.lucene.util.PriorityQueue;
-final class ExactPhraseMatcher extends PhraseMatcher {
+/** Expert: Find exact phrases
+ * @lucene.internal
+ */
+public final class ExactPhraseMatcher extends PhraseMatcher {
private static class PostingsAndPosition {
private final PostingsEnum postings;
@@ -50,7 +53,8 @@ final class ExactPhraseMatcher extends PhraseMatcher {
private final DocIdSetIterator approximation;
private final ImpactsDISI impactsApproximation;
- ExactPhraseMatcher(PhraseQuery.PostingsAndFreq[] postings, ScoreMode scoreMode, SimScorer scorer, float matchCost) {
+ /** Expert: Creates ExactPhraseMatcher instance */
+ public ExactPhraseMatcher(PhraseQuery.PostingsAndFreq[] postings, ScoreMode scoreMode, SimScorer scorer, float matchCost) {
super(matchCost);
final DocIdSetIterator approximation = ConjunctionDISI.intersectIterators(Arrays.stream(postings).map(p -> p.postings).collect(Collectors.toList()));
diff --git a/lucene/core/src/java/org/apache/lucene/search/HitQueue.java b/lucene/core/src/java/org/apache/lucene/search/HitQueue.java
index 071f4bf85a9..6c569fea00f 100644
--- a/lucene/core/src/java/org/apache/lucene/search/HitQueue.java
+++ b/lucene/core/src/java/org/apache/lucene/search/HitQueue.java
@@ -19,7 +19,10 @@ package org.apache.lucene.search;
import org.apache.lucene.util.PriorityQueue;
-final class HitQueue extends PriorityQueue<ScoreDoc> {
+/** Expert: Priority queue containing hit docs
+ * @lucene.internal
+ */
+public final class HitQueue extends PriorityQueue<ScoreDoc> {
/**
* Creates a new instance with <code>size</code> elements. If
@@ -59,7 +62,7 @@ final class HitQueue extends PriorityQueue<ScoreDoc> {
* @param prePopulate
* specifies whether to pre-populate the queue with sentinel values.
*/
- HitQueue(int size, boolean prePopulate) {
+ public HitQueue(int size, boolean prePopulate) {
super(size, () -> {
if (prePopulate) {
// Always set the doc Id to MAX_VALUE so that it won't be favored by
diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
index 64c855d9eee..c0776b2475c 100644
--- a/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
@@ -409,8 +409,9 @@ public class MultiPhraseQuery extends Query {
* Takes the logical union of multiple PostingsEnum iterators.
* <p>
* Note: positions are merged during freq()
+ * @lucene.internal
*/
- static class UnionPostingsEnum extends PostingsEnum {
+ public static class UnionPostingsEnum extends PostingsEnum {
/** queue ordered by docid */
final DocsQueue docsQueue;
/** cost of this enum: sum of its subs */
@@ -423,7 +424,7 @@ public class MultiPhraseQuery extends Query {
/** list of subs (unordered) */
final PostingsEnum[] subs;
- UnionPostingsEnum(Collection<PostingsEnum> subs) {
+ public UnionPostingsEnum(Collection<PostingsEnum> subs) {
docsQueue = new DocsQueue(subs.size());
long cost = 0;
for (PostingsEnum sub : subs) {
@@ -575,9 +576,11 @@ public class MultiPhraseQuery extends Query {
}
}
- // Slower version of UnionPostingsEnum that delegates offsets and positions, for
- // use by MatchesIterator
- static class UnionFullPostingsEnum extends UnionPostingsEnum {
+ /** Slower version of UnionPostingsEnum that delegates offsets and positions, for
+ use by MatchesIterator
+ * @lucene.internal
+ */
+ public static class UnionFullPostingsEnum extends UnionPostingsEnum {
int freq = -1;
boolean started = false;
@@ -585,7 +588,7 @@ public class MultiPhraseQuery extends Query {
final PriorityQueue<PostingsAndPosition> posQueue;
final Collection<PostingsAndPosition> subs;
- UnionFullPostingsEnum(List<PostingsEnum> subs) {
+ public UnionFullPostingsEnum(List<PostingsEnum> subs) {
super(subs);
this.posQueue = new PriorityQueue<PostingsAndPosition>(subs.size()) {
@Override
diff --git a/lucene/core/src/java/org/apache/lucene/search/Multiset.java b/lucene/core/src/java/org/apache/lucene/search/Multiset.java
index 549ec7bfd30..6e8e13e91f5 100644
--- a/lucene/core/src/java/org/apache/lucene/search/Multiset.java
+++ b/lucene/core/src/java/org/apache/lucene/search/Multiset.java
@@ -29,13 +29,13 @@ import java.util.Map;
* Iteration order is not specified.
* @lucene.internal
*/
-final class Multiset<T> extends AbstractCollection<T> {
+public final class Multiset<T> extends AbstractCollection<T> {
private final Map<T, Integer> map = new HashMap<>();
private int size;
/** Create an empty {@link Multiset}. */
- Multiset() {
+ public Multiset() {
super();
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/PhraseMatcher.java b/lucene/core/src/java/org/apache/lucene/search/PhraseMatcher.java
index c8ba3dd2fb3..148dddb7eac 100644
--- a/lucene/core/src/java/org/apache/lucene/search/PhraseMatcher.java
+++ b/lucene/core/src/java/org/apache/lucene/search/PhraseMatcher.java
@@ -25,8 +25,9 @@ import java.io.IOException;
* To find matches on a document, first advance {@link #approximation} to the
* relevant document, then call {@link #reset()}. Clients can then call
* {@link #nextMatch()} to iterate over the matches
+ * @lucene.internal
*/
-abstract class PhraseMatcher {
+public abstract class PhraseMatcher {
private final float matchCost;
diff --git a/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
index f07a24aaf05..d3c274e8dc4 100644
--- a/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
@@ -304,13 +304,17 @@ public class PhraseQuery extends Query {
v.consumeTerms(this, terms);
}
- static class PostingsAndFreq implements Comparable<PostingsAndFreq> {
+ /** Term postings and position information for phrase matching
+ * @lucene.internal
+ */
+ public static class PostingsAndFreq implements Comparable<PostingsAndFreq> {
final PostingsEnum postings;
final ImpactsEnum impacts;
final int position;
final Term[] terms;
final int nTerms; // for faster comparisons
+ /** Creates PostingsAndFreq instance */
public PostingsAndFreq(PostingsEnum postings, ImpactsEnum impacts, int position, Term... terms) {
this.postings = postings;
this.impacts = impacts;
@@ -413,7 +417,7 @@ public class PhraseQuery extends Query {
* This is for use by {@link TwoPhaseIterator#matchCost} implementations.
* @param termsEnum The term is the term at which this TermsEnum is positioned.
*/
- static float termPositionsCost(TermsEnum termsEnum) throws IOException {
+ public static float termPositionsCost(TermsEnum termsEnum) throws IOException {
int docFreq = termsEnum.docFreq();
assert docFreq > 0;
long totalTermFreq = termsEnum.totalTermFreq();
diff --git a/lucene/core/src/java/org/apache/lucene/search/PhraseWeight.java b/lucene/core/src/java/org/apache/lucene/search/PhraseWeight.java
index 64c413db8eb..365b72bbd38 100644
--- a/lucene/core/src/java/org/apache/lucene/search/PhraseWeight.java
+++ b/lucene/core/src/java/org/apache/lucene/search/PhraseWeight.java
@@ -23,13 +23,17 @@ import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.Similarity.SimScorer;
-abstract class PhraseWeight extends Weight {
+/** Expert: Weight class for phrase matching */
+public abstract class PhraseWeight extends Weight {
final ScoreMode scoreMode;
final Similarity.SimScorer stats;
final Similarity similarity;
final String field;
+ /** Expert: Creates PhraseWeight instance
+ * @lucene.internal
+ */
protected PhraseWeight(Query query, String field, IndexSearcher searcher, ScoreMode scoreMode) throws IOException {
super(query);
this.scoreMode = scoreMode;
diff --git a/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseMatcher.java b/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseMatcher.java
index c4da4232f98..136a46388b1 100644
--- a/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseMatcher.java
+++ b/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseMatcher.java
@@ -52,8 +52,10 @@ import org.apache.lucene.util.FixedBitSet;
* Similarly, for doc "a b c b a f g", query "c b"~2
* would get same score as "g f"~2, although "c b"~2 could be matched twice.
* We may want to fix this in the future (currently not, for performance reasons).
+ *
+ * @lucene.internal
*/
-final class SloppyPhraseMatcher extends PhraseMatcher {
+public final class SloppyPhraseMatcher extends PhraseMatcher {
private final PhrasePositions[] phrasePositions;
@@ -81,7 +83,7 @@ final class SloppyPhraseMatcher extends PhraseMatcher {
private boolean positioned;
private int matchLength;
- SloppyPhraseMatcher(PhraseQuery.PostingsAndFreq[] postings, int slop, ScoreMode scoreMode, SimScorer scorer, float matchCost, boolean captureLeadMatch) {
+ public SloppyPhraseMatcher(PhraseQuery.PostingsAndFreq[] postings, int slop, ScoreMode scoreMode, SimScorer scorer, float matchCost, boolean captureLeadMatch) {
super(matchCost);
this.slop = slop;
this.numPostings = postings.length;
diff --git a/lucene/core/src/java/org/apache/lucene/search/TermScorer.java b/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
index 7d3f6e3d1f2..5b484941963 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
@@ -24,8 +24,9 @@ import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SlowImpactsEnum;
/** Expert: A <code>Scorer</code> for documents matching a <code>Term</code>.
+ * @lucene.internal
*/
-final class TermScorer extends Scorer {
+public final class TermScorer extends Scorer {
private final PostingsEnum postingsEnum;
private final ImpactsEnum impactsEnum;
private final DocIdSetIterator iterator;
@@ -35,7 +36,7 @@ final class TermScorer extends Scorer {
/**
* Construct a {@link TermScorer} that will iterate all documents.
*/
- TermScorer(Weight weight, PostingsEnum postingsEnum, LeafSimScorer docScorer) {
+ public TermScorer(Weight weight, PostingsEnum postingsEnum, LeafSimScorer docScorer) {
super(weight);
iterator = this.postingsEnum = postingsEnum;
impactsEnum = new SlowImpactsEnum(postingsEnum);
@@ -60,7 +61,8 @@ final class TermScorer extends Scorer {
return postingsEnum.docID();
}
- final int freq() throws IOException {
+ /** Returns term frequency in the current document. */
+ public final int freq() throws IOException {
return postingsEnum.freq();
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
index 1d311605698..3fb042b6451 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
@@ -34,8 +34,10 @@ import org.apache.lucene.util.PriorityQueue;
public abstract class TopDocsCollector<T extends ScoreDoc> implements Collector {
/** This is used in case topDocs() is called with illegal parameters, or there
- * simply aren't (enough) results. */
- protected static final TopDocs EMPTY_TOPDOCS = new TopDocs(new TotalHits(0, TotalHits.Relation.EQUAL_TO), new ScoreDoc[0]);
+ * simply aren't (enough) results.
+ * @lucene.internal
+ */
+ public static final TopDocs EMPTY_TOPDOCS = new TopDocs(new TotalHits(0, TotalHits.Relation.EQUAL_TO), new ScoreDoc[0]);
/**
* The priority queue which holds the top documents. Note that different
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
index b9051d422a2..6a275bdefdb 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
@@ -38,9 +38,10 @@ import org.apache.lucene.search.MaxScoreAccumulator.DocAndScore;
*/
public abstract class TopScoreDocCollector extends TopDocsCollector<ScoreDoc> {
- abstract static class ScorerLeafCollector implements LeafCollector {
+ /** Scorable leaf collector */
+ public abstract static class ScorerLeafCollector implements LeafCollector {
- Scorable scorer;
+ protected Scorable scorer;
@Override
public void setScorer(Scorable scorer) throws IOException {
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsFormat.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsFormat.java
index 53b64dc0be3..bf20de290bc 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsReader.java
similarity index 98%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsReader.java
index 3ecd4734b33..cae6ab48836 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.java
index 2ac451fcc08..e454f766ee0 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionSegmentTermsEnum.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionSegmentTermsEnum.java
index 14b742cbe9a..76617feec4d 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionSegmentTermsEnum.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
import java.io.PrintStream;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionSegmentTermsEnumFrame.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionSegmentTermsEnumFrame.java
index 5b1ea64c405..9e959954e31 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionSegmentTermsEnumFrame.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionTermState.java
similarity index 96%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionTermState.java
index 27f766dff4d..ea809878315 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionTermState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import org.apache.lucene.codecs.BlockTermState;
import org.apache.lucene.index.TermState;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/SingleDocsEnum.java
similarity index 97%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/SingleDocsEnum.java
index 87886d356d4..b69937f3b22 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/SingleDocsEnum.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/SinglePostingsEnum.java
similarity index 97%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/SinglePostingsEnum.java
index d65423a0fc7..f26c15a3fd8 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/SinglePostingsEnum.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.util.BytesRef;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionBlockTreeTermsReader.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionBlockTreeTermsReader.java
index ff5d6ec83b9..f6623dee6a2 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionBlockTreeTermsReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionBlockTreeTermsWriter.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionBlockTreeTermsWriter.java
index 19e30a9b7c0..8e666fbd422 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionBlockTreeTermsWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionFieldReader.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionFieldReader.java
index 280a6c8b583..d58f6cfec3d 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/VersionFieldReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
import java.util.Collection;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/package-info.java
similarity index 94%
rename from lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/package-info.java
index 43c3ec2cec0..e2fee7238b1 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/package-info.java
@@ -19,4 +19,4 @@
* A primary-key postings format that associates a version (long) with each term and
* can provide fail-fast lookups by ID and version.
*/
-package org.apache.lucene.codecs.idversion;
\ No newline at end of file
+package org.apache.lucene.sandbox.codecs.idversion;
\ No newline at end of file
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/BigIntegerPoint.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/BigIntegerPoint.java
similarity index 98%
rename from lucene/sandbox/src/java/org/apache/lucene/document/BigIntegerPoint.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/BigIntegerPoint.java
index 4dc50d110f2..875cd37251c 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/BigIntegerPoint.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/BigIntegerPoint.java
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
import java.math.BigInteger;
import java.util.Arrays;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.PointValues;
import org.apache.lucene.search.PointInSetQuery;
import org.apache.lucene.search.PointRangeQuery;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/DoublePointMultiRangeBuilder.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/DoublePointMultiRangeBuilder.java
similarity index 95%
rename from lucene/sandbox/src/java/org/apache/lucene/document/DoublePointMultiRangeBuilder.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/DoublePointMultiRangeBuilder.java
index 314005a00e8..856939828f9 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/DoublePointMultiRangeBuilder.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/DoublePointMultiRangeBuilder.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
-import org.apache.lucene.search.MultiRangeQuery;
+import org.apache.lucene.sandbox.search.MultiRangeQuery;
import static org.apache.lucene.document.DoublePoint.decodeDimension;
import static org.apache.lucene.document.DoublePoint.pack;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/FloatPointMultiRangeBuilder.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointMultiRangeBuilder.java
similarity index 95%
rename from lucene/sandbox/src/java/org/apache/lucene/document/FloatPointMultiRangeBuilder.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointMultiRangeBuilder.java
index 0f590b0d407..b225e384a73 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/FloatPointMultiRangeBuilder.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointMultiRangeBuilder.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
-import org.apache.lucene.search.MultiRangeQuery;
+import org.apache.lucene.sandbox.search.MultiRangeQuery;
import static org.apache.lucene.document.FloatPoint.decodeDimension;
import static org.apache.lucene.document.FloatPoint.pack;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/FloatPointNearestNeighbor.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/document/FloatPointNearestNeighbor.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java
index 789e01a84d5..3e1dc838281 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/FloatPointNearestNeighbor.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.PriorityQueue;
+import org.apache.lucene.document.FloatPoint;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PointValues;
import org.apache.lucene.search.FieldDoc;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/HalfFloatPoint.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/HalfFloatPoint.java
similarity index 98%
rename from lucene/sandbox/src/java/org/apache/lucene/document/HalfFloatPoint.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/HalfFloatPoint.java
index 1f599a6f334..a5ad99bc4fe 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/HalfFloatPoint.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/HalfFloatPoint.java
@@ -14,11 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.NumericDocValuesField;
+import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.PointValues;
import org.apache.lucene.search.PointInSetQuery;
import org.apache.lucene.search.PointRangeQuery;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/IntPointMultiRangeBuilder.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/IntPointMultiRangeBuilder.java
similarity index 95%
rename from lucene/sandbox/src/java/org/apache/lucene/document/IntPointMultiRangeBuilder.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/IntPointMultiRangeBuilder.java
index ce2ab31af37..16ff530d86b 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/IntPointMultiRangeBuilder.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/IntPointMultiRangeBuilder.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
-import org.apache.lucene.search.MultiRangeQuery;
+import org.apache.lucene.sandbox.search.MultiRangeQuery;
import static org.apache.lucene.document.IntPoint.decodeDimension;
import static org.apache.lucene.document.IntPoint.pack;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/LatLonBoundingBox.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/LatLonBoundingBox.java
similarity index 97%
rename from lucene/sandbox/src/java/org/apache/lucene/document/LatLonBoundingBox.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/LatLonBoundingBox.java
index 3a2264ccd2e..c6202208f28 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/LatLonBoundingBox.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/LatLonBoundingBox.java
@@ -14,8 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.LatLonPoint;
+import org.apache.lucene.document.RangeFieldQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.NumericUtils;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/LongPointMultiRangeBuilder.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/LongPointMultiRangeBuilder.java
similarity index 95%
rename from lucene/sandbox/src/java/org/apache/lucene/document/LongPointMultiRangeBuilder.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/LongPointMultiRangeBuilder.java
index 46881ddf8bc..3167e5c0496 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/LongPointMultiRangeBuilder.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/LongPointMultiRangeBuilder.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
-import org.apache.lucene.search.MultiRangeQuery;
+import org.apache.lucene.sandbox.search.MultiRangeQuery;
import static org.apache.lucene.document.LongPoint.decodeDimension;
import static org.apache.lucene.document.LongPoint.pack;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/package.html b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/package.html
similarity index 91%
rename from lucene/sandbox/src/java/org/apache/lucene/document/package.html
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/document/package.html
index 4783b5e7050..201bc6b65ea 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/package.html
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/package.html
@@ -25,7 +25,7 @@
<body>
This package contains several point types:
<ul>
- <li>{@link org.apache.lucene.document.BigIntegerPoint BigIntegerPoint} for 128-bit integers</li>
+ <li>{@link org.apache.lucene.sandbox.document.BigIntegerPoint BigIntegerPoint} for 128-bit integers</li>
<li>{@link org.apache.lucene.document.LatLonPoint LatLonPoint} for latitude/longitude geospatial points</li>
</ul>
</body>
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/BM25FQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/BM25FQuery.java
similarity index 94%
rename from lucene/sandbox/src/java/org/apache/lucene/search/BM25FQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/BM25FQuery.java
index 48832492fdd..9befa7f38cc 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/BM25FQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/BM25FQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -34,6 +34,26 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.TermStates;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.CollectionStatistics;
+import org.apache.lucene.search.DisiPriorityQueue;
+import org.apache.lucene.search.DisiWrapper;
+import org.apache.lucene.search.DisjunctionDISIApproximation;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LeafSimScorer;
+import org.apache.lucene.search.Matches;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.SynonymQuery;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermScorer;
+import org.apache.lucene.search.TermStatistics;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.search.similarities.BM25Similarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.SimilarityBase;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/CoveringQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/CoveringQuery.java
similarity index 92%
rename from lucene/sandbox/src/java/org/apache/lucene/search/CoveringQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/CoveringQuery.java
index 397735300c8..76a08277faa 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/CoveringQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/CoveringQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -25,6 +25,19 @@ import java.util.stream.Collectors;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LongValues;
+import org.apache.lucene.search.LongValuesSource;
+import org.apache.lucene.search.Matches;
+import org.apache.lucene.search.MatchesUtils;
+import org.apache.lucene.search.Multiset;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.RamUsageEstimator;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/CoveringScorer.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/CoveringScorer.java
similarity index 94%
rename from lucene/sandbox/src/java/org/apache/lucene/search/CoveringScorer.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/CoveringScorer.java
index ba71a0dae21..cb15599c2bc 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/CoveringScorer.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/CoveringScorer.java
@@ -14,7 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
+
+import org.apache.lucene.search.DisiPriorityQueue;
+import org.apache.lucene.search.DisiWrapper;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.LongValues;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.Weight;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesNumbersQuery.java
similarity index 91%
rename from lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesNumbersQuery.java
index 35c07be5b28..0b7243dd5ff 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesNumbersQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.Arrays;
@@ -28,6 +28,15 @@ import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedNumericDocValues;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.RamUsageEstimator;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesTermsQuery.java
similarity index 94%
rename from lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesTermsQuery.java
index 7903b757952..4521a97f880 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesTermsQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.AbstractList;
@@ -29,6 +29,15 @@ import org.apache.lucene.index.PrefixCodedTerms;
import org.apache.lucene.index.PrefixCodedTerms.TermIterator;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/IndexSortSortedNumericDocValuesRangeQuery.java
similarity index 93%
rename from lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/IndexSortSortedNumericDocValuesRangeQuery.java
index df574c1d56f..14382d881bd 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/IndexSortSortedNumericDocValuesRangeQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.Objects;
@@ -24,6 +24,20 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.DocValuesFieldExistsQuery;
+import org.apache.lucene.search.FieldComparator;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LeafFieldComparator;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.Weight;
/**
* A range query that can take advantage of the fact that the index is sorted to speed up
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/LargeNumHitsTopDocsCollector.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LargeNumHitsTopDocsCollector.java
similarity index 92%
rename from lucene/sandbox/src/java/org/apache/lucene/search/LargeNumHitsTopDocsCollector.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LargeNumHitsTopDocsCollector.java
index 2abd982ee34..ff5788a56f3 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/LargeNumHitsTopDocsCollector.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LargeNumHitsTopDocsCollector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,6 +24,15 @@ import java.util.Comparator;
import java.util.List;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.Collector;
+import org.apache.lucene.search.HitQueue;
+import org.apache.lucene.search.LeafCollector;
+import org.apache.lucene.search.Scorable;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopScoreDocCollector;
+import org.apache.lucene.search.TotalHits;
import static org.apache.lucene.search.TopDocsCollector.EMPTY_TOPDOCS;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/LatLonPointPrototypeQueries.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LatLonPointPrototypeQueries.java
similarity index 94%
rename from lucene/sandbox/src/java/org/apache/lucene/search/LatLonPointPrototypeQueries.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LatLonPointPrototypeQueries.java
index bce984f432a..cbb1698e562 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/LatLonPointPrototypeQueries.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LatLonPointPrototypeQueries.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -26,6 +26,12 @@ import org.apache.lucene.document.LatLonPoint;
import org.apache.lucene.geo.GeoUtils;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PointValues;
+import org.apache.lucene.search.FieldDoc;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopFieldDocs;
+import org.apache.lucene.search.TotalHits;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.SloppyMath;
import org.apache.lucene.util.bkd.BKDReader;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/LongHashSet.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LongHashSet.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/search/LongHashSet.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LongHashSet.java
index c0c241cc872..b313f62b941 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/LongHashSet.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/LongHashSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.util.AbstractSet;
import java.util.Arrays;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/MultiNormsLeafSimScorer.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiNormsLeafSimScorer.java
similarity index 95%
rename from lucene/sandbox/src/java/org/apache/lucene/search/MultiNormsLeafSimScorer.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiNormsLeafSimScorer.java
index 75c98011391..a2dc38125ae 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/MultiNormsLeafSimScorer.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiNormsLeafSimScorer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,10 +24,12 @@ import java.util.Objects;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.NumericDocValues;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.LeafSimScorer;
import org.apache.lucene.search.similarities.Similarity.SimScorer;
import org.apache.lucene.util.SmallFloat;
-import static org.apache.lucene.search.BM25FQuery.FieldAndWeight;
+import static org.apache.lucene.sandbox.search.BM25FQuery.FieldAndWeight;
/**
* Copy of {@link LeafSimScorer} that sums document's norms from multiple fields.
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/MultiRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiRangeQuery.java
similarity index 96%
rename from lucene/sandbox/src/java/org/apache/lucene/search/MultiRangeQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiRangeQuery.java
index e84af18a03f..531f6e0adcc 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/MultiRangeQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiRangeQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -26,6 +26,16 @@ import java.util.Objects;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PointValues;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.ScorerSupplier;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.DocIdSetBuilder;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/NearestNeighbor.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java
similarity index 99%
rename from lucene/sandbox/src/java/org/apache/lucene/search/NearestNeighbor.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java
index 50fc48eaa58..a1a59e18922 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/NearestNeighbor.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/PhraseWildcardQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.java
similarity index 97%
rename from lucene/sandbox/src/java/org/apache/lucene/search/PhraseWildcardQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.java
index e348b6258b9..5fdac5bf42f 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/PhraseWildcardQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,6 +36,24 @@ import org.apache.lucene.index.TermState;
import org.apache.lucene.index.TermStates;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.ExactPhraseMatcher;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.MultiTermQuery;
+import org.apache.lucene.search.PhraseMatcher;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.PhraseWeight;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.SloppyPhraseMatcher;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermStatistics;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
@@ -216,7 +234,7 @@ public class PhraseWildcardQuery extends Query {
}
PhraseWeight createPhraseWeight(IndexSearcher searcher, ScoreMode scoreMode,
- float boost, TermsData termsData) throws IOException {
+ float boost, TermsData termsData) throws IOException {
return new PhraseWeight(this, field, searcher, scoreMode) {
@Override
@@ -760,7 +778,7 @@ public class PhraseWildcardQuery extends Query {
@Override
protected void toString(StringBuilder builder) {
- builder.append(query.toString(query.field));
+ builder.append(query.toString(query.getField()));
}
@Override
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
similarity index 96%
rename from lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
index 79ed166b4e0..754b99c5ed1 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,6 +31,20 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.TermStates;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LeafSimScorer;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermStatistics;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.util.Accountable;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonScorer.java
similarity index 97%
rename from lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonScorer.java
index 474a8d94d9f..586bc7c68cf 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonScorer.java
@@ -14,13 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.search.TermAutomatonQuery.EnumAndScorer;
-import org.apache.lucene.search.TermAutomatonQuery.TermAutomatonWeight;
+import org.apache.lucene.sandbox.search.TermAutomatonQuery.EnumAndScorer;
+import org.apache.lucene.sandbox.search.TermAutomatonQuery.TermAutomatonWeight;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.LeafSimScorer;
+import org.apache.lucene.search.Scorer;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.PriorityQueue;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java
similarity index 97%
rename from lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java
index 7c56c8b2d9e..9bc19c4409b 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
+import org.apache.lucene.sandbox.search.TermAutomatonQuery;
import org.apache.lucene.util.BytesRef;
/** Consumes a TokenStream and creates an {@link TermAutomatonQuery}
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/package.html b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/package.html
similarity index 100%
rename from lucene/sandbox/src/java/org/apache/lucene/search/package.html
rename to lucene/sandbox/src/java/org/apache/lucene/sandbox/search/package.html
diff --git a/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
index a319f24b971..7af84859523 100644
--- a/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
+++ b/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.idversion.IDVersionPostingsFormat
+org.apache.lucene.sandbox.codecs.idversion.IDVersionPostingsFormat
diff --git a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/StringAndPayloadField.java
similarity index 98%
rename from lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/StringAndPayloadField.java
index ddfce177659..36779d8642a 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/StringAndPayloadField.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java
similarity index 99%
rename from lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java
index 10b3657e6b6..487d796edf0 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.codecs.idversion;
+package org.apache.lucene.sandbox.codecs.idversion;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.codecs.idversion.StringAndPayloadField.SingleTokenWithPayloadTokenStream;
+import org.apache.lucene.sandbox.codecs.idversion.StringAndPayloadField.SingleTokenWithPayloadTokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/document/TestBigIntegerPoint.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java
similarity index 97%
rename from lucene/sandbox/src/test/org/apache/lucene/document/TestBigIntegerPoint.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java
index 98c6a679857..1963dca37a0 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/document/TestBigIntegerPoint.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
import java.math.BigInteger;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.sandbox.document.BigIntegerPoint;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/document/TestDoubleRangeField.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java
similarity index 95%
rename from lucene/sandbox/src/test/org/apache/lucene/document/TestDoubleRangeField.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java
index 8a8130bfd1a..37b54b9afb9 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/document/TestDoubleRangeField.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.DoubleRange;
import org.apache.lucene.util.LuceneTestCase;
/**
diff --git a/lucene/sandbox/src/test/org/apache/lucene/document/TestFloatPointNearestNeighbor.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java
similarity index 95%
rename from lucene/sandbox/src/test/org/apache/lucene/document/TestFloatPointNearestNeighbor.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java
index f77d5947878..1c97785bdfb 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/document/TestFloatPointNearestNeighbor.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java
@@ -14,10 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
import java.util.Arrays;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FloatPoint;
+import org.apache.lucene.document.StoredField;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -27,7 +32,7 @@ import org.apache.lucene.index.SerialMergeScheduler;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.LatLonPointPrototypeQueries;
+import org.apache.lucene.sandbox.search.LatLonPointPrototypeQueries;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -51,7 +56,7 @@ public class TestFloatPointNearestNeighbor extends LuceneTestCase {
DirectoryReader r = w.getReader();
// can't wrap because we require Lucene60PointsFormat directly but e.g. ParallelReader wraps with its own points impl:
IndexSearcher s = newSearcher(r, false);
- FieldDoc hit = (FieldDoc)FloatPointNearestNeighbor.nearest(s, "point", 1, 40.0f, 50.0f).scoreDocs[0];
+ FieldDoc hit = (FieldDoc) FloatPointNearestNeighbor.nearest(s, "point", 1, 40.0f, 50.0f).scoreDocs[0];
assertEquals("0", r.document(hit.doc).getField("id").stringValue());
r.close();
diff --git a/lucene/sandbox/src/test/org/apache/lucene/document/TestHalfFloatPoint.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java
similarity index 98%
rename from lucene/sandbox/src/test/org/apache/lucene/document/TestHalfFloatPoint.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java
index 710a9825da2..09e3fcb5685 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/document/TestHalfFloatPoint.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.document;
+package org.apache.lucene.sandbox.document;
import java.util.Arrays;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.sandbox.document.HalfFloatPoint;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.ArrayUtil;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/LongHashSetTests.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/LongHashSetTests.java
similarity index 97%
rename from lucene/sandbox/src/test/org/apache/lucene/search/LongHashSetTests.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/LongHashSetTests.java
index 25d94a6dbbc..c388d745bee 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/LongHashSetTests.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/LongHashSetTests.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.util.Arrays;
import java.util.HashSet;
@@ -22,6 +22,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.LongStream;
+import org.apache.lucene.sandbox.search.LongHashSet;
import org.apache.lucene.util.LuceneTestCase;
public class LongHashSetTests extends LuceneTestCase {
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestBM25FQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestBM25FQuery.java
similarity index 93%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestBM25FQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestBM25FQuery.java
index 36c0054f386..18ed94c52ed 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestBM25FQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestBM25FQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
@@ -27,6 +27,16 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.BM25FQuery;
+import org.apache.lucene.search.CheckHits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.SynonymQuery;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopScoreDocCollector;
+import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.similarities.BM25Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestCoveringQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java
similarity index 93%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestCoveringQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java
index 2c59f5ba92a..4fcc54f28ca 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestCoveringQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,7 +31,15 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.CoveringQuery;
import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LongValuesSource;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java
similarity index 94%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java
index af077215312..8f13f03f5aa 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
@@ -24,7 +24,16 @@ import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.DocValuesNumbersQuery;
import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java
similarity index 94%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java
index 04383fb70d9..9cfbcc25037 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -27,7 +27,16 @@ import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.DocValuesTermsQuery;
import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java
similarity index 92%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java
index 96b5713d246..6a9663eb8dd 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java
@@ -14,10 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedDocValuesField;
+import org.apache.lucene.sandbox.search.DocValuesTermsQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
@@ -31,7 +34,7 @@ import java.util.List;
/**
* A basic unit test for FieldCacheTermsFilter
*
- * @see org.apache.lucene.search.DocValuesTermsQuery
+ * @see DocValuesTermsQuery
*/
public class TestFieldCacheTermsFilter extends LuceneTestCase {
public void testMissingTerms() throws Exception {
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
similarity index 96%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
index 97319dbe027..015549a2c11 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
@@ -28,6 +28,20 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.sandbox.search.IndexSortSortedNumericDocValuesRangeQuery;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.DocValuesFieldExistsQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.SortedNumericSortField;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestLargeNumHitsTopDocsCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java
similarity index 85%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestLargeNumHitsTopDocsCollector.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java
index b335f9a2de8..12e2d705cb5 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestLargeNumHitsTopDocsCollector.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
@@ -24,6 +24,17 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.LargeNumHitsTopDocsCollector;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.CheckHits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopScoreDocCollector;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -77,7 +88,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
searcher.search(testQuery, regularCollector);
- assertEquals(largeCollector.totalHits, regularCollector.totalHits);
+ assertEquals(largeCollector.totalHits, regularCollector.getTotalHits());
IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
largeCollector.topDocs(350_000);
@@ -94,7 +105,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
searcher.search(testQuery, regularCollector);
- assertEquals(largeCollector.totalHits, regularCollector.totalHits);
+ assertEquals(largeCollector.totalHits, regularCollector.getTotalHits());
assertEquals(largeCollector.pq, null);
assertEquals(largeCollector.pqTop, null);
@@ -108,7 +119,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
searcher.search(testQuery, regularCollector);
- assertEquals(largeCollector.totalHits, regularCollector.totalHits);
+ assertEquals(largeCollector.totalHits, regularCollector.getTotalHits());
assertNotEquals(largeCollector.pq, null);
assertNotEquals(largeCollector.pqTop, null);
@@ -122,7 +133,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
searcher.search(testQuery, regularCollector);
- assertEquals(largeCollector.totalHits, regularCollector.totalHits);
+ assertEquals(largeCollector.totalHits, regularCollector.getTotalHits());
assertEquals(largeCollector.pq, null);
assertEquals(largeCollector.pqTop, null);
@@ -146,7 +157,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
searcher.search(testQuery, regularCollector);
- assertEquals(largeCollector.totalHits, regularCollector.totalHits);
+ assertEquals(largeCollector.totalHits, regularCollector.getTotalHits());
TopDocs firstTopDocs = largeCollector.topDocs();
TopDocs secondTopDocs = regularCollector.topDocs();
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonBoundingBoxQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java
similarity index 97%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonBoundingBoxQueries.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java
index 7506fb89e8a..ade7a769a0a 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonBoundingBoxQueries.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java
@@ -14,14 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.LatLonBoundingBox;
+import org.apache.lucene.sandbox.document.LatLonBoundingBox;
import org.apache.lucene.geo.GeoTestUtil;
import org.apache.lucene.geo.Rectangle;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.search.BaseRangeFieldQueryTestCase;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
import static org.apache.lucene.geo.GeoEncodingUtils.decodeLatitude;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestMultiRangeQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java
similarity index 98%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestMultiRangeQueries.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java
index d865a2e084c..a73d6d2d0ec 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestMultiRangeQueries.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java
@@ -15,21 +15,23 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DoublePoint;
-import org.apache.lucene.document.DoublePointMultiRangeBuilder;
+import org.apache.lucene.sandbox.document.DoublePointMultiRangeBuilder;
import org.apache.lucene.document.FloatPoint;
-import org.apache.lucene.document.FloatPointMultiRangeBuilder;
+import org.apache.lucene.sandbox.document.FloatPointMultiRangeBuilder;
import org.apache.lucene.document.IntPoint;
-import org.apache.lucene.document.IntPointMultiRangeBuilder;
+import org.apache.lucene.sandbox.document.IntPointMultiRangeBuilder;
import org.apache.lucene.document.LongPoint;
-import org.apache.lucene.document.LongPointMultiRangeBuilder;
+import org.apache.lucene.sandbox.document.LongPointMultiRangeBuilder;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestNearest.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java
similarity index 96%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestNearest.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java
index 98a3de1e239..f64c15d7826 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestNearest.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.util.Arrays;
import java.util.Comparator;
@@ -33,6 +33,13 @@ import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SerialMergeScheduler;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.LatLonPointPrototypeQueries;
+import org.apache.lucene.search.FieldDoc;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.SloppyMath;
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestPhraseWildcardQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java
similarity index 97%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestPhraseWildcardQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java
index f3cc088f095..f3e86c29f23 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestPhraseWildcardQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.Arrays;
@@ -32,6 +32,20 @@ import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.sandbox.search.PhraseWildcardQuery;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.DisjunctionMaxQuery;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Weight;
+import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
@@ -40,7 +54,7 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import static org.apache.lucene.search.PhraseWildcardQuery.TestCounters;
+import static org.apache.lucene.sandbox.search.PhraseWildcardQuery.TestCounters;
/**
* Tests {@link PhraseWildcardQuery}.
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java
similarity index 97%
rename from lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java
index a95f0952495..5778d960a3c 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.search;
import java.io.IOException;
import java.util.ArrayList;
@@ -43,7 +43,25 @@ import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.TermAutomatonQuery;
+import org.apache.lucene.sandbox.search.TokenStreamToTermAutomatonQuery;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BitSetIterator;
diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
index 3320655e58d..d86df227d70 100644
--- a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
@@ -27,6 +27,7 @@ import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PrefixCodedTerms;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.Term;
+import org.apache.lucene.sandbox.search.DocValuesTermsQuery;
import org.apache.lucene.search.*;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
index 02ed123f3a7..4ad7a020ba9 100644
--- a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
@@ -27,7 +27,7 @@ import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.DocValuesTermsQuery;
+import org.apache.lucene.sandbox.search.DocValuesTermsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.SimpleCollector;