diff --git a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java index 1003bde9e3f..7981d775993 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java @@ -36,7 +36,7 @@ import org.apache.lucene.codecs.TermVectorsFormat; public final class SimpleTextCodec extends Codec { private final PostingsFormat postings = new SimpleTextPostingsFormat(); private final StoredFieldsFormat storedFields = new SimpleTextStoredFieldsFormat(); - private final SegmentInfoFormat segmentInfos = new SimpleTextSegmentInfosFormat(); + private final SegmentInfoFormat segmentInfos = new SimpleTextSegmentInfoFormat(); private final FieldInfosFormat fieldInfosFormat = new SimpleTextFieldInfosFormat(); private final TermVectorsFormat vectorsFormat = new SimpleTextTermVectorsFormat(); // TODO: need a plain-text impl diff --git a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java similarity index 94% rename from lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosFormat.java rename to lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java index 9825768995e..52c8f0c9d40 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java @@ -33,9 +33,9 @@ import org.apache.lucene.index.SegmentInfo; * FOR RECREATIONAL USE ONLY * @lucene.experimental */ -public class SimpleTextSegmentInfosFormat extends SegmentInfoFormat { - private final SegmentInfoReader reader = new SimpleTextSegmentInfosReader(); - private final SegmentInfoWriter writer = new SimpleTextSegmentInfosWriter(); +public class SimpleTextSegmentInfoFormat extends SegmentInfoFormat { + private final SegmentInfoReader reader = new SimpleTextSegmentInfoReader(); + private final SegmentInfoWriter writer = new SimpleTextSegmentInfoWriter(); public static final String SI_EXTENSION = "si"; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java similarity index 97% rename from lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java rename to lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java index cb571278291..9572db9755a 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java @@ -38,7 +38,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.StringHelper; -import static org.apache.lucene.codecs.simpletext.SimpleTextSegmentInfosWriter.*; +import static org.apache.lucene.codecs.simpletext.SimpleTextSegmentInfoWriter.*; // nocommit rename (remove s) @@ -48,12 +48,12 @@ import static org.apache.lucene.codecs.simpletext.SimpleTextSegmentInfosWriter.* * FOR RECREATIONAL USE ONLY * @lucene.experimental */ -public class SimpleTextSegmentInfosReader extends SegmentInfoReader { +public class SimpleTextSegmentInfoReader extends SegmentInfoReader { @Override public SegmentInfo read(Directory directory, String segmentName, IOContext context) throws IOException { BytesRef scratch = new BytesRef(); - String segFileName = IndexFileNames.segmentFileName(segmentName, "", SimpleTextSegmentInfosFormat.SI_EXTENSION); + String segFileName = IndexFileNames.segmentFileName(segmentName, "", SimpleTextSegmentInfoFormat.SI_EXTENSION); IndexInput input = directory.openInput(segFileName, context); boolean success = false; try { diff --git a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java similarity index 97% rename from lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java rename to lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java index 2ca9a52eaa6..c9c496fba1f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java @@ -43,7 +43,7 @@ import org.apache.lucene.util.IOUtils; * FOR RECREATIONAL USE ONLY * @lucene.experimental */ -public class SimpleTextSegmentInfosWriter extends SegmentInfoWriter { +public class SimpleTextSegmentInfoWriter extends SegmentInfoWriter { final static BytesRef SI_VERSION = new BytesRef(" version "); final static BytesRef SI_DOCCOUNT = new BytesRef(" number of documents "); @@ -60,7 +60,7 @@ public class SimpleTextSegmentInfosWriter extends SegmentInfoWriter { @Override public void write(Directory dir, SegmentInfo si, FieldInfos fis, IOContext ioContext) throws IOException { - String segFileName = IndexFileNames.segmentFileName(si.name, "", SimpleTextSegmentInfosFormat.SI_EXTENSION); + String segFileName = IndexFileNames.segmentFileName(si.name, "", SimpleTextSegmentInfoFormat.SI_EXTENSION); si.getFiles().add(segFileName); boolean success = false; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java index 296042510bd..478681c6438 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java @@ -42,7 +42,7 @@ public class PreFlexRWCodec extends Lucene3xCodec { private final Lucene3xNormsFormat norms = new PreFlexRWNormsFormat(); private final FieldInfosFormat fieldInfos = new PreFlexRWFieldInfosFormat(); private final TermVectorsFormat termVectors = new PreFlexRWTermVectorsFormat(); - private final SegmentInfoFormat segmentInfos = new PreFlexRWSegmentInfosFormat(); + private final SegmentInfoFormat segmentInfos = new PreFlexRWSegmentInfoFormat(); private final StoredFieldsFormat storedFields = new PreFlexRWStoredFieldsFormat(); // TODO: this should really be a different impl private final LiveDocsFormat liveDocs = new Lucene40LiveDocsFormat(); diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfoFormat.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfoFormat.java index d9cf0a9afd7..0e0592ab471 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfoFormat.java @@ -22,8 +22,8 @@ import org.apache.lucene.codecs.SegmentInfoWriter; /** * @lucene.experimental */ -class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfoFormat { - private final SegmentInfoWriter writer = new PreFlexRWSegmentInfosWriter(); +class PreFlexRWSegmentInfoFormat extends Lucene3xSegmentInfoFormat { + private final SegmentInfoWriter writer = new PreFlexRWSegmentInfoWriter(); @Override public SegmentInfoWriter getSegmentInfosWriter() { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfoWriter.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java rename to lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfoWriter.java index 85397526d16..6858a94919d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfoWriter.java @@ -37,7 +37,7 @@ import org.apache.lucene.util.IOUtils; * PreFlex implementation of {@link SegmentInfoWriter}. * @lucene.experimental */ -class PreFlexRWSegmentInfosWriter extends SegmentInfoWriter { +class PreFlexRWSegmentInfoWriter extends SegmentInfoWriter { // NOTE: this is not "really" 3.x format, because we are // writing each SI to its own file, vs 3.x where the list