Apache Lucene open-source search software
Deprecated public constructor of FSTCompiler in favor of the Builder. (#12715)
Juan Manuel Caicedo Carvajaldf07febfe863
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex bc39d99f739..e936359daa5 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -7,6 +7,8 @@ http://s.apache.org/luceneversionsAPI Changes---------------------+* GITHUB-12695: Deprecated public constructor of FSTCompiler. Please use FSTCompiler.Builder+ instead. (Juan M. Caicedo)* LUCENE-12092: Remove deprecated UTF8TaxonomyWriterCache. Please use LruTaxonomyWriterCacheinstead. (Vigya Sharma)diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.javaindex 2d6ccd0ebb8..01baea12b01 100644--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java@@ -105,7 +105,8 @@ public class NormalizeCharMap {final FST<CharsRef> map;try {final Outputs<CharsRef> outputs = CharSequenceOutputs.getSingleton();- final FSTCompiler<CharsRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE2, outputs);+ final FSTCompiler<CharsRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE2, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();for (Map.Entry<String, String> ent : pendingPairs.entrySet()) {fstCompiler.add(Util.toUTF16(ent.getKey(), scratch), new CharsRef(ent.getValue()));diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ConvTable.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ConvTable.javaindex 6a87167e7e1..f22bee1db0d 100644--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ConvTable.java+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ConvTable.java@@ -40,7 +40,8 @@ class ConvTable {try {Outputs<CharsRef> outputs = CharSequenceOutputs.getSingleton();- FSTCompiler<CharsRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE2, outputs);+ FSTCompiler<CharsRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE2, outputs).build();IntsRefBuilder scratchInts = new IntsRefBuilder();for (Map.Entry<String, String> entry : mappings.entrySet()) {String key = entry.getKey();diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.javaindex 1811c3b9bc8..c197b16a7b7 100644--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java@@ -631,7 +631,8 @@ public class Dictionary {private FST<IntsRef> affixFST(TreeMap<String, List<Integer>> affixes) throws IOException {IntSequenceOutputs outputs = IntSequenceOutputs.getSingleton();- FSTCompiler<IntsRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE4, outputs);+ FSTCompiler<IntsRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE4, outputs).build();IntsRefBuilder scratch = new IntsRefBuilder();for (Map.Entry<String, List<Integer>> entry : affixes.entrySet()) {Util.toUTF32(entry.getKey(), scratch);diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.javaindex ad47d702f64..b46f8f8ff02 100644--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java@@ -210,7 +210,8 @@ public final class StemmerOverrideFilter extends TokenFilter {*/public StemmerOverrideMap build() throws IOException {ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();- FSTCompiler<BytesRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE4, outputs);+ FSTCompiler<BytesRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE4, outputs).build();final int[] sort = hash.sort();IntsRefBuilder intsSpare = new IntsRefBuilder();final int size = hash.size();diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.javaindex b92b9228860..22ba92ff555 100644--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java@@ -222,7 +222,8 @@ public class SynonymMap {public SynonymMap build() throws IOException {ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();// TODO: are we using the best sharing options?- FSTCompiler<BytesRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE4, outputs);+ FSTCompiler<BytesRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE4, outputs).build();BytesRefBuilder scratch = new BytesRefBuilder();ByteArrayDataOutput scratchOutput = new ByteArrayDataOutput();diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.javaindex 5a16db673ce..8afddb9ca96 100644--- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.java+++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.java@@ -101,7 +101,8 @@ class TokenInfoDictionaryBuilder {lines.sort(Comparator.comparing(entry -> entry[0]));PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE2, fstOutput);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE2, fstOutput).build();IntsRefBuilder scratch = new IntsRefBuilder();long ord = -1; // first ord will be 0String lastValue = null;diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.javaindex de69c726ee2..42807eed278 100644--- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java+++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java@@ -93,7 +93,8 @@ public final class UserDictionary implements Dictionary<UserMorphData> {List<int[]> segmentations = new ArrayList<>(featureEntries.size());PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE2, fstOutput);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE2, fstOutput).build();IntsRefBuilder scratch = new IntsRefBuilder();long ord = 0;diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.javaindex e3db26b08b8..f66abba8b3a 100644--- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.java+++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.java@@ -94,7 +94,8 @@ class TokenInfoDictionaryBuilder {lines.sort(Comparator.comparing(left -> left[0]));PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE2, fstOutput);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE2, fstOutput).build();IntsRefBuilder scratch = new IntsRefBuilder();long ord = -1; // first ord will be 0String lastValue = null;diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UserDictionary.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UserDictionary.javaindex 58a233112aa..4632edc8a21 100644--- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UserDictionary.java+++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UserDictionary.java@@ -75,7 +75,8 @@ public final class UserDictionary implements Dictionary<UserMorphData> {entries.sort(Comparator.comparing(e -> e.split("\\s+")[0]));PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE2, fstOutput);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE2, fstOutput).build();IntsRefBuilder scratch = new IntsRefBuilder();String lastToken = null;diff --git a/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.javaindex 4a8482c4fc7..280e82cc2c0 100644--- a/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java+++ b/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java@@ -207,7 +207,8 @@ public class BooleanPerceptronClassifier implements Classifier<Boolean> {private void updateFST(SortedMap<String, Double> weights) throws IOException {PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();BytesRefBuilder scratchBytes = new BytesRefBuilder();IntsRefBuilder scratchInts = new IntsRefBuilder();for (Map.Entry<String, Double> entry : weights.entrySet()) {diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.javaindex f15650670a1..04e3e80c71b 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java@@ -238,7 +238,7 @@ public class VariableGapTermsIndexWriter extends TermsIndexWriterBase {public FSTFieldWriter(FieldInfo fieldInfo, long termsFilePointer) throws IOException {this.fieldInfo = fieldInfo;fstOutputs = PositiveIntOutputs.getSingleton();- fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, fstOutputs);+ fstCompiler = new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, fstOutputs).build();indexStart = out.getFilePointer();//// System.out.println("VGW: field=" + fieldInfo.name);diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.javaindex b5722ace3d7..c8aa97cbab7 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java@@ -256,7 +256,7 @@ public class FSTTermsWriter extends FieldsConsumer {this.fieldInfo = fieldInfo;postingsWriter.setField(fieldInfo);this.outputs = new FSTTermOutputs(fieldInfo);- this.fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ this.fstCompiler = new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();}public void finishTerm(BytesRef text, BlockTermState state) throws IOException {diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.javaindex c5718753462..abfbdd25a02 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java@@ -683,7 +683,7 @@ class SimpleTextFieldsReader extends FieldsProducer {final PairOutputs<Long, Long> outputsInner = new PairOutputs<>(posIntOutputs, posIntOutputs);final PairOutputs<PairOutputs.Pair<Long, Long>, PairOutputs.Pair<Long, Long>> outputs =new PairOutputs<>(outputsOuter, outputsInner);- fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ fstCompiler = new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();IndexInput in = SimpleTextFieldsReader.this.in.clone();in.seek(termsStart);final BytesRefBuilder lastTerm = new BytesRefBuilder();diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/uniformsplit/FSTDictionary.java b/lucene/codecs/src/java/org/apache/lucene/codecs/uniformsplit/FSTDictionary.javaindex 7778a1e1816..7c394ca4824 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/uniformsplit/FSTDictionary.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/uniformsplit/FSTDictionary.java@@ -173,7 +173,7 @@ public class FSTDictionary implements IndexDictionary {public Builder() {PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ fstCompiler = new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();scratchInts = new IntsRefBuilder();}diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/FSTCompiler.java b/lucene/core/src/java/org/apache/lucene/util/fst/FSTCompiler.javaindex fe4316accfe..a8f20e925bb 100644--- a/lucene/core/src/java/org/apache/lucene/util/fst/FSTCompiler.java+++ b/lucene/core/src/java/org/apache/lucene/util/fst/FSTCompiler.java@@ -125,8 +125,11 @@ public class FSTCompiler<T> {/*** Instantiates an FST/FSA builder with default settings and pruning options turned off. For more* tuning and tweaking, see {@link Builder}.+ *+ * @deprecated Use FSTCompiler.Builder instead. This method will be removed in an upcoming major+ * release.*/- // TODO: remove this? Builder API should be the only entry point?+ @Deprecatedpublic FSTCompiler(FST.INPUT_TYPE inputType, Outputs<T> outputs) {this(inputType, 32.0, outputs, true, 15, 1f);}diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.javaindex eac2fae1ef4..d9205609d67 100644--- a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java+++ b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java@@ -59,7 +59,8 @@ public class Test2BFST extends LuceneTestCase {System.out.println("\nTEST: ~2.2B nodes; output=NO_OUTPUTS");Outputs<Object> outputs = NoOutputs.getSingleton();Object NO_OUTPUT = outputs.getNoOutput();- final FSTCompiler<Object> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Object> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();int count = 0;Random r = new Random(seed);@@ -153,7 +154,8 @@ public class Test2BFST extends LuceneTestCase {{System.out.println("\nTEST: 3 GB size; outputs=bytes");Outputs<BytesRef> outputs = ByteSequenceOutputs.getSingleton();- final FSTCompiler<BytesRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<BytesRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();byte[] outputBytes = new byte[20];BytesRef output = new BytesRef(outputBytes);@@ -239,7 +241,8 @@ public class Test2BFST extends LuceneTestCase {{System.out.println("\nTEST: 3 GB size; outputs=long");Outputs<Long> outputs = PositiveIntOutputs.getSingleton();- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();long output = 1;diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.javaindex 25da97763c4..188774014b9 100644--- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java+++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java@@ -769,7 +769,8 @@ public class TestFSTs extends LuceneTestCase {public void testSingleString() throws Exception {final Outputs<Object> outputs = NoOutputs.getSingleton();- final FSTCompiler<Object> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Object> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();fstCompiler.add(Util.toIntsRef(newBytesRef("foobar"), new IntsRefBuilder()), outputs.getNoOutput());final BytesRefFSTEnum<Object> fstEnum = new BytesRefFSTEnum<>(fstCompiler.compile());@@ -780,7 +781,8 @@ public class TestFSTs extends LuceneTestCase {public void testDuplicateFSAString() throws Exception {String str = "foobar";final Outputs<Object> outputs = NoOutputs.getSingleton();- final FSTCompiler<Object> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Object> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();IntsRefBuilder ints = new IntsRefBuilder();for (int i = 0; i < 10; i++) {fstCompiler.add(Util.toIntsRef(newBytesRef(str), ints), outputs.getNoOutput());@@ -849,7 +851,8 @@ public class TestFSTs extends LuceneTestCase {final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();// Build an FST mapping BytesRef -> Long- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final BytesRef a = newBytesRef("a");final BytesRef b = newBytesRef("b");@@ -1088,7 +1091,8 @@ public class TestFSTs extends LuceneTestCase {FST<Object> compile(String[] lines) throws IOException {final NoOutputs outputs = NoOutputs.getSingleton();final Object nothing = outputs.getNoOutput();- final FSTCompiler<Object> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Object> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();int line = 0;final BytesRefBuilder term = new BytesRefBuilder();@@ -1179,7 +1183,8 @@ public class TestFSTs extends LuceneTestCase {public void testInternalFinalState() throws Exception {final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();fstCompiler.add(Util.toIntsRef(newBytesRef("stat"), new IntsRefBuilder()), outputs.getNoOutput());fstCompiler.add(@@ -1201,7 +1206,8 @@ public class TestFSTs extends LuceneTestCase {// Make sure the FST can be saved and loaded with different DataOutput for metadatapublic void testSaveDifferentMetaOut() throws Exception {PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();// first build the FST from scratchfinal IntsRefBuilder scratch = new IntsRefBuilder();@@ -1243,7 +1249,8 @@ public class TestFSTs extends LuceneTestCase {public void testNonFinalStopNode() throws Exception {final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();final Long nothing = outputs.getNoOutput();- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final FST<Long> fst = fstCompiler.fst;final FSTCompiler.UnCompiledNode<Long> rootNode =@@ -1318,7 +1325,8 @@ public class TestFSTs extends LuceneTestCase {public void testShortestPaths() throws Exception {final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();fstCompiler.add(Util.toIntsRef(newBytesRef("aab"), scratch), 22L);@@ -1351,7 +1359,8 @@ public class TestFSTs extends LuceneTestCase {public void testRejectNoLimits() throws IOException {final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();fstCompiler.add(Util.toIntsRef(newBytesRef("aab"), scratch), 22L);@@ -1417,7 +1426,7 @@ public class TestFSTs extends LuceneTestCase {);final FSTCompiler<Pair<Long, Long>> fstCompiler =- new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();fstCompiler.add(Util.toIntsRef(newBytesRef("aab"), scratch), outputs.newPair(22L, 57L));@@ -1460,7 +1469,8 @@ public class TestFSTs extends LuceneTestCase {final TreeSet<String> allPrefixes = new TreeSet<>();final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- final FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();for (int i = 0; i < numWords; i++) {@@ -1582,7 +1592,7 @@ public class TestFSTs extends LuceneTestCase {PositiveIntOutputs.getSingleton() // output);final FSTCompiler<Pair<Long, Long>> fstCompiler =- new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();Random random = random();@@ -1671,7 +1681,8 @@ public class TestFSTs extends LuceneTestCase {public void testLargeOutputsOnArrayArcs() throws Exception {final ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();- final FSTCompiler<BytesRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<BytesRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final byte[] bytes = new byte[300];final IntsRefBuilder input = new IntsRefBuilder();@@ -1716,7 +1727,8 @@ public class TestFSTs extends LuceneTestCase {Collections.sort(termsList);ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();- FSTCompiler<BytesRef> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ FSTCompiler<BytesRef> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();IntsRefBuilder input = new IntsRefBuilder();for (BytesRef term : termsList) {@@ -1748,7 +1760,8 @@ public class TestFSTs extends LuceneTestCase {public void testSimpleDepth() throws Exception {PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();BytesRef ab = newBytesRef("ab");BytesRef ac = newBytesRef("ac");diff --git a/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.java b/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.javaindex 11786d276a4..9481db338a7 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.java@@ -134,7 +134,7 @@ public class KnnVectorDict implements Closeable {private final IntsRefBuilder intsRefBuilder = new IntsRefBuilder();private final FSTCompiler<Long> fstCompiler =- new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, PositiveIntOutputs.getSingleton());+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, PositiveIntOutputs.getSingleton()).build();private float[] scratch;private ByteBuffer byteBuffer;private long ordinal = 1;diff --git a/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java b/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.javaindex 7b318ce5089..2e991117ba1 100644--- a/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java+++ b/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java@@ -164,7 +164,8 @@ public class TestFSTsMisc extends LuceneTestCase {public void testListOfOutputs() throws Exception {PositiveIntOutputs _outputs = PositiveIntOutputs.getSingleton();ListOfOutputs<Long> outputs = new ListOfOutputs<>(_outputs);- final FSTCompiler<Object> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Object> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();// Add the same input more than once and the outputs@@ -193,7 +194,8 @@ public class TestFSTsMisc extends LuceneTestCase {public void testListOfOutputsEmptyString() throws Exception {PositiveIntOutputs _outputs = PositiveIntOutputs.getSingleton();ListOfOutputs<Long> outputs = new ListOfOutputs<>(_outputs);- final FSTCompiler<Object> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ final FSTCompiler<Object> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();final IntsRefBuilder scratch = new IntsRefBuilder();fstCompiler.add(scratch.get(), 0L);diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.javaindex ffba2c1abce..a3d61d5b74e 100644--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java@@ -499,7 +499,7 @@ public class AnalyzingSuggester extends Lookup {PairOutputs<Long, BytesRef> outputs =new PairOutputs<>(PositiveIntOutputs.getSingleton(), ByteSequenceOutputs.getSingleton());FSTCompiler<Pair<Long, BytesRef>> fstCompiler =- new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();// Build FST:BytesRefBuilder previousAnalyzed = null;diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.javaindex 7e147c8bfe3..af5dea88431 100644--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java@@ -295,7 +295,8 @@ public class FreeTextSuggester extends Lookup {TermsEnum termsEnum = terms.iterator();Outputs<Long> outputs = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();IntsRefBuilder scratchInts = new IntsRefBuilder();while (true) {diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.javaindex 3a8c2ed77a0..18960d1cd97 100644--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java@@ -59,7 +59,7 @@ final class NRTSuggesterBuilder {this.outputs =new PairOutputs<>(PositiveIntOutputs.getSingleton(), ByteSequenceOutputs.getSingleton());this.entries = new PriorityQueue<>();- this.fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ this.fstCompiler = new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();}/** Initializes an FST input term to add entries against */diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.javaindex 0e7999bdc96..e20ed2267ce 100644--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java@@ -108,7 +108,8 @@ public class WFSTCompletionLookup extends Lookup {IntsRefBuilder scratchInts = new IntsRefBuilder();BytesRefBuilder previous = null;PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();- FSTCompiler<Long> fstCompiler = new FSTCompiler<>(FST.INPUT_TYPE.BYTE1, outputs);+ FSTCompiler<Long> fstCompiler =+ new FSTCompiler.Builder<>(FST.INPUT_TYPE.BYTE1, outputs).build();while ((scratch = iter.next()) != null) {long cost = iter.weight();