LUCENE-9600: Clean up package name conflicts between misc and core modules (#2064)

gradle/documentation/render-javadoc.gradle

@@ -205,15 +205,14 @@ configure(project(":lucene:misc")) {
   project.tasks.withType(RenderJavadocTask) {
     // TODO: fix missing javadocs
     javadocMissingLevel = "class"
-    // TODO: clean up split packages
     javadocMissingIgnore = [
-        "org.apache.lucene.search",
-        "org.apache.lucene.search.similarity",
-        "org.apache.lucene.util",
-        "org.apache.lucene.util.fst",
-        "org.apache.lucene.store",
-        "org.apache.lucene.document",
-        "org.apache.lucene.index"
+        "org.apache.lucene.misc.search",
+        "org.apache.lucene.misc.search.similarity",
+        "org.apache.lucene.misc.util",
+        "org.apache.lucene.misc.util.fst",
+        "org.apache.lucene.misc.store",
+        "org.apache.lucene.misc.document",
+        "org.apache.lucene.misc.index"
     ]
   }
 }

lucene/CHANGES.txt

@@ -73,8 +73,8 @@ 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-9319 LUCENE-9558 : Clean up package name conflicts between modules.
-  See MIGRATE.md for details. (David Ryan, Tomoko Uchida, Uwe Schindler, Dawid Weiss)
+* LUCENE-9317 LUCENE-9318 LUCENE-9319 LUCENE-9558 LUCENE-9600 : Clean up package name conflicts
+  between modules. See MIGRATE.md for details. (David Ryan, Tomoko Uchida, Uwe Schindler, Dawid Weiss)
 
 Improvements
 

lucene/MIGRATE.md

@@ -1,5 +1,17 @@
 # Apache Lucene Migration Guide
 
+## Packages in misc module are renamed (LUCENE-9600)
+
+Following package names in misc module are renamed.
+
+- o.a.l.document is renamed to o.a.l.misc.document
+- o.a.l.index is renamed to o.a.l.misc.index
+- o.a.l.search is renamed to o.a.l.misc.search
+- o.a.l.store is renamed to o.a.l.misc.store
+- o.a.l.util is renamed to o.a.l.misc.util
+
+Also, o.a.l.document.InetAddressPoint and o.a.l.document.InetAddressRange are moved to core module.
+
 ## Packages in sandbox module are renamed (LUCENE-9319)
 
 Following package names in sandbox module are renamed.

lucene/misc/src/java/org/apache/lucene/misc/CollectorMemoryTracker.java

@@ -19,7 +19,7 @@ package org.apache.lucene.misc;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.lucene.util.MemoryTracker;
+import org.apache.lucene.misc.util.MemoryTracker;
 
 /**
  * Default implementation of {@code MemoryTracker} that tracks

lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java

@@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.index.MergePolicy;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.HardlinkCopyDirectoryWrapper;
+import org.apache.lucene.misc.store.HardlinkCopyDirectoryWrapper;
 import org.apache.lucene.util.SuppressForbidden;
 
 import java.nio.file.Paths;

lucene/misc/src/java/org/apache/lucene/misc/document/LazyDocument.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.document;
+package org.apache.lucene.misc.document;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -27,6 +27,7 @@ import java.util.Set;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.document.Document;
 import org.apache.lucene.index.FieldInfo;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexableField;

lucene/misc/src/java/org/apache/lucene/misc/index/IndexSplitter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.index;
+package org.apache.lucene.misc.index;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -28,6 +28,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.SuppressForbidden;
 
@@ -105,14 +108,6 @@ public class IndexSplitter {
     }
   }
 
-  private int getIdx(String name) {
-    for (int x = 0; x < infos.size(); x++) {
-      if (name.equals(infos.info(x).info.name))
-        return x;
-    }
-    return -1;
-  }
-
   private SegmentCommitInfo getInfo(String name) {
     for (int x = 0; x < infos.size(); x++) {
       if (name.equals(infos.info(x).info.name))
@@ -123,8 +118,8 @@ public class IndexSplitter {
 
   public void remove(String[] segs) throws IOException {
     for (String n : segs) {
-      int idx = getIdx(n);
-      infos.remove(idx);
+      SegmentCommitInfo info = getInfo(n);
+      infos.remove(info);
     }
     infos.changed();
     infos.commit(fsDir);

lucene/misc/src/java/org/apache/lucene/misc/index/MultiPassIndexSplitter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.index;
+package org.apache.lucene.misc.index;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -23,7 +23,17 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.lucene.index.BaseCompositeReader;
+import org.apache.lucene.index.CodecReader;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.FilterCodecReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SlowCodecReaderWrapper;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.FixedBitSet;
@@ -101,7 +111,7 @@ public class MultiPassIndexSplitter {
           .setOpenMode(OpenMode.CREATE));
       System.err.println("Writing part " + (i + 1) + " ...");
       // pass the subreaders directly, as our wrapper's numDocs/hasDeletetions are not up-to-date
-      final List<? extends FakeDeleteLeafIndexReader> sr = input.getSequentialSubReaders();
+      final List<? extends FakeDeleteLeafIndexReader> sr = input.getSequentialSubReadersWrapper();
       w.addIndexes(sr.toArray(new CodecReader[sr.size()])); // TODO: maybe take List<IR> here?
       w.close();
     }
@@ -211,6 +221,10 @@ public class MultiPassIndexSplitter {
       return null;
     }
 
+    final List<? extends FakeDeleteLeafIndexReader> getSequentialSubReadersWrapper() {
+      return getSequentialSubReaders();
+    }
+
     // no need to override numDocs/hasDeletions,
     // as we pass the subreaders directly to IW.addIndexes().
   }

lucene/misc/src/java/org/apache/lucene/misc/index/PKIndexSplitter.java

@@ -14,12 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.index;
+package org.apache.lucene.misc.index;
 
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.lucene.index.CodecReader;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.FilterCodecReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.Term;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;

lucene/misc/src/java/org/apache/lucene/misc/search/DiversifiedTopDocsCollector.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.misc.search;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -23,7 +23,14 @@ import java.util.Stack;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
-import org.apache.lucene.search.DiversifiedTopDocsCollector.ScoreDocKey;
+import org.apache.lucene.misc.search.DiversifiedTopDocsCollector.ScoreDocKey;
+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.TopDocsCollector;
+import org.apache.lucene.search.TotalHits;
 import org.apache.lucene.util.PriorityQueue;
 
 /**

lucene/misc/src/java/org/apache/lucene/misc/search/DocValuesStats.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.misc.search;
 
 import java.io.IOException;
 

lucene/misc/src/java/org/apache/lucene/misc/search/DocValuesStatsCollector.java

@@ -14,11 +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.misc.search;
 
 import java.io.IOException;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.Collector;
+import org.apache.lucene.search.LeafCollector;
+import org.apache.lucene.search.Scorable;
+import org.apache.lucene.search.ScoreMode;
 
 /** A {@link Collector} which computes statistics for a DocValues field. */
 public class DocValuesStatsCollector implements Collector {

lucene/misc/src/java/org/apache/lucene/misc/search/MemoryAccountingBitsetCollector.java

@@ -15,12 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.search;
+package org.apache.lucene.misc.search;
 
 import java.io.IOException;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.misc.CollectorMemoryTracker;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.SimpleCollector;
 import org.apache.lucene.util.FixedBitSet;
 
 /** Bitset collector which supports memory tracking */

lucene/misc/src/java/org/apache/lucene/misc/search/similarity/LegacyBM25Similarity.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.search.similarity;
+package org.apache.lucene.misc.search.similarity;
 
 import org.apache.lucene.index.FieldInvertState;
 import org.apache.lucene.search.CollectionStatistics;

lucene/misc/src/java/org/apache/lucene/misc/store/HardlinkCopyDirectoryWrapper.java

@@ -15,7 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
+
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.FilterDirectory;
+import org.apache.lucene.store.IOContext;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

lucene/misc/src/java/org/apache/lucene/misc/store/NativePosixUtil.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
 
 import java.io.IOException;
 import java.io.FileDescriptor;

lucene/misc/src/java/org/apache/lucene/misc/store/NativeUnixDirectory.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
 
 import java.io.EOFException;
 import java.io.FileDescriptor;
@@ -25,7 +25,16 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.Path;
 
+import org.apache.lucene.misc.store.NativePosixUtil;
+import org.apache.lucene.store.BufferedIndexInput;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.FSLockFactory;
+import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IOContext.Context;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.store.LockFactory;
 import org.apache.lucene.util.SuppressForbidden;
 
 // TODO

lucene/misc/src/java/org/apache/lucene/misc/store/RAFDirectory.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
 
 import java.io.EOFException;
 import java.io.File;
@@ -23,6 +23,14 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
 
+import org.apache.lucene.store.BufferedIndexInput;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.FSLockFactory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.LockFactory;
+import org.apache.lucene.store.MMapDirectory;
+import org.apache.lucene.store.NIOFSDirectory;
 import org.apache.lucene.util.SuppressForbidden;
 
 /** A straightforward implementation of {@link FSDirectory}
@@ -30,7 +38,7 @@ import org.apache.lucene.util.SuppressForbidden;
  *  poor concurrent performance (multiple threads will
  *  bottleneck) as it synchronizes when multiple threads
  *  read from the same file.  It's usually better to use
- *  {@link NIOFSDirectory} or {@link MMapDirectory} instead. 
+ *  {@link NIOFSDirectory} or {@link MMapDirectory} instead.
  *  <p>
  *  NOTE: Because this uses RandomAccessFile, it will generally
  *  not work with non-default filesystem providers. It is only

lucene/misc/src/java/org/apache/lucene/misc/store/WindowsDirectory.java

@@ -14,7 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
+
+import org.apache.lucene.store.BufferedIndexInput;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.FSLockFactory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.LockFactory;
 
 import java.io.IOException;
 import java.io.EOFException;

lucene/misc/src/java/org/apache/lucene/misc/util/MemoryTracker.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.util;
+package org.apache.lucene.misc.util;
 
 /**
  * Tracks dynamic allocations/deallocations of memory for transient objects

lucene/misc/src/java/org/apache/lucene/misc/util/fst/ListOfOutputs.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.util.fst;
+package org.apache.lucene.misc.util.fst;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,6 +24,8 @@ import org.apache.lucene.store.DataInput;
 import org.apache.lucene.store.DataOutput;
 import org.apache.lucene.util.IntsRef; // javadocs
 import org.apache.lucene.util.RamUsageEstimator;
+import org.apache.lucene.util.fst.FSTCompiler;
+import org.apache.lucene.util.fst.Outputs;
 
 /**
  * Wraps another Outputs implementation and encodes one or

lucene/misc/src/java/org/apache/lucene/misc/util/fst/UpToTwoPositiveIntOutputs.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.util.fst;
+package org.apache.lucene.misc.util.fst;
 
 import java.io.IOException;
 
@@ -22,6 +22,8 @@ import org.apache.lucene.store.DataInput;
 import org.apache.lucene.store.DataOutput;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.apache.lucene.util.SuppressForbidden;
+import org.apache.lucene.util.fst.FSTCompiler;
+import org.apache.lucene.util.fst.Outputs;
 
 /**
  * An FST {@link Outputs} implementation where each output

lucene/misc/src/java/overview.html

@@ -35,7 +35,7 @@ changing norms, finding high freq terms, and others.
 have to compile on your platform.
 
 <p>
-{@link org.apache.lucene.store.NativeUnixDirectory} is a Directory implementation that bypasses the
+{@link org.apache.lucene.misc.store.NativeUnixDirectory} is a Directory implementation that bypasses the
 OS's buffer cache (using direct IO) for any IndexInput and IndexOutput
 used during merging of segments larger than a specified size (default
 10 MB).  This avoids evicting hot pages that are still in-use for

lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.document;
+package org.apache.lucene.misc.document;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -25,6 +25,10 @@ import java.util.Objects;
 import java.util.Set;
 
 import org.apache.lucene.analysis.*;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
 import org.apache.lucene.store.*;

lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java

@@ -14,13 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.index;
+package org.apache.lucene.misc.index;
 
 import java.nio.file.Path;
 
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.DocHelper;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.LogByteSizeMergePolicy;
+import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.LuceneTestCase;
@@ -60,7 +67,7 @@ public class TestIndexSplitter extends LuceneTestCase {
       iw.addDocument(doc);
     }
     iw.commit();
-    DirectoryReader iwReader = iw.getReader();
+    DirectoryReader iwReader = DirectoryReader.open(iw);
     assertEquals(3, iwReader.leaves().size());
     iwReader.close();
     iw.close();

lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java

@@ -14,11 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.index;
+package org.apache.lucene.misc.index;
 
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.MultiTerms;
+import org.apache.lucene.index.NoMergePolicy;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.LuceneTestCase;

lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.index;
+package org.apache.lucene.misc.index;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -25,7 +25,13 @@ import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.MultiBits;
+import org.apache.lucene.index.NoMergePolicy;
+import org.apache.lucene.index.Term;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.LuceneTestCase;

lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.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.misc.search;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -34,7 +34,21 @@ import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.index.RandomIndexWriter;
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LeafCollector;
+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.BytesRef;
 import org.apache.lucene.util.LuceneTestCase;

lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.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.misc.search;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -38,12 +38,16 @@ import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.search.DocValuesStats.DoubleDocValuesStats;
-import org.apache.lucene.search.DocValuesStats.LongDocValuesStats;
-import org.apache.lucene.search.DocValuesStats.SortedDocValuesStats;
-import org.apache.lucene.search.DocValuesStats.SortedDoubleDocValuesStats;
-import org.apache.lucene.search.DocValuesStats.SortedLongDocValuesStats;
-import org.apache.lucene.search.DocValuesStats.SortedSetDocValuesStats;
+import org.apache.lucene.misc.search.DocValuesStats.DoubleDocValuesStats;
+import org.apache.lucene.misc.search.DocValuesStats.LongDocValuesStats;
+import org.apache.lucene.misc.search.DocValuesStats.SortedDocValuesStats;
+import org.apache.lucene.misc.search.DocValuesStats.SortedDoubleDocValuesStats;
+import org.apache.lucene.misc.search.DocValuesStats.SortedLongDocValuesStats;
+import org.apache.lucene.misc.search.DocValuesStats.SortedSetDocValuesStats;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.MultiCollector;
+import org.apache.lucene.search.TotalHitCountCollector;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.LuceneTestCase;

lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java

@@ -15,13 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.search;
+package org.apache.lucene.misc.search;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.SortedDocValuesField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.MultiCollector;
+import org.apache.lucene.search.TotalHitCountCollector;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.misc.CollectorMemoryTracker;

lucene/misc/src/test/org/apache/lucene/misc/search/similarity/TestLegacyBM25Similarity.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.search.similarity;
+package org.apache.lucene.misc.search.similarity;
 
 import java.util.Random;
 

lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
 
 import java.io.IOException;
 import java.net.URI;
@@ -26,8 +26,18 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
 
 import org.apache.lucene.codecs.CodecUtil;
+import org.apache.lucene.misc.store.HardlinkCopyDirectoryWrapper;
 import org.apache.lucene.mockfile.FilterPath;
 import org.apache.lucene.mockfile.WindowsFS;
+import org.apache.lucene.store.BaseDirectoryTestCase;
+import org.apache.lucene.store.ByteBuffersDirectory;
+import org.apache.lucene.store.ChecksumIndexInput;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.store.NIOFSDirectory;
 import org.apache.lucene.util.Constants;
 import org.apache.lucene.util.IOUtils;
 

lucene/misc/src/test/org/apache/lucene/misc/store/TestRAFDirectory.java

@@ -14,7 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.store;
+package org.apache.lucene.misc.store;
+
+import org.apache.lucene.store.BaseDirectoryTestCase;
+import org.apache.lucene.store.Directory;
 
 import java.io.IOException;
 import java.nio.file.Path;

lucene/misc/src/test/org/apache/lucene/misc/util/TestCollectorMemoryTracker.java

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.util;
+package org.apache.lucene.misc.util;
 
 import org.apache.lucene.misc.CollectorMemoryTracker;
+import org.apache.lucene.util.LuceneTestCase;
 
 public class TestCollectorMemoryTracker extends LuceneTestCase {
   public void testAdditionsAndDeletions() {

lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.util.fst;
+package org.apache.lucene.misc.util.fst;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,10 +30,12 @@ import org.apache.lucene.util.IntsRef;
 import org.apache.lucene.util.IntsRefBuilder;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.fst.UpToTwoPositiveIntOutputs.TwoLongs;
-
-import static org.apache.lucene.util.fst.FSTTester.getRandomString;
-import static org.apache.lucene.util.fst.FSTTester.toIntsRef;
+import org.apache.lucene.misc.util.fst.UpToTwoPositiveIntOutputs.TwoLongs;
+import org.apache.lucene.util.fst.FST;
+import org.apache.lucene.util.fst.FSTCompiler;
+import org.apache.lucene.util.fst.FSTTester;
+import org.apache.lucene.util.fst.PositiveIntOutputs;
+import org.apache.lucene.util.fst.Util;
 
 public class TestFSTsMisc extends LuceneTestCase {
 
@@ -68,8 +70,8 @@ public class TestFSTsMisc extends LuceneTestCase {
         Set<IntsRef> termsSet = new HashSet<>();
         IntsRef[] terms = new IntsRef[numWords];
         while(termsSet.size() < numWords) {
-          final String term = getRandomString(random);
-          termsSet.add(toIntsRef(term, inputMode));
+          final String term = FSTTester.getRandomString(random);
+          termsSet.add(FSTTester.toIntsRef(term, inputMode));
         }
         doTest(inputMode, termsSet.toArray(new IntsRef[termsSet.size()]));
       }

lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java

@@ -35,7 +35,8 @@ import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.store.Directory;
 
-class DocHelper {
+/** Helper functions for tests that handles documents */
+public class DocHelper {
   
   public static final FieldType customType;
   public static final String FIELD_1_TEXT = "field one text";

lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java

@@ -95,7 +95,11 @@ public class FSTTester<T> {
     return br;
   }
 
-  static String getRandomString(Random random) {
+  /**
+   * [LUCENE-9600] This was made public because a misc module test depends on it.
+   * It is not recommended for generic usecase; consider {@link com.carrotsearch.randomizedtesting.generators.RandomStrings} to generate random strings.
+   */
+  public static String getRandomString(Random random) {
     final String term;
     if (random.nextBoolean()) {
       term = TestUtil.randomRealisticUnicodeString(random);
@@ -121,7 +125,7 @@ public class FSTTester<T> {
     return new String(buffer, 0, end);
   }
 
-  static IntsRef toIntsRef(String s, int inputMode) {
+  public static IntsRef toIntsRef(String s, int inputMode) {
     return toIntsRef(s, inputMode, new IntsRefBuilder());
   }
 

solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java

@@ -791,7 +791,7 @@ public class RealTimeGetComponent extends SearchComponent
   }
 
   /**
-   * Ensure we don't have {@link org.apache.lucene.document.LazyDocument.LazyField} or equivalent.
+   * Ensure we don't have {@link org.apache.lucene.misc.document.LazyDocument.LazyField} or equivalent.
    * It can pose problems if the searcher is about to be closed and we haven't fetched a value yet.
    */
   private static IndexableField materialize(IndexableField in) {

solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java

@@ -41,7 +41,7 @@ import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.DocumentStoredFieldVisitor;
 import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.LazyDocument;
+import org.apache.lucene.misc.document.LazyDocument;
 import org.apache.lucene.document.StoredField;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.BinaryDocValues;

solr/core/src/java/org/apache/solr/search/similarities/LegacyBM25SimilarityFactory.java

@@ -17,7 +17,7 @@
 package org.apache.solr.search.similarities;
 
 import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.similarity.LegacyBM25Similarity;
+import org.apache.lucene.misc.search.similarity.LegacyBM25Similarity;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.schema.SimilarityFactory;
 

solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java

@@ -19,7 +19,7 @@ package org.apache.solr.search.similarities;
 import org.apache.lucene.search.similarities.BM25Similarity;
 import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
 import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.similarity.LegacyBM25Similarity;
+import org.apache.lucene.misc.search.similarity.LegacyBM25Similarity;
 import org.apache.lucene.util.Version;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;

solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java

@@ -50,7 +50,7 @@ import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Weight;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.HardlinkCopyDirectoryWrapper;
+import org.apache.lucene.misc.store.HardlinkCopyDirectoryWrapper;
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.Lock;
 import org.apache.lucene.util.BitSetIterator;

solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java

@@ -32,7 +32,7 @@ import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Metric;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.LazyDocument;
+import org.apache.lucene.misc.document.LazyDocument;
 import org.apache.lucene.index.IndexableField;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.CommonParams;

solr/core/src/test/org/apache/solr/search/LargeFieldTest.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.Collections;
 
 import org.apache.lucene.document.Document;
-import org.apache.lucene.document.LazyDocument;
+import org.apache.lucene.misc.document.LazyDocument;
 import org.apache.lucene.index.IndexableField;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.schema.IndexSchema;

solr/core/src/test/org/apache/solr/search/similarities/TestLegacyBM25SimilarityFactory.java

@@ -17,7 +17,7 @@
 package org.apache.solr.search.similarities;
 
 import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.similarity.LegacyBM25Similarity;
+import org.apache.lucene.misc.search.similarity.LegacyBM25Similarity;
 import org.junit.BeforeClass;
 
 /**