Index: lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java =================================================================== --- lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (revision 1348347) +++ lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -206,9 +206,9 @@ Document doc = new Document(); String content = getContent(i); - doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE_STORED)); + doc.add(newTextField(rnd, "FIELD_1", content, Store.YES)); //add a different field - doc.add(newField(rnd, "different_field", "diff", TextField.TYPE_STORED)); + doc.add(newTextField(rnd, "different_field", "diff", Store.YES)); writer.addDocument(doc); } @@ -216,7 +216,7 @@ //highest freq terms for a specific field. for (int i = 1; i <= 10; i++) { Document doc = new Document(); - doc.add(newField(rnd, "different_field", "diff", TextField.TYPE_STORED)); + doc.add(newTextField(rnd, "different_field", "diff", Store.YES)); writer.addDocument(doc); } // add some docs where tf < df so we can see if sorting works @@ -227,7 +227,7 @@ for (int i = 0; i < highTF; i++) { content += "highTF "; } - doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE_STORED)); + doc.add(newTextField(rnd, "FIELD_1", content, Store.YES)); writer.addDocument(doc); // highTF medium df =5 int medium_df = 5; @@ -238,7 +238,7 @@ for (int j = 0; j < tf; j++) { newcontent += "highTFmedDF "; } - newdoc.add(newField(rnd, "FIELD_1", newcontent, TextField.TYPE_STORED)); + newdoc.add(newTextField(rnd, "FIELD_1", newcontent, Store.YES)); writer.addDocument(newdoc); } // add a doc with high tf in field different_field @@ -248,7 +248,7 @@ for (int i = 0; i < targetTF; i++) { content += "TF150 "; } - doc.add(newField(rnd, "different_field", content, TextField.TYPE_STORED)); + doc.add(newTextField(rnd, "different_field", content, Store.YES)); writer.addDocument(doc); writer.close(); Index: lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java =================================================================== --- lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (revision 1348347) +++ lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (working copy) @@ -18,8 +18,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; @@ -37,8 +36,8 @@ Document doc; for (int i = 0; i < NUM_DOCS; i++) { doc = new Document(); - doc.add(newField("id", i + "", StringField.TYPE_STORED)); - doc.add(newField("f", i + " " + i, TextField.TYPE_STORED)); + doc.add(newStringField("id", i + "", Store.YES)); + doc.add(newTextField("f", i + " " + i, Store.YES)); w.addDocument(doc); if (i%3==0) w.commit(); } Index: lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java =================================================================== --- lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (revision 1348347) +++ lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (working copy) @@ -23,8 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.util.Bits; @@ -104,15 +103,15 @@ StringBuilder sb = new StringBuilder(); Document doc = new Document(); String id = format.format(n); - doc.add(newField("id", id, StringField.TYPE_STORED)); - doc.add(newField("indexname", indexName, StringField.TYPE_STORED)); + doc.add(newStringField("id", id, Store.YES)); + doc.add(newStringField("indexname", indexName, Store.YES)); sb.append("a"); sb.append(n); - doc.add(newField("field1", sb.toString(), TextField.TYPE_STORED)); + doc.add(newTextField("field1", sb.toString(), Store.YES)); sb.append(" b"); sb.append(n); for (int i = 1; i < numFields; i++) { - doc.add(newField("field" + (i + 1), sb.toString(), TextField.TYPE_STORED)); + doc.add(newTextField("field" + (i + 1), sb.toString(), Store.YES)); } return doc; } Index: lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (revision 1348347) +++ lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; -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; @@ -139,7 +138,7 @@ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzerW).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); Index: lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (revision 1348347) +++ lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (working copy) @@ -37,6 +37,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.IntField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; @@ -1622,7 +1623,7 @@ private Document doc( String f, String v ){ Document doc = new Document(); - doc.add( new Field( f, v, TextField.TYPE_STORED)); + doc.add( new TextField( f, v, Store.YES)); return doc; } @@ -1775,7 +1776,7 @@ private void addDoc(IndexWriter writer, String text) throws IOException { Document d = new Document(); - Field f = new Field(FIELD_NAME, text, TextField.TYPE_STORED); + Field f = new TextField(FIELD_NAME, text, Store.YES); d.add(f); writer.addDocument(d); Index: lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (revision 1348347) +++ lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (working copy) @@ -60,7 +60,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -103,7 +103,7 @@ try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -174,7 +174,7 @@ try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -256,7 +256,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); Index: lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (revision 1348347) +++ lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (working copy) @@ -93,7 +93,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, new OverlappingTokenStream(), customType)); @@ -137,7 +137,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); @@ -182,7 +182,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, new OverlappingTokenStream(), customType)); @@ -227,7 +227,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, new OverlappingTokenStream(), customType)); Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (working copy) @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.RandomIndexWriter; @@ -462,7 +462,7 @@ private void addDoc(String text, RandomIndexWriter writer) throws IOException { Document doc = new Document(); - doc.add(newField("field", text, TextField.TYPE_STORED)); + doc.add(newTextField("field", text, Store.YES)); writer.addDocument(doc); } } Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (working copy) @@ -25,7 +25,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.index.TermsEnum; @@ -47,7 +46,7 @@ directory = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), directory); Document doc = new Document(); - doc.add(newField(FN, "the quick brown fox jumps over the lazy dog", TextField.TYPE_UNSTORED)); + doc.add(newTextField(FN, "the quick brown fox jumps over the lazy dog")); writer.addDocument(doc); reader = writer.getReader(); writer.close(); Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (working copy) @@ -17,24 +17,18 @@ * limitations under the License. */ -import java.io.IOException; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.FieldType; -import org.apache.lucene.document.TextField; -import org.apache.lucene.index.CorruptIndexException; 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.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.spans.SpanFirstQuery; import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.util.LuceneTestCase; public class TestSpanRegexQuery extends LuceneTestCase { @@ -65,10 +59,10 @@ // Field.Store.NO, Field.Index.ANALYZED)); // writer.addDocument(doc); // doc = new Document(); - doc.add(newField("field", "auto update", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "auto update")); writer.addDocument(doc); doc = new Document(); - doc.add(newField("field", "first auto update", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "first auto update")); writer.addDocument(doc); writer.forceMerge(1); writer.close(); Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (working copy) @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -93,7 +92,7 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)).setMergePolicy(newLogMergePolicy())); Document doc = new Document(); - Field field = newField("field", "", TextField.TYPE_UNSTORED); + Field field = newTextField("field", ""); doc.add(field); for (int i = 0; i < terms; i++) { Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (working copy) @@ -20,7 +20,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -69,8 +69,8 @@ private void addDoc(RandomIndexWriter writer, String name, String id) throws IOException { Document doc = new Document(); - doc.add(newField("name", name, TextField.TYPE_STORED)); - doc.add(newField("id", id, TextField.TYPE_STORED)); + doc.add(newTextField("name", name, Store.YES)); + doc.add(newTextField("id", id, Store.YES)); writer.addDocument(doc); } Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (working copy) @@ -6,7 +6,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.*; @@ -58,7 +58,7 @@ for (int i = 0; i < numDocs; i++) { Document doc = new Document(); String value = _TestUtil.randomUnicodeString(random()); - Field field = newField("field", value, StringField.TYPE_STORED); + Field field = newStringField("field", value, Store.YES); doc.add(field); iw.addDocument(doc); } Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (revision 1348347) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (working copy) @@ -22,8 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.*; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; @@ -76,9 +75,9 @@ private void addDoc(RandomIndexWriter writer, String url, String text, String date) throws IOException { Document doc = new Document(); - doc.add(newField(KEY_FIELD, url, StringField.TYPE_STORED)); - doc.add(newField("text", text, TextField.TYPE_STORED)); - doc.add(newField("date", date, TextField.TYPE_STORED)); + doc.add(newStringField(KEY_FIELD, url, Store.YES)); + doc.add(newTextField("text", text, Store.YES)); + doc.add(newTextField("date", date, Store.YES)); writer.addDocument(doc); } Index: lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (revision 1348347) +++ lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (working copy) @@ -29,6 +29,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -78,7 +79,7 @@ public static final String KEYWORD_FIELD_KEY = "keyField"; public static Field keyField; static { - keyField = new Field(KEYWORD_FIELD_KEY, KEYWORD_TEXT, StringField.TYPE_STORED); + keyField = new StringField(KEYWORD_FIELD_KEY, KEYWORD_TEXT, Store.YES); } public static final FieldType customType5; @@ -115,14 +116,14 @@ public static final String UNSTORED_1_FIELD_TEXT = "unstored field text"; public static final String UNSTORED_FIELD_1_KEY = "unStoredField1"; - public static Field unStoredField1 = new Field(UNSTORED_FIELD_1_KEY, UNSTORED_1_FIELD_TEXT, TextField.TYPE_UNSTORED); + public static Field unStoredField1 = new TextField(UNSTORED_FIELD_1_KEY, UNSTORED_1_FIELD_TEXT); public static final FieldType customType8; public static final String UNSTORED_2_FIELD_TEXT = "unstored field text"; public static final String UNSTORED_FIELD_2_KEY = "unStoredField2"; public static Field unStoredField2; static { - customType8 = new FieldType(TextField.TYPE_UNSTORED); + customType8 = new FieldType(TextField.TYPE); customType8.setStoreTermVectors(true); unStoredField2 = new Field(UNSTORED_FIELD_2_KEY, UNSTORED_2_FIELD_TEXT, customType8); } Index: lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (revision 1348347) +++ lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (working copy) @@ -29,8 +29,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; @@ -158,7 +157,7 @@ final String addedField; if (random().nextBoolean()) { addedField = "extra" + random().nextInt(40); - doc.add(newField(addedField, "a random field", TextField.TYPE_STORED)); + doc.add(newTextField(addedField, "a random field", Store.YES)); } else { addedField = null; } @@ -181,7 +180,7 @@ packID = packCount.getAndIncrement() + ""; } - final Field packIDField = newField("packID", packID, StringField.TYPE_STORED); + final Field packIDField = newStringField("packID", packID, Store.YES); final List docIDs = new ArrayList(); final SubDocs subDocs = new SubDocs(packID, docIDs); final List docsList = new ArrayList(); Index: lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (revision 1348347) +++ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (working copy) @@ -17,9 +17,6 @@ * limitations under the License. */ -import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsBoolean; -import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsInt; - import java.io.*; import java.lang.annotation.*; import java.lang.reflect.Constructor; @@ -30,6 +27,9 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; +import org.apache.lucene.document.StringField; +import org.apache.lucene.document.TextField; import org.apache.lucene.index.*; import org.apache.lucene.index.IndexReader.ReaderClosedListener; import org.apache.lucene.search.*; @@ -42,12 +42,14 @@ import org.junit.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.RunWith; - import com.carrotsearch.randomizedtesting.*; import com.carrotsearch.randomizedtesting.annotations.*; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.rules.SystemPropertiesInvariantRule; +import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsBoolean; +import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsInt; + /** * Base class for all Lucene unit tests, Junit3 or Junit4 variant. * @@ -841,6 +843,38 @@ } } + public static Field newStringField(String name, String value) { + return newField(random(), name, value, StringField.TYPE); + } + + public static Field newStringField(String name, String value, Store stored) { + return newField(random(), name, value, stored == Store.YES ? StringField.TYPE_STORED : StringField.TYPE); + } + + public static Field newTextField(String name, String value) { + return newField(random(), name, value, TextField.TYPE); + } + + public static Field newTextField(String name, String value, Store stored) { + return newField(random(), name, value, stored == Store.YES ? TextField.TYPE_STORED : TextField.TYPE); + } + + public static Field newStringField(Random random, String name, String value) { + return newField(random, name, value, StringField.TYPE); + } + + public static Field newStringField(Random random, String name, String value, Store stored) { + return newField(random, name, value, stored == Store.YES ? StringField.TYPE_STORED : StringField.TYPE); + } + + public static Field newTextField(Random random, String name, String value) { + return newField(random, name, value, TextField.TYPE); + } + + public static Field newTextField(Random random, String name, String value, Store stored) { + return newField(random, name, value, stored == Store.YES ? TextField.TYPE_STORED : TextField.TYPE); + } + public static Field newField(String name, String value, FieldType type) { return newField(random(), name, value, type); } Index: lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (revision 1348347) +++ lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (working copy) @@ -37,6 +37,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.SortedBytesDocValuesField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -176,10 +177,10 @@ body = new Field("body", "", ft); doc.add(body); - id = new Field("docid", "", StringField.TYPE_STORED); + id = new StringField("docid", "", Store.YES); doc.add(id); - date = new Field("date", "", StringField.TYPE_STORED); + date = new StringField("date", "", Store.YES); doc.add(date); if (useDocValues) { Index: lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java (revision 1348347) +++ lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java (working copy) @@ -27,6 +27,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; @@ -66,8 +67,8 @@ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED)); - doc.add(new Field("body", "body", StringField.TYPE_STORED)); + doc.add(new TextField("content", "\u0633\u0627\u0628", Store.YES)); + doc.add(new StringField("body", "body", Store.YES)); writer.addDocument(doc); writer.close(); IndexReader reader = DirectoryReader.open(dir); @@ -103,7 +104,7 @@ // orders the U+0698 character before the U+0633 character, so the single // index Term below should NOT be returned by a TermRangeQuery with a Farsi // Collator (or an Arabic one for the case when Farsi is not supported). - doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED)); + doc.add(new TextField("content", "\u0633\u0627\u0628", Store.YES)); writer.addDocument(doc); writer.close(); IndexReader reader = DirectoryReader.open(dir); @@ -127,8 +128,8 @@ IndexWriter writer = new IndexWriter(farsiIndex, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED)); - doc.add(new Field("body", "body", StringField.TYPE_STORED)); + doc.add(new TextField("content", "\u0633\u0627\u0628", Store.YES)); + doc.add(new StringField("body", "body", Store.YES)); writer.addDocument(doc); writer.close(); Index: lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (revision 1348347) +++ lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.BooleanClause; @@ -65,7 +65,7 @@ private void addDoc(RandomIndexWriter writer, String text) throws IOException { Document doc = new Document(); - doc.add(newField("text", text, TextField.TYPE_STORED)); + doc.add(newTextField("text", text, Store.YES)); writer.addDocument(doc); } Index: lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (revision 1348347) +++ lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (working copy) @@ -20,7 +20,7 @@ import java.util.HashSet; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; @@ -58,7 +58,7 @@ for (int i = 0; i < 100; i++) { Document doc = new Document(); int term = i * 10; //terms are units of 10; - doc.add(newField(fieldName, "" + term, StringField.TYPE_STORED)); + doc.add(newStringField(fieldName, "" + term, Store.YES)); w.addDocument(doc); } IndexReader reader = new SlowCompositeReaderWrapper(w.getReader()); @@ -92,7 +92,7 @@ Directory rd1 = newDirectory(); RandomIndexWriter w1 = new RandomIndexWriter(random(), rd1); Document doc = new Document(); - doc.add(newField(fieldName, "content1", StringField.TYPE_STORED)); + doc.add(newStringField(fieldName, "content1", Store.YES)); w1.addDocument(doc); IndexReader reader1 = w1.getReader(); w1.close(); @@ -101,7 +101,7 @@ Directory rd2 = newDirectory(); RandomIndexWriter w2 = new RandomIndexWriter(random(), rd2); doc = new Document(); - doc.add(newField(fieldName, "content2", StringField.TYPE_STORED)); + doc.add(newStringField(fieldName, "content2", Store.YES)); w2.addDocument(doc); IndexReader reader2 = w2.getReader(); w2.close(); Index: lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (revision 1348347) +++ lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (working copy) @@ -21,7 +21,7 @@ import java.util.GregorianCalendar; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -62,9 +62,9 @@ for (int i = 0; i < MAX; i++) { Document doc = new Document(); - doc.add(newField("key", "" + (i + 1), StringField.TYPE_STORED)); - doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", StringField.TYPE_STORED)); - doc.add(newField("date", cal.getTime().toString(), StringField.TYPE_STORED)); + doc.add(newStringField("key", "" + (i + 1), Store.YES)); + doc.add(newStringField("owner", (i < MAX / 2) ? "bob" : "sue", Store.YES)); + doc.add(newStringField("date", cal.getTime().toString(), Store.YES)); writer.addDocument(doc); cal.add(Calendar.DATE, 1); Index: lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (revision 1348347) +++ lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (working copy) @@ -20,7 +20,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; @@ -69,10 +69,10 @@ private void addDoc(RandomIndexWriter writer, String accessRights, String price, String date, String inStock) throws IOException { Document doc = new Document(); - doc.add(newField("accessRights", accessRights, TextField.TYPE_STORED)); - doc.add(newField("price", price, TextField.TYPE_STORED)); - doc.add(newField("date", date, TextField.TYPE_STORED)); - doc.add(newField("inStock", inStock, TextField.TYPE_STORED)); + doc.add(newTextField("accessRights", accessRights, Store.YES)); + doc.add(newTextField("price", price, Store.YES)); + doc.add(newTextField("date", date, Store.YES)); + doc.add(newTextField("inStock", inStock, Store.YES)); writer.addDocument(doc); } Index: lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (revision 1348347) +++ lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (working copy) @@ -135,7 +135,7 @@ f = newField(ID_FIELD, id2String(scoreAndID), customType); // for debug purposes d.add(f); - FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType2 = new FieldType(TextField.TYPE); customType2.setOmitNorms(true); f = newField(TEXT_FIELD, "text of doc" + scoreAndID + textLine(i), customType2); // for regular search d.add(f); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (working copy) @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.IntField; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -69,8 +69,8 @@ String date = line.substring(0, endOfDate).trim(); String content = line.substring(endOfDate).trim(); Document doc = new Document(); - doc.add(newField("date", date, TextField.TYPE_STORED)); - doc.add(newField("contents", content, TextField.TYPE_STORED)); + doc.add(newTextField("date", date, Store.YES)); + doc.add(newTextField("contents", content, Store.YES)); doc.add(new IntField("date2", Integer.valueOf(date))); writer.addDocument(doc); line = d.readLine(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (working copy) @@ -19,7 +19,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -129,7 +129,7 @@ String name = st.nextToken().trim(); if (st.hasMoreTokens()) { String value = st.nextToken().trim(); - result.add(newField(name, value, TextField.TYPE_STORED)); + result.add(newTextField(name, value, Store.YES)); } } return result; Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -120,8 +120,8 @@ IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); for (int i = 0; i < docsContent.length; i++) { Document doc = new Document(); - doc.add(newField("name", docsContent[i].name, TextField.TYPE_STORED)); - doc.add(newField("id", docsContent[i].id, TextField.TYPE_STORED)); + doc.add(newTextField("name", docsContent[i].name, Store.YES)); + doc.add(newTextField("id", docsContent[i].id, Store.YES)); w.addDocument(doc); } w.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -1111,7 +1110,7 @@ Analyzer a = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, a)); Document doc = new Document(); - doc.add(newField("f", "the wizard of ozzy", TextField.TYPE_UNSTORED)); + doc.add(newTextField("f", "the wizard of ozzy")); w.addDocument(doc); IndexReader r = DirectoryReader.open(w, true); w.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -283,7 +282,7 @@ Directory ramDir = newDirectory(); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(newField("body", "blah the footest blah", TextField.TYPE_UNSTORED)); + doc.add(newTextField("body", "blah the footest blah")); iw.addDocument(doc); iw.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (working copy) @@ -17,15 +17,12 @@ * limitations under the License. */ -import java.io.IOException; import java.io.Reader; -import java.io.StringReader; import java.util.HashMap; import java.util.Map; import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -322,7 +319,7 @@ Directory ramDir = newDirectory(); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(newField("body", "blah the footest blah", TextField.TYPE_UNSTORED)); + doc.add(newTextField("body", "blah the footest blah")); iw.addDocument(doc); iw.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (revision 1348347) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (working copy) @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.Reader; -import java.io.StringReader; import java.text.DateFormat; import java.util.Calendar; import java.util.Date; @@ -35,7 +34,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -1289,7 +1287,7 @@ Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new CannedAnalyzer())); Document doc = new Document(); - doc.add(newField("field", "", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "")); w.addDocument(doc); IndexReader r = DirectoryReader.open(w, true); IndexSearcher s = newSearcher(r); Index: lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java =================================================================== --- lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (revision 1348347) +++ lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (working copy) @@ -13,7 +13,7 @@ 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.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; @@ -263,7 +263,7 @@ CategoryDocumentBuilder builder = new CategoryDocumentBuilder(tw, iParams); builder.setCategoryPaths(categories); builder.build(d); - d.add(new Field("content", content, TextField.TYPE_STORED)); + d.add(new TextField("content", content, Store.YES)); iw.addDocument(d); } Index: lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java =================================================================== --- lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (revision 1348347) +++ lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (working copy) @@ -6,7 +6,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; @@ -328,7 +328,7 @@ cps.add(cp); Document d = new Document(); new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d); - d.add(new Field("content", "alpha", TextField.TYPE_STORED)); + d.add(new TextField("content", "alpha", Store.YES)); iw.addDocument(d); } Index: lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java =================================================================== --- lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (revision 1348347) +++ lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (working copy) @@ -6,11 +6,10 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; @@ -129,7 +128,7 @@ cps.add(cp); Document d = new Document(); new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d); - d.add(new Field("content", "alpha", TextField.TYPE_STORED)); + d.add(new TextField("content", "alpha", Store.YES)); iw.addDocument(d); } Index: lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (revision 1348347) +++ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.facet.taxonomy.CategoryPath; @@ -215,10 +216,10 @@ reader = null; - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setOmitNorms(true); parentStreamField = new Field(Consts.FIELD_PAYLOADS, parentStream, ft); - fullPathField = new Field(Consts.FULL, "", StringField.TYPE_STORED); + fullPathField = new StringField(Consts.FULL, "", Store.YES); this.nextID = indexWriter.maxDoc(); Index: lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (revision 1348347) +++ lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (working copy) @@ -184,7 +184,7 @@ // Finally creating a suitable field with stream and adding it to a // master field-list, used during the build process (see // super.build()) - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setOmitNorms(true); fieldList.add(new Field(e.getKey(), stream, ft)); } Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java =================================================================== --- lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (revision 1348347) +++ lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (working copy) @@ -4,7 +4,7 @@ import java.util.List; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -69,7 +69,7 @@ // create a plain Lucene document and add some regular Lucene fields to it Document doc = new Document(); - doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE_STORED)); + doc.add(new TextField(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], Store.YES)); doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum])); // invoke the category document builder for adding categories to the document and, Index: lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java =================================================================== --- lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (revision 1348347) +++ lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (working copy) @@ -5,7 +5,7 @@ import java.util.Random; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -172,7 +172,7 @@ // create a plain Lucene document and add some regular Lucene fields // to it Document doc = new Document(); - doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], TextField.TYPE_STORED)); + doc.add(new TextField(SimpleUtils.TITLE, docTitles[docNum], Store.YES)); doc.add(new TextField(SimpleUtils.TEXT, docTexts[docNum])); // finally add the document to the index Index: lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java =================================================================== --- lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (revision 1348347) +++ lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (working copy) @@ -1,7 +1,7 @@ package org.apache.lucene.facet.example.association; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -93,7 +93,7 @@ // create a plain Lucene document and add some regular Lucene fields // to it Document doc = new Document(); - doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE_STORED)); + doc.add(new TextField(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], Store.YES)); doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum])); // invoke the category document builder for adding categories to the Index: lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java =================================================================== --- lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (revision 1348347) +++ lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.LongField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; @@ -174,7 +175,7 @@ // field that is indexed (i.e. searchable), but don't tokenize // the field into separate words and don't index term frequency // or positional information: - Field pathField = new Field("path", file.getPath(), StringField.TYPE_STORED); + Field pathField = new StringField("path", file.getPath(), Store.YES); doc.add(pathField); // Add the last modified date of the file a field named "modified". Index: lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java =================================================================== --- lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java (working copy) @@ -20,11 +20,11 @@ import java.io.File; import java.io.IOException; +import org.apache.lucene.document.Store; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -57,7 +57,7 @@ Document doc = null; for (int i = 0; i < docsToAdd; i++) { doc = new Document(); - doc.add(newField("content", English.intToEnglish(i).trim(), StringField.TYPE_STORED)); + doc.add(newStringField("content", English.intToEnglish(i).trim(), Store.YES)); writer.addDocument(doc); } assertEquals(docsToAdd, writer.maxDoc()); @@ -116,7 +116,7 @@ public void run() { for (int j=1; j> docs = new ArrayList>(); Document d = new Document(); - Field f = newField("f", "", TextField.TYPE_UNSTORED); + Field f = newTextField("f", ""); d.add(f); Random r = random(); Index: lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java (working copy) @@ -38,8 +38,8 @@ Directory store = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), store, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy())); - Field f1 = newField("field", "word", TextField.TYPE_STORED); - Field f2 = newField("field", "word", TextField.TYPE_STORED); + Field f1 = newTextField("field", "word", Store.YES); + Field f2 = newTextField("field", "word", Store.YES); f2.setBoost(2.0f); Document d1 = new Document(); Index: lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (working copy) @@ -24,10 +24,8 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -66,7 +64,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)) .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000))); Document doc = new Document(); - Field field = newField(fieldName, "", StringField.TYPE_UNSTORED); + Field field = newStringField(fieldName, ""); doc.add(field); List terms = new ArrayList(); int num = atLeast(200); Index: lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -99,7 +99,7 @@ private void addDoc(String text, IndexWriter iw, float boost) throws IOException { Document doc = new Document(); - Field f = newField("key", text, TextField.TYPE_STORED); + Field f = newTextField("key", text, Store.YES); f.setBoost(boost); doc.add(f); iw.addDocument(doc); Index: lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; import org.junit.Test; @@ -529,8 +528,8 @@ for (int d = -20; d <= 20; d++) { Document doc = new Document(); - doc.add(newField("id",Integer.toString(d), StringField.TYPE_UNSTORED)); - doc.add(newField("body","body", StringField.TYPE_UNSTORED)); + doc.add(newStringField("id", Integer.toString(d))); + doc.add(newStringField("body", "body")); writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (working copy) @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Norm; @@ -35,7 +35,6 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.DefaultSimilarity; -import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanNearQuery; import org.apache.lucene.search.spans.SpanTermQuery; @@ -114,9 +113,9 @@ //writer.infoStream = System.out; for (int i = 0; i < 1000; i++) { Document doc = new Document(); - doc.add(newField("field", English.intToEnglish(i), TextField.TYPE_STORED)); + doc.add(newTextField("field", English.intToEnglish(i), Store.YES)); String txt = English.intToEnglish(i) +' '+English.intToEnglish(i+1); - doc.add(newField("field2", txt, TextField.TYPE_STORED)); + doc.add(newTextField("field2", txt, Store.YES)); writer.addDocument(doc); } reader = writer.getReader(); Index: lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (working copy) @@ -17,6 +17,7 @@ */ import org.apache.lucene.analysis.*; +import org.apache.lucene.document.Store; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.English; @@ -44,7 +45,6 @@ import org.apache.lucene.document.Field; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.apache.lucene.document.TextField; import java.io.Reader; import java.io.IOException; @@ -124,11 +124,11 @@ //writer.infoStream = System.out; for (int i = 0; i < 1000; i++) { Document doc = new Document(); - Field noPayloadField = newField(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i), TextField.TYPE_STORED); + Field noPayloadField = newTextField(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i), Store.YES); //noPayloadField.setBoost(0); doc.add(noPayloadField); - doc.add(newField("field", English.intToEnglish(i), TextField.TYPE_STORED)); - doc.add(newField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), TextField.TYPE_STORED)); + doc.add(newTextField("field", English.intToEnglish(i), Store.YES)); + doc.add(newTextField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), Store.YES)); writer.addDocument(doc); } reader = writer.getReader(); Index: lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (working copy) @@ -19,11 +19,11 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.document.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.English; @@ -126,9 +126,9 @@ // writer.infoStream = System.out; for (int i = 0; i < numDocs; i++) { Document doc = new Document(); - doc.add(new Field(FIELD, English.intToEnglish(i), TextField.TYPE_STORED)); - doc.add(new Field(MULTI_FIELD, English.intToEnglish(i) + " " + English.intToEnglish(i), TextField.TYPE_STORED)); - doc.add(new Field(NO_PAYLOAD_FIELD, English.intToEnglish(i), TextField.TYPE_STORED)); + doc.add(new TextField(FIELD, English.intToEnglish(i), Store.YES)); + doc.add(new TextField(MULTI_FIELD, English.intToEnglish(i) + " " + English.intToEnglish(i), Store.YES)); + doc.add(new TextField(NO_PAYLOAD_FIELD, English.intToEnglish(i), Store.YES)); writer.addDocument(doc); } reader = DirectoryReader.open(writer, true); Index: lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (working copy) @@ -21,7 +21,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.RandomIndexWriter; @@ -48,9 +47,9 @@ directory = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), directory); Document doc = new Document(); - Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED); - Field field = newField(FN, "this is document one 2345", TextField.TYPE_UNSTORED); - Field footerField = newField("footer", "a footer", TextField.TYPE_UNSTORED); + Field titleField = newTextField("title", "some title"); + Field field = newTextField(FN, "this is document one 2345"); + Field footerField = newTextField("footer", "a footer"); doc.add(titleField); doc.add(field); doc.add(footerField); Index: lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -304,7 +304,7 @@ final NRTManager.TrackingIndexWriter writer = new NRTManager.TrackingIndexWriter(_writer); final NRTManager manager = new NRTManager(writer, null, false); Document doc = new Document(); - doc.add(newField("test","test", TextField.TYPE_STORED)); + doc.add(newTextField("test", "test", Store.YES)); long gen = writer.addDocument(doc); manager.maybeRefresh(); assertFalse(gen < manager.getCurrentSearchingGen()); Index: lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java (working copy) @@ -16,7 +16,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -70,7 +69,7 @@ Document d = new Document(); for (int j=0; j(); Index: lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java (working copy) @@ -40,7 +40,7 @@ Directory dir = newDirectory(); RandomIndexWriter w = new RandomIndexWriter(random(), dir); Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS); Field f = newField("foo", "this is a test test", ft); doc.add(f); @@ -71,7 +71,7 @@ Document d = new Document(); // f1,f2,f3: docs only - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_ONLY); Field f1 = newField("f1", "This field has docs only", ft); @@ -83,7 +83,7 @@ Field f3 = newField("f3", "This field has docs only", ft); d.add(f3); - FieldType ft2 = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft2 = new FieldType(TextField.TYPE); ft2.setIndexOptions(IndexOptions.DOCS_AND_FREQS); // f4,f5,f6 docs and freqs @@ -96,7 +96,7 @@ Field f6 = newField("f6", "This field has docs and freqs", ft2); d.add(f6); - FieldType ft3 = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft3 = new FieldType(TextField.TYPE); ft3.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS); // f7,f8,f9 docs/freqs/positions @@ -197,7 +197,7 @@ lmp.setUseCompoundFile(false); Document d = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS); Field f1 = newField("f1", "This field has term freqs", ft); d.add(f1); @@ -211,7 +211,7 @@ // now add some documents with positions, and check there is no prox after optimization d = new Document(); - f1 = newField("f1", "This field has positions", TextField.TYPE_UNSTORED); + f1 = newTextField("f1", "This field has positions"); d.add(f1); for(int i=0;i<30;i++) Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; @@ -92,7 +91,7 @@ Random random = LuceneTestCase.random(); try { Document doc = new Document(); - doc.add(new Field("id", "1", TextField.TYPE_UNSTORED)); + doc.add(new TextField("id", "1")); writer.addDocument(doc); holder.reader = currentReader = writer.getReader(true); Term term = new Term("id"); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (working copy) @@ -29,8 +29,8 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; @@ -58,10 +58,10 @@ custom1.setStored(true); for (int i = 0; i < keywords.length; i++) { Document doc = new Document(); - doc.add(newField("id", keywords[i], StringField.TYPE_STORED)); + doc.add(newStringField("id", keywords[i], Store.YES)); doc.add(newField("country", unindexed[i], custom1)); - doc.add(newField("contents", unstored[i], TextField.TYPE_UNSTORED)); - doc.add(newField("city", text[i], TextField.TYPE_STORED)); + doc.add(newTextField("contents", unstored[i])); + doc.add(newTextField("city", text[i], Store.YES)); modifier.addDocument(doc); } modifier.forceMerge(1); @@ -383,9 +383,9 @@ private void updateDoc(IndexWriter modifier, int id, int value) throws IOException { Document doc = new Document(); - doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED)); - doc.add(newField("id", String.valueOf(id), StringField.TYPE_STORED)); - doc.add(newField("value", String.valueOf(value), StringField.TYPE_UNSTORED)); + doc.add(newTextField("content", "aaa")); + doc.add(newStringField("id", String.valueOf(id), Store.YES)); + doc.add(newStringField("value", String.valueOf(value))); modifier.updateDocument(new Term("id", String.valueOf(id)), doc); } @@ -393,9 +393,9 @@ private void addDoc(IndexWriter modifier, int id, int value) throws IOException { Document doc = new Document(); - doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED)); - doc.add(newField("id", String.valueOf(id), StringField.TYPE_STORED)); - doc.add(newField("value", String.valueOf(value), StringField.TYPE_UNSTORED)); + doc.add(newTextField("content", "aaa")); + doc.add(newStringField("id", String.valueOf(id), Store.YES)); + doc.add(newStringField("value", String.valueOf(value))); modifier.addDocument(doc); } @@ -432,8 +432,8 @@ IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); for (int i = 0; i < 157; i++) { Document d = new Document(); - d.add(newField("id", Integer.toString(i), StringField.TYPE_STORED)); - d.add(newField("content", "aaa " + i, TextField.TYPE_UNSTORED)); + d.add(newStringField("id", Integer.toString(i), Store.YES)); + d.add(newTextField("content", "aaa " + i)); writer.addDocument(d); } writer.close(); @@ -510,8 +510,8 @@ for (int i = 0; i < 13; i++) { if (updates) { Document d = new Document(); - d.add(newField("id", Integer.toString(i), StringField.TYPE_STORED)); - d.add(newField("content", "bbb " + i, TextField.TYPE_UNSTORED)); + d.add(newStringField("id", Integer.toString(i), Store.YES)); + d.add(newTextField("content", "bbb " + i)); modifier.updateDocument(new Term("id", Integer.toString(docId)), d); } else { // deletes modifier.deleteDocuments(new Term("id", Integer.toString(docId))); @@ -702,10 +702,10 @@ custom1.setStored(true); for (int i = 0; i < keywords.length; i++) { Document doc = new Document(); - doc.add(newField("id", keywords[i], StringField.TYPE_STORED)); + doc.add(newStringField("id", keywords[i], Store.YES)); doc.add(newField("country", unindexed[i], custom1)); - doc.add(newField("contents", unstored[i], TextField.TYPE_UNSTORED)); - doc.add(newField("city", text[i], TextField.TYPE_STORED)); + doc.add(newTextField("contents", unstored[i])); + doc.add(newTextField("city", text[i], Store.YES)); modifier.addDocument(doc); } // flush (and commit if ac) @@ -823,10 +823,10 @@ custom1.setStored(true); for (int i = 0; i < keywords.length; i++) { Document doc = new Document(); - doc.add(newField("id", keywords[i], StringField.TYPE_STORED)); + doc.add(newStringField("id", keywords[i], Store.YES)); doc.add(newField("country", unindexed[i], custom1)); - doc.add(newField("contents", unstored[i], TextField.TYPE_UNSTORED)); - doc.add(newField("city", text[i], TextField.TYPE_STORED)); + doc.add(newTextField("contents", unstored[i])); + doc.add(newTextField("city", text[i], Store.YES)); try { modifier.addDocument(doc); } catch (IOException io) { @@ -869,7 +869,7 @@ Collections.shuffle(ids, random()); for(int id : ids) { Document doc = new Document(); - doc.add(newField("id", ""+id, StringField.TYPE_UNSTORED)); + doc.add(newStringField("id", ""+id)); w.addDocument(doc); } Collections.shuffle(ids, random()); @@ -905,7 +905,7 @@ }; IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, analyzer).setRAMBufferSizeMB(1.0).setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH).setMaxBufferedDeleteTerms(IndexWriterConfig.DISABLE_AUTO_FLUSH)); Document doc = new Document(); - doc.add(newField("field", "go 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "go 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20")); int num = atLeast(3); for (int iter = 0; iter < num; iter++) { int count = 0; @@ -1050,8 +1050,8 @@ w.deleteDocuments(new Term("id", "0")); } Document doc = new Document(); - doc.add(newField("id", ""+id, StringField.TYPE_UNSTORED)); - doc.add(newField("body", sb.toString(), TextField.TYPE_UNSTORED)); + doc.add(newStringField("id", ""+id)); + doc.add(newTextField("body", sb.toString())); w.updateDocument(new Term("id", ""+id), doc); docsInSegment.incrementAndGet(); // TODO: fix this test Index: lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (working copy) @@ -34,6 +34,7 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.IntField; import org.apache.lucene.document.LongField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.FieldInfo.IndexOptions; @@ -51,7 +52,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util._TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -558,7 +558,7 @@ { Document doc = new Document(); doc.add(new TextField("content", "aaa")); - doc.add(new Field("id", Integer.toString(id), StringField.TYPE_STORED)); + doc.add(new StringField("id", Integer.toString(id), Store.YES)); FieldType customType2 = new FieldType(TextField.TYPE_STORED); customType2.setStoreTermVectors(true); customType2.setStoreTermVectorPositions(true); Index: lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; @@ -123,7 +123,7 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document d3 = new Document(); - d3.add(newField("f3", "v1", TextField.TYPE_STORED)); + d3.add(newTextField("f3", "v1", Store.YES)); w2.addDocument(d3); w2.close(); @@ -297,28 +297,28 @@ dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newTextField("f1", "v1", Store.YES)); + d1.add(newTextField("f2", "v1", Store.YES)); + d1.add(newTextField("f3", "v1", Store.YES)); + d1.add(newTextField("f4", "v1", Store.YES)); w.addDocument(d1); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newTextField("f1", "v2", Store.YES)); + d2.add(newTextField("f2", "v2", Store.YES)); + d2.add(newTextField("f3", "v2", Store.YES)); + d2.add(newTextField("f4", "v2", Store.YES)); w.addDocument(d2); Document d3 = new Document(); - d3.add(newField("f1", "v3", TextField.TYPE_STORED)); - d3.add(newField("f2", "v3", TextField.TYPE_STORED)); - d3.add(newField("f3", "v3", TextField.TYPE_STORED)); - d3.add(newField("f4", "v3", TextField.TYPE_STORED)); + d3.add(newTextField("f1", "v3", Store.YES)); + d3.add(newTextField("f2", "v3", Store.YES)); + d3.add(newTextField("f3", "v3", Store.YES)); + d3.add(newTextField("f4", "v3", Store.YES)); w.addDocument(d3); Document d4 = new Document(); - d4.add(newField("f1", "v4", TextField.TYPE_STORED)); - d4.add(newField("f2", "v4", TextField.TYPE_STORED)); - d4.add(newField("f3", "v4", TextField.TYPE_STORED)); - d4.add(newField("f4", "v4", TextField.TYPE_STORED)); + d4.add(newTextField("f1", "v4", Store.YES)); + d4.add(newTextField("f2", "v4", Store.YES)); + d4.add(newTextField("f3", "v4", Store.YES)); + d4.add(newTextField("f4", "v4", Store.YES)); w.addDocument(d4); w.close(); @@ -357,22 +357,22 @@ IndexWriter w1 = new IndexWriter(dir1, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); + d1.add(newTextField("f1", "v1", Store.YES)); + d1.add(newTextField("f2", "v1", Store.YES)); w1.addDocument(d1); w1.commit(); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); + d2.add(newTextField("f1", "v2", Store.YES)); + d2.add(newTextField("f2", "v2", Store.YES)); w1.addDocument(d2); Document d3 = new Document(); - d3.add(newField("f1", "v3", TextField.TYPE_STORED)); - d3.add(newField("f2", "v3", TextField.TYPE_STORED)); + d3.add(newTextField("f1", "v3", Store.YES)); + d3.add(newTextField("f2", "v3", Store.YES)); w1.addDocument(d3); w1.commit(); Document d4 = new Document(); - d4.add(newField("f1", "v4", TextField.TYPE_STORED)); - d4.add(newField("f2", "v4", TextField.TYPE_STORED)); + d4.add(newTextField("f1", "v4", Store.YES)); + d4.add(newTextField("f2", "v4", Store.YES)); w1.addDocument(d4); w1.close(); return dir1; @@ -384,22 +384,22 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)); Document d1 = new Document(); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newTextField("f3", "v1", Store.YES)); + d1.add(newTextField("f4", "v1", Store.YES)); w2.addDocument(d1); w2.commit(); Document d2 = new Document(); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newTextField("f3", "v2", Store.YES)); + d2.add(newTextField("f4", "v2", Store.YES)); w2.addDocument(d2); Document d3 = new Document(); - d3.add(newField("f3", "v3", TextField.TYPE_STORED)); - d3.add(newField("f4", "v3", TextField.TYPE_STORED)); + d3.add(newTextField("f3", "v3", Store.YES)); + d3.add(newTextField("f4", "v3", Store.YES)); w2.addDocument(d3); w2.commit(); Document d4 = new Document(); - d4.add(newField("f3", "v4", TextField.TYPE_STORED)); - d4.add(newField("f4", "v4", TextField.TYPE_STORED)); + d4.add(newTextField("f3", "v4", Store.YES)); + d4.add(newTextField("f4", "v4", Store.YES)); w2.addDocument(d4); w2.close(); return dir2; @@ -411,22 +411,22 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)); Document d1 = new Document(); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newTextField("f3", "v1", Store.YES)); + d1.add(newTextField("f4", "v1", Store.YES)); w2.addDocument(d1); w2.commit(); Document d2 = new Document(); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newTextField("f3", "v2", Store.YES)); + d2.add(newTextField("f4", "v2", Store.YES)); w2.addDocument(d2); w2.commit(); Document d3 = new Document(); - d3.add(newField("f3", "v3", TextField.TYPE_STORED)); - d3.add(newField("f4", "v3", TextField.TYPE_STORED)); + d3.add(newTextField("f3", "v3", Store.YES)); + d3.add(newTextField("f4", "v3", Store.YES)); w2.addDocument(d3); Document d4 = new Document(); - d4.add(newField("f3", "v4", TextField.TYPE_STORED)); - d4.add(newField("f4", "v4", TextField.TYPE_STORED)); + d4.add(newTextField("f3", "v4", Store.YES)); + d4.add(newTextField("f4", "v4", Store.YES)); w2.addDocument(d4); w2.close(); return dir2; Index: lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (working copy) @@ -33,6 +33,7 @@ import org.apache.lucene.document.PackedLongDocValuesField; import org.apache.lucene.document.ShortDocValuesField; import org.apache.lucene.document.SortedBytesDocValuesField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StraightBytesDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -121,7 +122,7 @@ Directory d1 = newDirectory(); RandomIndexWriter w = new RandomIndexWriter(random(), d1); Document doc = new Document(); - doc.add(newField("id", "1", StringField.TYPE_STORED)); + doc.add(newStringField("id", "1", Store.YES)); doc.add(new PackedLongDocValuesField("dv", 1)); w.addDocument(doc); IndexReader r1 = w.getReader(); @@ -130,7 +131,7 @@ Directory d2 = newDirectory(); w = new RandomIndexWriter(random(), d2); doc = new Document(); - doc.add(newField("id", "2", StringField.TYPE_STORED)); + doc.add(newStringField("id", "2", Store.YES)); doc.add(new PackedLongDocValuesField("dv", 2)); w.addDocument(doc); IndexReader r2 = w.getReader(); @@ -700,7 +701,7 @@ } } doc.removeFields("id"); - doc.add(new Field("id", idBase + i, StringField.TYPE_STORED)); + doc.add(new StringField("id", idBase + i, Store.YES)); w.addDocument(doc); if (i % 7 == 0) { @@ -796,7 +797,7 @@ int len = 1 + random().nextInt(50); for (int i = 0; i < numDocs; i++) { Document doc = new Document(); - doc.add(newField("id", "" + i, TextField.TYPE_STORED)); + doc.add(newTextField("id", "" + i, Store.YES)); String string = fixed ? _TestUtil.randomFixedByteLengthUnicodeString(random(), len) : _TestUtil.randomRealisticUnicodeString(random(), 1, len); BytesRef br = new BytesRef(string); @@ -811,7 +812,7 @@ int numDocsNoValue = atLeast(10); for (int i = 0; i < numDocsNoValue; i++) { Document doc = new Document(); - doc.add(newField("id", "noValue", TextField.TYPE_STORED)); + doc.add(newTextField("id", "noValue", Store.YES)); w.addDocument(doc); } BytesRef bytesRef = new BytesRef(fixed ? len : 0); @@ -824,7 +825,7 @@ for (int i = 0; i < numDocs; i++) { Document doc = new Document(); String id = "" + i + numDocs; - doc.add(newField("id", id, TextField.TYPE_STORED)); + doc.add(newTextField("id", id, Store.YES)); String string = fixed ? _TestUtil.randomFixedByteLengthUnicodeString(random(), len) : _TestUtil.randomRealisticUnicodeString(random(), 1, len); BytesRef br = new BytesRef(string); Index: lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (working copy) @@ -20,7 +20,6 @@ import java.io.IOException; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; @@ -36,7 +35,7 @@ for (int i = 0; i < numDocs; i++) { Document doc = new Document(); if (withID) { - doc.add(new Field("id", "" + i, StringField.TYPE_UNSTORED)); + doc.add(new StringField("id", "" + i)); } writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (working copy) @@ -27,7 +27,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util._TestUtil; /** * Some tests for {@link ParallelAtomicReader}s with empty indexes @@ -94,14 +93,14 @@ } IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - Field idField = newField("id", "", TextField.TYPE_UNSTORED); + Field idField = newTextField("id", ""); doc.add(idField); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); doc.add(newField("test", "", customType)); idField.setStringValue("1"); iw.addDocument(doc); - doc.add(newField("test", "", TextField.TYPE_UNSTORED)); + doc.add(newTextField("test", "")); idField.setStringValue("2"); iw.addDocument(doc); iw.close(); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.AlreadyClosedException; @@ -477,7 +478,7 @@ public void run() { try { Document doc = new Document(); - Field field = newField("field", "testData", TextField.TYPE_STORED); + Field field = newTextField("field", "testData", Store.YES); doc.add(field); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Index: lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; @@ -122,7 +122,7 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document d3 = new Document(); - d3.add(newField("f3", "v1", TextField.TYPE_STORED)); + d3.add(newTextField("f3", "v1", Store.YES)); w2.addDocument(d3); w2.close(); @@ -238,16 +238,16 @@ dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newTextField("f1", "v1", Store.YES)); + d1.add(newTextField("f2", "v1", Store.YES)); + d1.add(newTextField("f3", "v1", Store.YES)); + d1.add(newTextField("f4", "v1", Store.YES)); w.addDocument(d1); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newTextField("f1", "v2", Store.YES)); + d2.add(newTextField("f2", "v2", Store.YES)); + d2.add(newTextField("f3", "v2", Store.YES)); + d2.add(newTextField("f4", "v2", Store.YES)); w.addDocument(d2); w.close(); @@ -269,12 +269,12 @@ Directory dir1 = newDirectory(); IndexWriter w1 = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); + d1.add(newTextField("f1", "v1", Store.YES)); + d1.add(newTextField("f2", "v1", Store.YES)); w1.addDocument(d1); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); + d2.add(newTextField("f1", "v2", Store.YES)); + d2.add(newTextField("f2", "v2", Store.YES)); w1.addDocument(d2); w1.close(); return dir1; @@ -284,12 +284,12 @@ Directory dir2 = newDirectory(); IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d3 = new Document(); - d3.add(newField("f3", "v1", TextField.TYPE_STORED)); - d3.add(newField("f4", "v1", TextField.TYPE_STORED)); + d3.add(newTextField("f3", "v1", Store.YES)); + d3.add(newTextField("f4", "v1", Store.YES)); w2.addDocument(d3); Document d4 = new Document(); - d4.add(newField("f3", "v2", TextField.TYPE_STORED)); - d4.add(newField("f4", "v2", TextField.TYPE_STORED)); + d4.add(newTextField("f3", "v2", Store.YES)); + d4.add(newTextField("f4", "v2", Store.YES)); w2.addDocument(d4); w2.close(); return dir2; Index: lucene/core/src/test/org/apache/lucene/index/TestCrash.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestCrash.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestCrash.java (working copy) @@ -25,7 +25,6 @@ import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; public class TestCrash extends LuceneTestCase { @@ -44,8 +43,8 @@ } Document doc = new Document(); - doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED)); - doc.add(newField("id", "0", TextField.TYPE_UNSTORED)); + doc.add(newTextField("content", "aaa")); + doc.add(newTextField("id", "0")); for(int i=0;i<157;i++) writer.addDocument(doc); Index: lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (working copy) @@ -61,7 +61,7 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc); Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setIndexOptions(FieldInfo.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS); if (random().nextBoolean()) { ft.setStoreTermVectors(true); @@ -224,7 +224,7 @@ final int numDocs = atLeast(20); //final int numDocs = atLeast(5); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); // TODO: randomize what IndexOptions we use; also test // changing this up in one IW buffered segment...: Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (working copy) @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; @@ -34,7 +33,7 @@ MockDirectoryWrapper dir = newDirectory(); final Document doc = new Document(); - doc.add(newField("content", "aaa", StringField.TYPE_UNSTORED)); + doc.add(newStringField("content", "aaa")); final int incrMin = TEST_NIGHTLY ? 15 : 40; for(int numDocs=10;numDocs<500;numDocs += _TestUtil.nextInt(random(), incrMin, 5*incrMin)) { LogDocMergePolicy ldmp = new LogDocMergePolicy(); @@ -75,7 +74,7 @@ MockDirectoryWrapper dir = newDirectory(); final Document doc = new Document(); - doc.add(newField("content", "aaa", StringField.TYPE_UNSTORED)); + doc.add(newStringField("content", "aaa")); LogDocMergePolicy ldmp = new LogDocMergePolicy(); ldmp.setMinMergeDocs(1); @@ -179,7 +178,7 @@ setMergePolicy(newLogMergePolicy(51)) ); Document doc = new Document(); - doc.add(newField("field", "aaa", StringField.TYPE_UNSTORED)); + doc.add(newStringField("field", "aaa")); for(int i=0;i<100;i++) writer.addDocument(doc); writer.forceMerge(1, false); Index: lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (working copy) @@ -29,7 +29,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; -import org.apache.lucene.document.StringField; +import org.apache.lucene.document.Store; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; @@ -232,7 +232,7 @@ // add tombstone first if (tombstones) { Document d = new Document(); - d.add(newField("id", "-"+Integer.toString(id), StringField.TYPE_STORED)); + d.add(newStringField("id", "-"+Integer.toString(id), Store.YES)); d.add(newField(field, Long.toString(nextVal), storedOnlyType)); writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d); } @@ -248,7 +248,7 @@ // add tombstone first if (tombstones) { Document d = new Document(); - d.add(newField("id", "-"+Integer.toString(id), StringField.TYPE_STORED)); + d.add(newStringField("id", "-"+Integer.toString(id), Store.YES)); d.add(newField(field, Long.toString(nextVal), storedOnlyType)); writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d); } @@ -261,7 +261,7 @@ } else { // assertU(adoc("id",Integer.toString(id), field, Long.toString(nextVal))); Document d = new Document(); - d.add(newField("id", Integer.toString(id), StringField.TYPE_STORED)); + d.add(newStringField("id", Integer.toString(id), Store.YES)); d.add(newField(field, Long.toString(nextVal), storedOnlyType)); if (VERBOSE) { System.out.println("TEST: " + Thread.currentThread().getName() + ": u id:" + id + " val=" + nextVal); Index: lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (working copy) @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; @@ -135,7 +134,7 @@ private void addDoc(IndexWriter writer, String value) throws IOException { Document doc = new Document(); - doc.add(newField("content", value, TextField.TYPE_UNSTORED)); + doc.add(newTextField("content", value)); writer.addDocument(doc); } } Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (working copy) @@ -26,10 +26,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; @@ -145,7 +144,7 @@ Document newDoc = r1.document(10); newDoc.removeField("id"); - newDoc.add(newField("id", Integer.toString(8000), StringField.TYPE_STORED)); + newDoc.add(newStringField("id", Integer.toString(8000), Store.YES)); writer.updateDocument(new Term("id", id10), newDoc); assertFalse(r1.isCurrent()); @@ -169,7 +168,7 @@ writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "a b c")); writer.addDocument(doc); assertTrue(r2.isCurrent()); assertTrue(r3.isCurrent()); @@ -191,14 +190,14 @@ IndexWriter writer = new IndexWriter(dir, iwc); Document doc = new Document(); - doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "a b c")); writer.addDocument(doc); writer.close(); iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())); writer = new IndexWriter(dir, iwc); doc = new Document(); - doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "a b c")); DirectoryReader nrtReader = writer.getReader(); assertTrue(nrtReader.isCurrent()); writer.addDocument(doc); @@ -877,8 +876,8 @@ Directory dir = newDirectory(); final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy())); Document doc = new Document(); - doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED)); - Field id = newField("id", "", StringField.TYPE_UNSTORED); + doc.add(newTextField("field", "a b c")); + Field id = newStringField("id", ""); doc.add(id); id.setStringValue("0"); w.addDocument(doc); @@ -901,8 +900,8 @@ Directory dir = newDirectory(); final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED)); - Field id = newField("id", "", StringField.TYPE_UNSTORED); + doc.add(newTextField("field", "a b c")); + Field id = newStringField("id", ""); doc.add(id); id.setStringValue("0"); w.addDocument(doc); @@ -958,7 +957,7 @@ ); Document doc = new Document(); - doc.add(newField("foo", "bar", StringField.TYPE_UNSTORED)); + doc.add(newStringField("foo", "bar")); for(int i=0;i<20;i++) { w.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.TextField; import org.apache.lucene.search.similarities.DefaultSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -50,7 +49,7 @@ config.setSimilarity(new TestSimilarity()); RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config); Document doc = new Document(); - Field foo = newField("foo", "", TextField.TYPE_UNSTORED); + Field foo = newTextField("foo", ""); doc.add(foo); for (int i = 0; i < 100; i++) { foo.setStringValue(addValue()); Index: lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (working copy) @@ -22,8 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.LuceneTestCase; @@ -75,7 +74,7 @@ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2)); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_STORED); + Field idField = newStringField("id", "", Store.YES); doc.add(idField); int extraCount = 0; @@ -134,7 +133,7 @@ .setMergePolicy(mp)); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_STORED); + Field idField = newStringField("id", "", Store.YES); doc.add(idField); for(int i=0;i<10;i++) { if (VERBOSE) { @@ -178,7 +177,7 @@ for(int j=0;j<21;j++) { Document doc = new Document(); - doc.add(newField("content", "a b c", TextField.TYPE_UNSTORED)); + doc.add(newTextField("content", "a b c")); writer.addDocument(doc); } @@ -199,7 +198,7 @@ public void testNoWaitClose() throws IOException { MockDirectoryWrapper directory = newDirectory(); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_STORED); + Field idField = newStringField("id", "", Store.YES); doc.add(idField); IndexWriter writer = new IndexWriter( Index: lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (working copy) @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; @@ -280,7 +279,7 @@ private void addDoc(IndexWriter writer, String value) throws IOException { Document doc = new Document(); - doc.add(newField("content", value, TextField.TYPE_UNSTORED)); + doc.add(newTextField("content", value)); writer.addDocument(doc); } } Index: lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (working copy) @@ -19,8 +19,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; @@ -39,7 +37,7 @@ IndexWriter w = new IndexWriter(dir, conf); for(int i=0;i<80;i++) { Document doc = new Document(); - doc.add(newField("content", "aaa " + (i%4), TextField.TYPE_UNSTORED)); + doc.add(newTextField("content", "aaa " + (i%4))); w.addDocument(doc); } assertEquals(80, w.maxDoc()); @@ -85,7 +83,7 @@ final int numDocs = _TestUtil.nextInt(random(), 20, 100); for(int i=0;i data = new HashMap(); data.put("index", i+""); Index: lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (working copy) @@ -60,7 +60,7 @@ } Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setOmitNorms(true); ft.setIndexOptions(IndexOptions.DOCS_ONLY); Field field = new Field("field", new MyTokenStream(), ft); Index: lucene/core/src/test/org/apache/lucene/index/TestNorms.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestNorms.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestNorms.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DocValues.Source; import org.apache.lucene.index.DocValues.Type; @@ -30,7 +31,6 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.Bits; import org.apache.lucene.util.LineFileDocs; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.LuceneTestCase; @@ -68,8 +68,8 @@ config.setSimilarity(new CustomNormEncodingSimilarity()); RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config); Document doc = new Document(); - Field foo = newField("foo", "", TextField.TYPE_UNSTORED); - Field bar = newField("bar", "", TextField.TYPE_UNSTORED); + Field foo = newTextField("foo", ""); + Field bar = newTextField("bar", ""); doc.add(foo); doc.add(bar); @@ -189,8 +189,7 @@ for (int i = 0; i < num; i++) { Document doc = docs.nextDoc(); int boost = writeNorms ? 1 + random().nextInt(255) : 0; - Field f = new Field(byteTestField, "" + boost, - TextField.TYPE_STORED); + Field f = new TextField(byteTestField, "" + boost, Store.YES); f.setBoost(boost); doc.add(f); writer.addDocument(doc); Index: lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (working copy) @@ -37,9 +37,9 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir); final Set aDocs = new HashSet(); final Document doc = new Document(); - final Field f = newField("field", "", StringField.TYPE_UNSTORED); + final Field f = newStringField("field", ""); doc.add(f); - final Field idField = newField("id", "", StringField.TYPE_STORED); + final Field idField = newStringField("id", "", Store.YES); doc.add(idField); int num = atLeast(4097); if (VERBOSE) { Index: lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (working copy) @@ -24,9 +24,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.TextField; import org.apache.lucene.search.similarities.DefaultSimilarity; -import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; @@ -49,7 +47,7 @@ config.setSimilarity(new TestSimilarity()); RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config); Document doc = new Document(); - Field foo = newField("foo", "", TextField.TYPE_UNSTORED); + Field foo = newTextField("foo", ""); doc.add(foo); for (int i = 0; i < 100; i++) { foo.setStringValue(addValue()); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; @@ -340,7 +339,7 @@ try { final Document doc = new Document(); DirectoryReader r = DirectoryReader.open(dir); - Field f = newField("f", "", StringField.TYPE_UNSTORED); + Field f = newStringField("f", ""); doc.add(f); int count = 0; do { Index: lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java (working copy) @@ -18,7 +18,7 @@ */ import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.util.*; import org.apache.lucene.store.*; @@ -42,7 +42,7 @@ // write document Document doc = new Document(); - doc.add(newField("UUID", "1", TextField.TYPE_STORED)); + doc.add(newTextField("UUID", "1", Store.YES)); writer.addDocument(doc); writer.commit(); } Index: lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java (working copy) @@ -121,7 +121,7 @@ for(int idx=0;idx allTerms = new HashSet(); Index: lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (working copy) @@ -24,8 +24,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.IntField; -import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.FieldCache; import org.apache.lucene.store.Directory; @@ -164,7 +162,7 @@ System.out.println("TEST: addDoc id:" + id + " terms=" + terms); } for (String s2 : terms) { - doc.add(newField("f", s2, StringField.TYPE_UNSTORED)); + doc.add(newStringField("f", s2)); termToID.put(new BytesRef(s2), id); } w.addDocument(doc); @@ -368,7 +366,7 @@ final RandomIndexWriter w = new RandomIndexWriter(random(), d, iwc); for(String term : terms) { Document doc = new Document(); - Field f = newField(FIELD, term, StringField.TYPE_UNSTORED); + Field f = newStringField(FIELD, term); doc.add(f); w.addDocument(doc); } @@ -507,9 +505,9 @@ d = newDirectory(); final RandomIndexWriter w = new RandomIndexWriter(random(), d); Document doc = new Document(); - doc.add(newField("field", "one two three", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "one two three")); doc = new Document(); - doc.add(newField("field2", "one two three", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field2", "one two three")); w.addDocument(doc); w.commit(); w.deleteDocuments(new Term("field", "one")); @@ -730,15 +728,15 @@ iwc.setMergePolicy(new LogDocMergePolicy()); RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc); Document doc = new Document(); - doc.add(newField("field", "aaa", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "aaa")); w.addDocument(doc); doc = new Document(); - doc.add(newField("field", "bbb", StringField.TYPE_UNSTORED)); + doc.add(newStringField("field", "bbb")); w.addDocument(doc); doc = new Document(); - doc.add(newField("field", "ccc", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", "ccc")); w.addDocument(doc); w.forceMerge(1); Index: lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java (working copy) @@ -89,7 +89,7 @@ // Update all 100 docs... for(int i=0; i<100; i++) { Document d = new Document(); - d.add(new Field("id", Integer.toString(i), StringField.TYPE_STORED)); + d.add(new StringField("id", Integer.toString(i), Store.YES)); d.add(new TextField("contents", English.intToEnglish(i+10*count))); writer.updateDocument(new Term("id", Integer.toString(i)), d); } @@ -129,8 +129,8 @@ // Establish a base index of 100 docs: for(int i=0;i<100;i++) { Document d = new Document(); - d.add(newField("id", Integer.toString(i), StringField.TYPE_STORED)); - d.add(newField("contents", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + d.add(newStringField("id", Integer.toString(i), Store.YES)); + d.add(newTextField("contents", English.intToEnglish(i))); if ((i-1)%7 == 0) { writer.commit(); } Index: lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (working copy) @@ -45,9 +45,9 @@ int numDocs = _TestUtil.nextInt(random(), 1, 100 * RANDOM_MULTIPLIER); Document doc = new Document(); - Field f = newField("field", "", StringField.TYPE_UNSTORED); + Field f = newStringField("field", ""); doc.add(f); - Field id = newField("id", "", StringField.TYPE_UNSTORED); + Field id = newStringField("id", ""); doc.add(id); boolean onlyUniqueTerms = random().nextBoolean(); @@ -156,7 +156,7 @@ Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document d = new Document(); - d.add(newField("f", "j", StringField.TYPE_UNSTORED)); + d.add(newStringField("f", "j")); w.addDocument(d); w.commit(); w.addDocument(d); Index: lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (working copy) @@ -82,8 +82,8 @@ for (int j = 0; j < MAX_DOCS; j++) { Document d = new Document(); - d.add(newField(PRIORITY_FIELD, HIGH_PRIORITY, TextField.TYPE_STORED)); - d.add(newField(ID_FIELD, Integer.toString(j), TextField.TYPE_STORED)); + d.add(newTextField(PRIORITY_FIELD, HIGH_PRIORITY, Store.YES)); + d.add(newTextField(ID_FIELD, Integer.toString(j), Store.YES)); writer.addDocument(d); } writer.close(); Index: lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (working copy) @@ -33,7 +33,6 @@ import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -1621,7 +1620,7 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(IndexWriterConfig.OpenMode.CREATE)); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newStringField("id", ""); doc.add(idField); final int NUM_IDS = atLeast(200); @@ -1756,7 +1755,7 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(IndexWriterConfig.OpenMode.CREATE)); Document doc = new Document(); - Field f = newField("field", "", StringField.TYPE_UNSTORED); + Field f = newStringField("field", ""); doc.add(f); final int NUM_TERMS = (int) (1000*RANDOM_MULTIPLIER * (1+random().nextDouble())); Index: lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java =================================================================== --- lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (working copy) @@ -18,7 +18,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; import org.apache.lucene.search.FieldCache; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.DirectoryReader; @@ -57,12 +56,12 @@ float theFloat = Float.MAX_VALUE; for (int i = 0; i < NUM_DOCS; i++){ Document doc = new Document(); - doc.add(newField("theLong", String.valueOf(theLong--), StringField.TYPE_UNSTORED)); - doc.add(newField("theDouble", String.valueOf(theDouble--), StringField.TYPE_UNSTORED)); - doc.add(newField("theByte", String.valueOf(theByte--), StringField.TYPE_UNSTORED)); - doc.add(newField("theShort", String.valueOf(theShort--), StringField.TYPE_UNSTORED)); - doc.add(newField("theInt", String.valueOf(theInt--), StringField.TYPE_UNSTORED)); - doc.add(newField("theFloat", String.valueOf(theFloat--), StringField.TYPE_UNSTORED)); + doc.add(newStringField("theLong", String.valueOf(theLong--))); + doc.add(newStringField("theDouble", String.valueOf(theDouble--))); + doc.add(newStringField("theByte", String.valueOf(theByte--))); + doc.add(newStringField("theShort", String.valueOf(theShort--))); + doc.add(newStringField("theInt", String.valueOf(theInt--))); + doc.add(newStringField("theFloat", String.valueOf(theFloat--))); if (0 == i % 3) { wA.addDocument(doc); } else { Index: lucene/core/src/test/org/apache/lucene/document/TestDocument.java =================================================================== --- lucene/core/src/test/org/apache/lucene/document/TestDocument.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/document/TestDocument.java (working copy) @@ -22,16 +22,12 @@ import org.apache.lucene.analysis.EmptyTokenizer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsAndPositionsEnum; -import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexableField; 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.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; @@ -206,10 +202,10 @@ Document doc = new Document(); FieldType stored = new FieldType(); stored.setStored(true); - doc.add(new Field("keyword", "test1", StringField.TYPE_STORED)); - doc.add(new Field("keyword", "test2", StringField.TYPE_STORED)); - doc.add(new Field("text", "test1", TextField.TYPE_STORED)); - doc.add(new Field("text", "test2", TextField.TYPE_STORED)); + doc.add(new StringField("keyword", "test1", Store.YES)); + doc.add(new StringField("keyword", "test2", Store.YES)); + doc.add(new TextField("text", "test1", Store.YES)); + doc.add(new TextField("text", "test2", Store.YES)); doc.add(new Field("unindexed", "test1", stored)); doc.add(new Field("unindexed", "test2", stored)); doc @@ -250,10 +246,10 @@ public void testFieldSetValue() throws Exception { - Field field = new Field("id", "id1", StringField.TYPE_STORED); + Field field = new StringField("id", "id1", Store.YES); Document doc = new Document(); doc.add(field); - doc.add(new Field("keyword", "test", StringField.TYPE_STORED)); + doc.add(new StringField("keyword", "test", Store.YES)); Directory dir = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), dir); @@ -302,7 +298,7 @@ iwc.setMergePolicy(newLogMergePolicy()); IndexWriter iw = new IndexWriter(dir, iwc); Document doc = new Document(); - doc.add(new Field("field1", "sometext", StringField.TYPE_STORED)); + doc.add(new StringField("field1", "sometext", Store.YES)); doc.add(new TextField("field2", "sometext")); doc.add(new StringField("foo", "bar")); iw.addDocument(doc); // add an 'ok' document Index: lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.IOException; +import org.apache.lucene.document.Store; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; @@ -33,7 +34,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; /** * Holds tests cases to verify external APIs are accessible @@ -91,7 +91,7 @@ dir.failOn(new FailOnlyOnMerge()); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_STORED); + Field idField = newStringField("id", "", Store.YES); doc.add(idField); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( Index: lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (revision 1348347) +++ lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (working copy) @@ -69,12 +69,12 @@ ); Document doc = new Document(); // uses default codec: - doc.add(newField("field1", "this field uses the standard codec as the test", TextField.TYPE_UNSTORED)); + doc.add(newTextField("field1", "this field uses the standard codec as the test")); // uses pulsing codec: - Field field2 = newField("field2", "this field uses the pulsing codec as the test", TextField.TYPE_UNSTORED); + Field field2 = newTextField("field2", "this field uses the pulsing codec as the test"); doc.add(field2); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newStringField("id", ""); doc.add(idField); for(int i=0;inew - * Field) to store the value. */ + *

This field's value is not stored by default; use one + * of the constructors taking {@link Store} to enable + * storing. */ public final class TextField extends Field { /* Indexed, tokenized, not stored. */ - public static final FieldType TYPE_UNSTORED = new FieldType(); + public static final FieldType TYPE = new FieldType(); /* Indexed, tokenized, stored. */ public static final FieldType TYPE_STORED = new FieldType(); static { - TYPE_UNSTORED.setIndexed(true); - TYPE_UNSTORED.setTokenized(true); - TYPE_UNSTORED.freeze(); + TYPE.setIndexed(true); + TYPE.setTokenized(true); + TYPE.freeze(); TYPE_STORED.setIndexed(true); + TYPE_STORED.setTokenized(true); TYPE_STORED.setStored(true); - TYPE_STORED.setTokenized(true); TYPE_STORED.freeze(); } @@ -52,16 +52,31 @@ /** Creates a new un-stored TextField */ public TextField(String name, Reader reader) { - super(name, reader, TextField.TYPE_UNSTORED); + super(name, reader, TYPE); } /** Creates a new un-stored TextField */ public TextField(String name, String value) { - super(name, value, TextField.TYPE_UNSTORED); + super(name, value, TYPE); } /** Creates a new un-stored TextField */ public TextField(String name, TokenStream stream) { - super(name, stream, TextField.TYPE_UNSTORED); + super(name, stream, TYPE); } + + /** Creates a new stored or un-stored TextField */ + public TextField(String name, Reader reader, Store store) { + super(name, reader, store == Store.YES ? TYPE_STORED : TYPE); + } + + /** Creates a new stored or un-stored TextField */ + public TextField(String name, String value, Store store) { + super(name, value, store == Store.YES ? TYPE_STORED : TYPE); + } + + /** Creates a new stored or un-stored TextField */ + public TextField(String name, TokenStream stream, Store store) { + super(name, stream, store == Store.YES ? TYPE_STORED : TYPE); + } } Index: lucene/core/src/java/org/apache/lucene/document/Store.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/Store.java (revision 0) +++ lucene/core/src/java/org/apache/lucene/document/Store.java (working copy) @@ -0,0 +1,28 @@ +package org.apache.lucene.document; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +public enum Store { + /** The field's value should be stored so that when the + * document is loaded at search time, the field's value + * is present. */ + YES, + + /** The field's value should not be stored. */ + NO +}; Index: lucene/core/src/java/org/apache/lucene/document/FloatField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/FloatField.java (revision 1348347) +++ lucene/core/src/java/org/apache/lucene/document/FloatField.java (working copy) @@ -59,9 +59,9 @@ * {@link org.apache.lucene.search.SortField.Type#FLOAT}. FloatField * values can also be loaded directly from {@link FieldCache}.

* - *

By default, a FloatField's value is not stored but - * is indexed for range filtering and sorting. You can use - * {@link StoredField} to also store the value. + *

This field's value is not stored by default; use + * {@link #FloatField(String,float,Store)} to enable + * storing. * *

You may add the same field name as an FloatField to * the same document more than once. Range querying and @@ -128,13 +128,32 @@ TYPE.freeze(); } - /** Creates an LongField with the provided value + public static final FieldType TYPE_STORED = new FieldType(); + static { + TYPE_STORED.setIndexed(true); + TYPE_STORED.setTokenized(true); + TYPE_STORED.setOmitNorms(true); + TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE_STORED.setNumericType(FieldType.NumericType.FLOAT); + TYPE_STORED.setStored(true); + TYPE_STORED.freeze(); + } + + /** Creates an un-stored FloatField with the provided value * and default precisionStep {@link * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ public FloatField(String name, float value) { super(name, TYPE); fieldsData = Float.valueOf(value); } + + /** Creates a stored or un-stored FloatField with the provided value + * and default precisionStep {@link + * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ + public FloatField(String name, float value, Store stored) { + super(name, stored == Store.YES ? TYPE_STORED : TYPE); + fieldsData = Float.valueOf(value); + } /** Expert: allows you to customize the {@link * FieldType}. */ Index: lucene/core/src/java/org/apache/lucene/document/DoubleField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/DoubleField.java (revision 1348347) +++ lucene/core/src/java/org/apache/lucene/document/DoubleField.java (working copy) @@ -59,9 +59,9 @@ * {@link org.apache.lucene.search.SortField.Type#DOUBLE}. DoubleField * values can also be loaded directly from {@link FieldCache}.

* - *

By default, a DoubleField's value is not stored but - * is indexed for range filtering and sorting. You can use - * {@link StoredField} to also store the value. + *

This field's value is not stored by default; use + * {@link #DoubleField(String,double,Store)} to enable + * storing. * *

You may add the same field name as an DoubleField to * the same document more than once. Range querying and @@ -128,7 +128,18 @@ TYPE.freeze(); } - /** Creates an LongField with the provided value + public static final FieldType TYPE_STORED = new FieldType(); + static { + TYPE_STORED.setIndexed(true); + TYPE_STORED.setTokenized(true); + TYPE_STORED.setOmitNorms(true); + TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE_STORED.setNumericType(FieldType.NumericType.DOUBLE); + TYPE_STORED.setStored(true); + TYPE_STORED.freeze(); + } + + /** Creates an un-stored DoubleField with the provided value * and default precisionStep {@link * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ public DoubleField(String name, double value) { @@ -136,6 +147,14 @@ fieldsData = Double.valueOf(value); } + /** Creates a stored or un-stored DoubleField with the provided value + * and default precisionStep {@link + * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ + public DoubleField(String name, double value, Store stored) { + super(name, stored == Store.YES ? TYPE_STORED : TYPE); + fieldsData = Double.valueOf(value); + } + /** Expert: allows you to customize the {@link * FieldType}. */ public DoubleField(String name, double value, FieldType type) { Index: lucene/core/src/java/org/apache/lucene/document/IntField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/IntField.java (revision 1348347) +++ lucene/core/src/java/org/apache/lucene/document/IntField.java (working copy) @@ -59,9 +59,9 @@ * {@link org.apache.lucene.search.SortField.Type#INT}. IntField * values can also be loaded directly from {@link FieldCache}.

* - *

By default, a IntField's value is not stored but - * is indexed for range filtering and sorting. You can use - * {@link StoredField} to also store the value. + *

This field's value is not stored by default; use + * {@link #IntField(String,int,Store)} to enable + * storing. * *

You may add the same field name as an IntField to * the same document more than once. Range querying and @@ -128,13 +128,32 @@ TYPE.freeze(); } - /** Creates an IntField with the provided value + public static final FieldType TYPE_STORED = new FieldType(); + static { + TYPE_STORED.setIndexed(true); + TYPE_STORED.setTokenized(true); + TYPE_STORED.setOmitNorms(true); + TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE_STORED.setNumericType(FieldType.NumericType.INT); + TYPE_STORED.setStored(true); + TYPE_STORED.freeze(); + } + + /** Creates a un-stored IntField with the provided value * and default precisionStep {@link * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ public IntField(String name, int value) { super(name, TYPE); fieldsData = Integer.valueOf(value); } + + /** Creates a stored or un-stored IntField with the provided value + * and default precisionStep {@link + * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ + public IntField(String name, int value, Store stored) { + super(name, stored == Store.YES ? TYPE_STORED : TYPE); + fieldsData = Integer.valueOf(value); + } /** Expert: allows you to customize the {@link * FieldType}. */ Index: lucene/core/src/java/org/apache/lucene/document/LongField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/LongField.java (revision 1348347) +++ lucene/core/src/java/org/apache/lucene/document/LongField.java (working copy) @@ -69,9 +69,9 @@ * {@link org.apache.lucene.search.SortField.Type#LONG}. LongField * values can also be loaded directly from {@link FieldCache}.

* - *

By default, a LongField's value is not stored but - * is indexed for range filtering and sorting. You can use - * {@link StoredField} to also store the value. + *

This field's value is not stored by default; use + * {@link #LongField(String,long,Store)} to enable + * storing. * *

You may add the same field name as an LongField to * the same document more than once. Range querying and @@ -138,13 +138,32 @@ TYPE.freeze(); } - /** Creates an LongField with the provided value + public static final FieldType TYPE_STORED = new FieldType(); + static { + TYPE_STORED.setIndexed(true); + TYPE_STORED.setTokenized(true); + TYPE_STORED.setOmitNorms(true); + TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE_STORED.setNumericType(FieldType.NumericType.LONG); + TYPE_STORED.setStored(true); + TYPE_STORED.freeze(); + } + + /** Creates an un-stored LongField with the provided value * and default precisionStep {@link * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ public LongField(String name, long value) { super(name, TYPE); fieldsData = Long.valueOf(value); } + + /** Creates a stored or un-stored LongField with the provided value + * and default precisionStep {@link + * NumericUtils#PRECISION_STEP_DEFAULT} (4). */ + public LongField(String name, long value, Store stored) { + super(name, stored == Store.YES ? TYPE_STORED : TYPE); + fieldsData = Long.valueOf(value); + } /** Expert: allows you to customize the {@link * FieldType}. */ Index: lucene/core/src/java/org/apache/lucene/document/StringField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/StringField.java (revision 1348347) +++ lucene/core/src/java/org/apache/lucene/document/StringField.java (working copy) @@ -25,38 +25,43 @@ * field, or any field that you intend to use for sorting * or access through the field cache. * - *

This field's value is not stored by default; use the - * {@link StringField#TYPE_STORED} type (pass it to new - * Field) to store the value. */ + *

This field's value is not stored by default; use + * {@link #StringField(String,String,Store)} to enable + * storing. */ public final class StringField extends Field { /** Indexed, not tokenized, omits norms, indexes * DOCS_ONLY, not stored. */ - public static final FieldType TYPE_UNSTORED = new FieldType(); + public static final FieldType TYPE = new FieldType(); /** Indexed, not tokenized, omits norms, indexes * DOCS_ONLY, stored */ public static final FieldType TYPE_STORED = new FieldType(); static { - TYPE_UNSTORED.setIndexed(true); - TYPE_UNSTORED.setOmitNorms(true); - TYPE_UNSTORED.setIndexOptions(IndexOptions.DOCS_ONLY); - TYPE_UNSTORED.freeze(); + TYPE.setIndexed(true); + TYPE.setOmitNorms(true); + TYPE.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE.freeze(); TYPE_STORED.setIndexed(true); - TYPE_STORED.setStored(true); TYPE_STORED.setOmitNorms(true); TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE_STORED.setStored(true); TYPE_STORED.freeze(); } /** Creates a new un-stored StringField */ public StringField(String name, String value) { - super(name, value, TYPE_UNSTORED); + super(name, value, TYPE); } + /** Creates a new stored or un-stored StringField. */ + public StringField(String name, String value, Store stored) { + super(name, value, stored == Store.YES ? TYPE_STORED : TYPE); + } + @Override public String stringValue() { return (fieldsData == null) ? null : fieldsData.toString(); Index: lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java =================================================================== --- lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (revision 1348347) +++ lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (working copy) @@ -40,6 +40,7 @@ import org.apache.lucene.document.LongField; import org.apache.lucene.document.FloatField; import org.apache.lucene.document.DoubleField; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -114,7 +115,7 @@ fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyFt)); fields.put(TITLE_FIELD, new Field(TITLE_FIELD, "", ft)); fields.put(DATE_FIELD, new Field(DATE_FIELD, "", ft)); - fields.put(ID_FIELD, new Field(ID_FIELD, "", StringField.TYPE_STORED)); + fields.put(ID_FIELD, new StringField(ID_FIELD, "", Store.YES)); fields.put(NAME_FIELD, new Field(NAME_FIELD, "", ft)); numericFields.put(DATE_MSEC_FIELD, new LongField(DATE_MSEC_FIELD, 0L)); @@ -432,7 +433,7 @@ boolean termVecPositions = config.get("doc.term.vector.positions", false); boolean termVecOffsets = config.get("doc.term.vector.offsets", false); - valType = new FieldType(TextField.TYPE_UNSTORED); + valType = new FieldType(TextField.TYPE); valType.setStored(stored); valType.setTokenized(tokenized); valType.setOmitNorms(!norms); @@ -441,7 +442,7 @@ valType.setStoreTermVectorOffsets(termVecOffsets); valType.freeze(); - bodyValType = new FieldType(TextField.TYPE_UNSTORED); + bodyValType = new FieldType(TextField.TYPE); bodyValType.setStored(bodyStored); bodyValType.setTokenized(bodyTokenized); bodyValType.setOmitNorms(!bodyNorms); Index: lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java =================================================================== --- lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (revision 1348347) +++ lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (working copy) @@ -23,9 +23,9 @@ import com.spatial4j.core.io.sample.SampleDataReader; import com.spatial4j.core.query.SpatialArgsParser; import com.spatial4j.core.shape.Shape; +import org.apache.lucene.document.Store; import org.junit.Assert; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexableField; @@ -76,8 +76,8 @@ while (sampleData.hasNext()) { SampleData data = sampleData.next(); Document document = new Document(); - document.add(new Field("id", data.id, StringField.TYPE_STORED)); - document.add(new Field("name", data.name, StringField.TYPE_STORED)); + document.add(new StringField("id", data.id, Store.YES)); + document.add(new StringField("name", data.name, Store.YES)); Shape shape = ctx.readShape(data.shape); for (IndexableField f : strategy.createFields(fieldInfo, shape, true, storeShape)) { if( f != null ) { // null if incompatibleGeometry && ignore Index: lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java =================================================================== --- lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java (revision 1348347) +++ lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java (working copy) @@ -23,7 +23,7 @@ import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.simple.PointImpl; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.spatial.SimpleSpatialFieldInfo; import org.apache.lucene.spatial.SpatialTestCase; @@ -45,7 +45,7 @@ Shape point = new PointImpl(-118.243680, 34.052230); Document losAngeles = new Document(); - losAngeles.add(new Field("name", "Los Angeles", StringField.TYPE_STORED)); + losAngeles.add(new StringField("name", "Los Angeles", Store.YES)); losAngeles.add(prefixGridStrategy.createField(fieldInfo, point, true, true)); addDocumentsAndCommit(Arrays.asList(losAngeles)); Index: lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java =================================================================== --- lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (revision 1348347) +++ lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (working copy) @@ -38,16 +38,16 @@ // One resume... private Document makeResume(String name, String country) { Document resume = new Document(); - resume.add(newField("docType", "resume", StringField.TYPE_UNSTORED)); - resume.add(newField("name", name, StringField.TYPE_STORED)); - resume.add(newField("country", country, StringField.TYPE_UNSTORED)); + resume.add(newStringField("docType", "resume")); + resume.add(newStringField("name", name, Store.YES)); + resume.add(newStringField("country", country)); return resume; } // ... has multiple jobs private Document makeJob(String skill, int year) { Document job = new Document(); - job.add(newField("skill", skill, StringField.TYPE_STORED)); + job.add(newStringField("skill", skill, Store.YES)); job.add(new IntField("year", year)); job.add(new StoredField("year", year)); return job; @@ -56,7 +56,7 @@ // ... has multiple qualifications private Document makeQualification(String qualification, int year) { Document job = new Document(); - job.add(newField("qualification", qualification, StringField.TYPE_STORED)); + job.add(newStringField("qualification", qualification, Store.YES)); job.add(new IntField("year", year)); return job; } @@ -341,23 +341,21 @@ for(int parentDocID=0;parentDocID joinDocs = new ArrayList(); @@ -381,15 +379,13 @@ Document joinChildDoc = new Document(); joinDocs.add(joinChildDoc); - Field childID = newField("childID", ""+childDocID, StringField.TYPE_STORED); + Field childID = newStringField("childID", ""+childDocID, Store.YES); childDoc.add(childID); joinChildDoc.add(childID); for(int childFieldID=0;childFieldID()); @@ -411,7 +410,7 @@ context.toDocuments.get(linkValue).add(docs[i]); context.randomValueToDocs.get(value).add(docs[i]); - document.add(newField(random(), "to", linkValue, TextField.TYPE_UNSTORED)); + document.add(newTextField(random(), "to", linkValue)); } } Index: lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java =================================================================== --- lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (revision 1348347) +++ lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (working copy) @@ -33,7 +33,6 @@ import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DocsAndPositionsEnum; @@ -126,8 +125,8 @@ IndexWriter writer = new IndexWriter(ramdir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat()))); Document doc = new Document(); - Field field1 = newField("foo", fooField.toString(), TextField.TYPE_UNSTORED); - Field field2 = newField("term", termField.toString(), TextField.TYPE_UNSTORED); + Field field1 = newTextField("foo", fooField.toString()); + Field field2 = newTextField("term", termField.toString()); doc.add(field1); doc.add(field2); writer.addDocument(doc); Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (revision 1348347) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (working copy) @@ -20,7 +20,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -39,7 +38,7 @@ String[] termsToAdd = { "metanoia", "metanoian", "metanoiai", "metanoias", "metanoi𐑍" }; for (int i = 0; i < termsToAdd.length; i++) { Document doc = new Document(); - doc.add(newField("repentance", termsToAdd[i], TextField.TYPE_UNSTORED)); + doc.add(newTextField("repentance", termsToAdd[i])); writer.addDocument(doc); } @@ -68,7 +67,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", English.intToEnglish(i))); writer.addDocument(doc); } @@ -108,7 +107,7 @@ // add some more documents for (int i = 1000; i < 1100; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", English.intToEnglish(i))); writer.addDocument(doc); } @@ -132,13 +131,13 @@ new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)); Document doc = new Document(); - doc.add(newField("text", "foobar", TextField.TYPE_UNSTORED)); + doc.add(newTextField("text", "foobar")); writer.addDocument(doc); - doc.add(newField("text", "foobar", TextField.TYPE_UNSTORED)); + doc.add(newTextField("text", "foobar")); writer.addDocument(doc); - doc.add(newField("text", "foobaz", TextField.TYPE_UNSTORED)); + doc.add(newTextField("text", "foobaz")); writer.addDocument(doc); - doc.add(newField("text", "fobar", TextField.TYPE_UNSTORED)); + doc.add(newTextField("text", "fobar")); writer.addDocument(doc); IndexReader ir = writer.getReader(); @@ -200,7 +199,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", English.intToEnglish(i))); writer.addDocument(doc); } @@ -224,7 +223,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", English.intToEnglish(i))); writer.addDocument(doc); } @@ -249,7 +248,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", English.intToEnglish(i))); writer.addDocument(doc); } Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (revision 1348347) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -54,23 +54,23 @@ Document doc; doc = new Document(); - doc.add(newField("aaa", "foo", TextField.TYPE_STORED)); + doc.add(newTextField("aaa", "foo", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("aaa", "foo", TextField.TYPE_STORED)); + doc.add(newTextField("aaa", "foo", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "Tom", TextField.TYPE_STORED)); + doc.add(newTextField("contents", "Tom", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "Jerry", TextField.TYPE_STORED)); + doc.add(newTextField("contents", "Jerry", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("zzz", "bar", TextField.TYPE_STORED)); + doc.add(newTextField("zzz", "bar", Store.YES)); writer.addDocument(doc); writer.forceMerge(1); Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (revision 1348347) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (working copy) @@ -28,7 +28,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.document.Store; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -59,14 +59,14 @@ for (int i = 0; i < 1000; i++) { Document doc = new Document(); - doc.add(newField("field1", English.intToEnglish(i), TextField.TYPE_STORED)); - doc.add(newField("field2", English.intToEnglish(i + 1), TextField.TYPE_STORED)); // + word thousand - doc.add(newField("field3", "fvei" + (i % 2 == 0 ? " five" : ""), TextField.TYPE_STORED)); // + word thousand + doc.add(newTextField("field1", English.intToEnglish(i), Store.YES)); + doc.add(newTextField("field2", English.intToEnglish(i + 1), Store.YES)); // + word thousand + doc.add(newTextField("field3", "fvei" + (i % 2 == 0 ? " five" : ""), Store.YES)); // + word thousand writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("field1", "eight", TextField.TYPE_STORED)); // "eight" in + doc.add(newTextField("field1", "eight", Store.YES)); // "eight" in // the index // twice writer.addDocument(doc); @@ -74,13 +74,12 @@ { Document doc = new Document(); doc - .add(newField("field1", "twenty-one twenty-one", - TextField.TYPE_STORED)); // "twenty-one" in the index thrice + .add(newTextField("field1", "twenty-one twenty-one", Store.YES)); // "twenty-one" in the index thrice writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("field1", "twenty", TextField.TYPE_STORED)); // "twenty" + doc.add(newTextField("field1", "twenty", Store.YES)); // "twenty" // in the // index // twice Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java (revision 1348347) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -44,23 +43,23 @@ for (int i = 900; i < 1112; i++) { Document doc = new Document(); String num = English.intToEnglish(i).replaceAll("[-]", " ").replaceAll("[,]", ""); - doc.add(newField("numbers", num, TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", num)); writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("numbers", "thou hast sand betwixt thy toes", TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", "thou hast sand betwixt thy toes")); writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("numbers", "hundredeight eightyeight yeight", TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", "hundredeight eightyeight yeight")); writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("numbers", "tres y cinco", TextField.TYPE_UNSTORED)); + doc.add(newTextField("numbers", "tres y cinco")); writer.addDocument(doc); } Index: lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java =================================================================== --- lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (revision 1348347) +++ lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (working copy) @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.Store; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.document.StringField; import org.apache.lucene.index.AtomicReader; @@ -575,7 +575,7 @@ Document doc = new Document(); // the word field is never queried on... its indexed so it can be quickly // checked for rebuild (and stored for retrieval). Doesn't need norms or TF/pos - Field f = new Field(F_WORD, text, StringField.TYPE_STORED); + Field f = new StringField(F_WORD, text, Store.YES); doc.add(f); // orig term addGram(text, doc, ng1, ng2); return doc; @@ -588,7 +588,7 @@ String end = null; for (int i = 0; i < len - ng + 1; i++) { String gram = text.substring(i, i + ng); - FieldType ft = new FieldType(StringField.TYPE_UNSTORED); + FieldType ft = new FieldType(StringField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS); Field ngramField = new Field(key, gram, ft); // spellchecker does not use positional queries, but we want freqs Index: lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java =================================================================== --- lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (revision 1348347) +++ lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (working copy) @@ -20,7 +20,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -69,9 +69,9 @@ // add the first doc Document doc = new Document(); String dummyTitle = "this is a dummy title "; - doc.add(new Field("title", dummyTitle, TextField.TYPE_STORED)); + doc.add(new TextField("title", dummyTitle, Store.YES)); String dummyContent = "there is some content written here"; - doc.add(new Field("contents", dummyContent, TextField.TYPE_STORED)); + doc.add(new TextField("contents", dummyContent, Store.YES)); writer.addDocument(doc, analyzer); writer.commit(); @@ -90,9 +90,9 @@ // add a second doc doc = new Document(); String dogmasTitle = "dogmas"; - doc.add(new Field("title", dogmasTitle, TextField.TYPE_STORED)); + doc.add(new TextField("title", dogmasTitle, Store.YES)); String dogmasContents = "white men can't jump"; - doc.add(new Field("contents", dogmasContents, TextField.TYPE_STORED)); + doc.add(new TextField("contents", dogmasContents, Store.YES)); writer.addDocument(doc, analyzer); writer.commit(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (revision 1348347) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -58,7 +57,7 @@ for(int i=0;i<10000;i++) b.append(" a"); b.append(" x"); - doc.add(newField("field", b.toString(), TextField.TYPE_UNSTORED)); + doc.add(newTextField("field", b.toString())); writer.addDocument(doc); writer.close(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (revision 1348347) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (working copy) @@ -93,7 +93,7 @@ TokenStream tokenStream = analyzer.tokenStream("field", new StringReader("abcd ")); TeeSinkTokenFilter tee = new TeeSinkTokenFilter(tokenStream); TokenStream sink = tee.newSinkTokenStream(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setStoreTermVectors(true); ft.setStoreTermVectorOffsets(true); ft.setStoreTermVectorPositions(true); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (revision 1348347) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (working copy) @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; @@ -53,8 +53,8 @@ TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))); Document doc = new Document(); - doc.add(new Field("partnum", "Q36", StringField.TYPE_STORED)); - doc.add(new Field("description", "Illidium Space Modulator", TextField.TYPE_STORED)); + doc.add(new StringField("partnum", "Q36", Store.YES)); + doc.add(new TextField("description", "Illidium Space Modulator", Store.YES)); writer.addDocument(doc); writer.close(); @@ -89,10 +89,10 @@ RAMDirectory dir = new RAMDirectory(); IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer())); Document doc = new Document(); - doc.add(new Field("partnum", "Q36", TextField.TYPE_STORED)); + doc.add(new TextField("partnum", "Q36", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("partnum", "Q37", TextField.TYPE_STORED)); + doc.add(new TextField("partnum", "Q37", Store.YES)); writer.addDocument(doc); writer.close(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (revision 1348347) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (working copy) @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -62,15 +62,15 @@ Document doc; doc = new Document(); - doc.add(new Field("content", "please divide this sentence into shingles", TextField.TYPE_STORED)); + doc.add(new TextField("content", "please divide this sentence into shingles", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("content", "just another test sentence", TextField.TYPE_STORED)); + doc.add(new TextField("content", "just another test sentence", Store.YES)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("content", "a sentence which contains no test", TextField.TYPE_STORED)); + doc.add(new TextField("content", "a sentence which contains no test", Store.YES)); writer.addDocument(doc); writer.close(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (revision 1348347) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (working copy) @@ -18,7 +18,7 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Store; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -49,8 +49,8 @@ Document doc = new Document(); String variedFieldValue = variedFieldValues[i % variedFieldValues.length]; String repetitiveFieldValue = repetitiveFieldValues[i % repetitiveFieldValues.length]; - doc.add(new Field("variedField", variedFieldValue, TextField.TYPE_STORED)); - doc.add(new Field("repetitiveField", repetitiveFieldValue, TextField.TYPE_STORED)); + doc.add(new TextField("variedField", variedFieldValue, Store.YES)); + doc.add(new TextField("repetitiveField", repetitiveFieldValue, Store.YES)); writer.addDocument(doc); } writer.close(); Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (revision 1348347) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (working copy) @@ -55,21 +55,21 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random text", Store.YES)); doc.add(new Field("id", "1", customType)); w.addDocument(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random text blob", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random text blob", Store.YES)); doc.add(new Field("id", "2", customType)); w.addDocument(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random textual data", Store.YES)); doc.add(new Field("id", "3", customType)); w.addDocument(doc); w.commit(); // To ensure a second segment @@ -77,27 +77,27 @@ // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV); - doc.add(new Field("content", "some random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some random text", Store.YES)); doc.add(new Field("id", "4", customType)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random text", Store.YES)); doc.add(new Field("id", "5", customType)); w.addDocument(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "random blob", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random blob", Store.YES)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random word stuck in alot of other text", Store.YES)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); @@ -121,7 +121,7 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new TextField(groupField, value, Store.YES)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value))); } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (revision 1348347) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (working copy) @@ -56,23 +56,23 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random text", Store.YES)); doc.add(new Field("id", "1", customType)); documents.add(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random text", Store.YES)); doc.add(new Field("id", "2", customType)); documents.add(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random textual data", Store.YES)); doc.add(new Field("id", "3", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new StringField("groupend", "x")); documents.add(doc); w.addDocuments(documents); documents.clear(); @@ -80,33 +80,33 @@ // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV); - doc.add(new Field("content", "some random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some random text", Store.YES)); doc.add(new Field("id", "4", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new StringField("groupend", "x")); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random text", Store.YES)); doc.add(new Field("id", "5", customType)); documents.add(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "random", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random", Store.YES)); doc.add(new Field("id", "6", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new StringField("groupend", "x")); documents.add(doc); w.addDocuments(documents); documents.clear(); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random word stuck in alot of other text", Store.YES)); doc.add(new Field("id", "6", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new StringField("groupend", "x")); w.addDocument(doc); @@ -166,7 +166,7 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new TextField(groupField, value, Store.YES)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value))); } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (revision 1348347) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (working copy) @@ -60,56 +60,56 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV, valueType); - doc.add(newField("content", "random text", TextField.TYPE_STORED)); - doc.add(newField("id", "1", StringField.TYPE_STORED)); + doc.add(newTextField("content", "random text", Store.YES)); + doc.add(newStringField("id", "1", Store.YES)); w.addDocument(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV, valueType); - doc.add(newField("content", "some more random text blob", TextField.TYPE_STORED)); - doc.add(newField("id", "2", StringField.TYPE_STORED)); + doc.add(newTextField("content", "some more random text blob", Store.YES)); + doc.add(newStringField("id", "2", Store.YES)); w.addDocument(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV, valueType); - doc.add(newField("content", "some more random textual data", TextField.TYPE_STORED)); - doc.add(newField("id", "3", StringField.TYPE_STORED)); + doc.add(newTextField("content", "some more random textual data", Store.YES)); + doc.add(newStringField("id", "3", Store.YES)); w.addDocument(doc); w.commit(); // To ensure a second segment // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV, valueType); - doc.add(newField("content", "some random text", TextField.TYPE_STORED)); - doc.add(newField("id", "4", StringField.TYPE_STORED)); + doc.add(newTextField("content", "some random text", Store.YES)); + doc.add(newStringField("id", "4", Store.YES)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV, valueType); - doc.add(newField("content", "some more random text", TextField.TYPE_STORED)); - doc.add(newField("id", "5", StringField.TYPE_STORED)); + doc.add(newTextField("content", "some more random text", Store.YES)); + doc.add(newStringField("id", "5", Store.YES)); w.addDocument(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV, valueType); - doc.add(newField("content", "random blob", TextField.TYPE_STORED)); - doc.add(newField("id", "6", StringField.TYPE_STORED)); + doc.add(newTextField("content", "random blob", Store.YES)); + doc.add(newStringField("id", "6", Store.YES)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); - doc.add(newField("id", "6", StringField.TYPE_STORED)); + doc.add(newTextField("content", "random word stuck in alot of other text", Store.YES)); + doc.add(newStringField("id", "6", Store.YES)); w.addDocument(doc); // 7 -- no author field doc = new Document(); - doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); - doc.add(newField("id", "7", StringField.TYPE_STORED)); + doc.add(newTextField("content", "random word stuck in alot of other text", Store.YES)); + doc.add(newStringField("id", "7", Store.YES)); w.addDocument(doc); IndexReader reader = w.getReader(); @@ -207,7 +207,7 @@ Document doc = new Document(); Document docNoGroup = new Document(); - Field group = newField("group", "", StringField.TYPE_UNSTORED); + Field group = newStringField("group", ""); doc.add(group); Field valuesField = null; if (canUseIDV) { @@ -226,16 +226,16 @@ } doc.add(valuesField); } - Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED); + Field sort1 = newStringField("sort1", ""); doc.add(sort1); docNoGroup.add(sort1); - Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED); + Field sort2 = newStringField("sort2", ""); doc.add(sort2); docNoGroup.add(sort2); - Field sort3 = newField("sort3", "", StringField.TYPE_UNSTORED); + Field sort3 = newStringField("sort3", ""); doc.add(sort3); docNoGroup.add(sort3); - Field content = newField("content", "", TextField.TYPE_UNSTORED); + Field content = newTextField("content", ""); doc.add(content); docNoGroup.add(content); IntField id = new IntField("id", 0); @@ -538,7 +538,7 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV, Type valueType) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new TextField(groupField, value, Store.YES)); if (canUseIDV) { Field valuesField = null; switch(valueType) { Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (revision 1348347) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (working copy) @@ -218,7 +218,7 @@ } private void addField(Document doc, String field, String value, boolean canUseIDV) { - doc.add(new Field(field, value, StringField.TYPE_UNSTORED)); + doc.add(new StringField(field, value)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(field, new BytesRef(value))); } @@ -367,7 +367,7 @@ Document docNoGroup = new Document(); Document docNoFacet = new Document(); Document docNoGroupNoFacet = new Document(); - Field group = newField("group", "", StringField.TYPE_UNSTORED); + Field group = newStringField("group", ""); Field groupDc = new SortedBytesDocValuesField("group", new BytesRef()); if (useDv) { doc.add(groupDc); @@ -378,7 +378,7 @@ Field[] facetFields; if (useDv) { facetFields = new Field[2]; - facetFields[0] = newField("facet", "", StringField.TYPE_UNSTORED); + facetFields[0] = newStringField("facet", ""); doc.add(facetFields[0]); docNoGroup.add(facetFields[0]); facetFields[1] = new SortedBytesDocValuesField("facet", new BytesRef()); @@ -387,12 +387,12 @@ } else { facetFields = multipleFacetValuesPerDocument ? new Field[2 + random.nextInt(6)] : new Field[1]; for (int i = 0; i < facetFields.length; i++) { - facetFields[i] = newField("facet", "", StringField.TYPE_UNSTORED); + facetFields[i] = newStringField("facet", ""); doc.add(facetFields[i]); docNoGroup.add(facetFields[i]); } } - Field content = newField("content", "", StringField.TYPE_UNSTORED); + Field content = newStringField("content", ""); doc.add(content); docNoGroup.add(content); docNoFacet.add(content); Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (revision 1348347) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (working copy) @@ -67,55 +67,55 @@ Document doc = new Document(); addField(doc, groupField, "1", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "1", StringField.TYPE_UNSTORED)); + doc.add(new TextField("content", "random text")); + doc.add(new StringField("id", "1")); w.addDocument(doc); // 1 doc = new Document(); addField(doc, groupField, "1", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "some more random text blob", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "2", StringField.TYPE_UNSTORED)); + doc.add(new TextField("content", "some more random text blob")); + doc.add(new StringField("id", "2")); w.addDocument(doc); // 2 doc = new Document(); addField(doc, groupField, "1", dvType); addField(doc, countField, "2", dvType); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "3", StringField.TYPE_UNSTORED)); + doc.add(new TextField("content", "some more random textual data")); + doc.add(new StringField("id", "3")); w.addDocument(doc); w.commit(); // To ensure a second segment // 3 doc = new Document(); addField(doc, groupField, "2", dvType); - doc.add(new Field("content", "some random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "4", StringField.TYPE_UNSTORED)); + doc.add(new TextField("content", "some random text")); + doc.add(new StringField("id", "4")); w.addDocument(doc); // 4 doc = new Document(); addField(doc, groupField, "3", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "some more random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "5", StringField.TYPE_UNSTORED)); + doc.add(new TextField("content", "some more random text")); + doc.add(new StringField("id", "5")); w.addDocument(doc); // 5 doc = new Document(); addField(doc, groupField, "3", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "random blob", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "6", StringField.TYPE_UNSTORED)); + doc.add(new TextField("content", "random blob")); + doc.add(new StringField("id", "6")); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random word stuck in alot of other text", Store.YES)); addField(doc, countField, "1", dvType); - doc.add(new Field("id", "6", StringField.TYPE_UNSTORED)); + doc.add(new StringField("id", "6")); w.addDocument(doc); IndexSearcher indexSearcher = newSearcher(w.getReader()); @@ -316,7 +316,7 @@ } private void addField(Document doc, String field, String value, DocValues.Type type) { - doc.add(new Field(field, value, StringField.TYPE_UNSTORED)); + doc.add(new StringField(field, value)); if (type == null) { return; } @@ -450,14 +450,14 @@ countsVals.add(countValue); Document doc = new Document(); - doc.add(new Field("id", String.format("%09d", i), StringField.TYPE_UNSTORED)); + doc.add(new StringField("id", String.format("%09d", i))); if (groupValue != null) { addField(doc, groupField, groupValue, dvType); } if (countValue != null) { addField(doc, countField, countValue, dvType); } - doc.add(new Field("content", content, TextField.TYPE_UNSTORED)); + doc.add(new TextField("content", content)); w.addDocument(doc); } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (revision 1348347) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (working copy) @@ -77,48 +77,48 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random text", Store.YES)); doc.add(new Field("id", "1", customType)); w.addDocument(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random text", Store.YES)); doc.add(new Field("id", "2", customType)); w.addDocument(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random textual data", Store.YES)); doc.add(new Field("id", "3", customType)); w.addDocument(doc); // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV); - doc.add(new Field("content", "some random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some random text", Store.YES)); doc.add(new Field("id", "4", customType)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "some more random text", Store.YES)); doc.add(new Field("id", "5", customType)); w.addDocument(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "random", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random", Store.YES)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new TextField("content", "random word stuck in alot of other text", Store.YES)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); @@ -174,7 +174,7 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new TextField(groupField, value, Store.YES)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value))); } @@ -582,7 +582,7 @@ final List> updateDocs = new ArrayList>(); - FieldType groupEndType = new FieldType(StringField.TYPE_UNSTORED); + FieldType groupEndType = new FieldType(StringField.TYPE); groupEndType.setIndexOptions(IndexOptions.DOCS_ONLY); groupEndType.setOmitNorms(true); @@ -594,12 +594,12 @@ Document doc = new Document(); docs.add(doc); if (groupValue.group != null) { - doc.add(newField("group", groupValue.group.utf8ToString(), StringField.TYPE_UNSTORED)); + doc.add(newStringField("group", groupValue.group.utf8ToString())); } - doc.add(newField("sort1", groupValue.sort1.utf8ToString(), StringField.TYPE_UNSTORED)); - doc.add(newField("sort2", groupValue.sort2.utf8ToString(), StringField.TYPE_UNSTORED)); + doc.add(newStringField("sort1", groupValue.sort1.utf8ToString())); + doc.add(newStringField("sort2", groupValue.sort2.utf8ToString())); doc.add(new IntField("id", groupValue.id)); - doc.add(newField("content", groupValue.content, TextField.TYPE_UNSTORED)); + doc.add(newTextField("content", groupValue.content)); //System.out.println("TEST: doc content=" + groupValue.content + " group=" + (groupValue.group == null ? "null" : groupValue.group.utf8ToString()) + " sort1=" + groupValue.sort1.utf8ToString() + " id=" + groupValue.id); } // So we can pull filter marking last doc in block: @@ -712,15 +712,15 @@ doc.add(idvGroupField); } - Field group = newField("group", "", StringField.TYPE_UNSTORED); + Field group = newStringField("group", ""); doc.add(group); - Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED); + Field sort1 = newStringField("sort1", ""); doc.add(sort1); docNoGroup.add(sort1); - Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED); + Field sort2 = newStringField("sort2", ""); doc.add(sort2); docNoGroup.add(sort2); - Field content = newField("content", "", TextField.TYPE_UNSTORED); + Field content = newTextField("content", ""); doc.add(content); docNoGroup.add(content); IntField id = new IntField("id", 0); Index: solr/core/src/test/org/apache/solr/search/TestSort.java =================================================================== --- solr/core/src/test/org/apache/solr/search/TestSort.java (revision 1348347) +++ solr/core/src/test/org/apache/solr/search/TestSort.java (working copy) @@ -158,8 +158,8 @@ public void testSort() throws Exception { Directory dir = new RAMDirectory(); - Field f = new Field("f", "0", StringField.TYPE_UNSTORED); - Field f2 = new Field("f2", "0", StringField.TYPE_UNSTORED); + Field f = new StringField("f", "0"); + Field f2 = new StringField("f2", "0"); for (int iterCnt = 0; iterCnt