From 373dc4a2df872769be02ee96971202ad79592a81 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 17 May 2012 19:16:27 +0000 Subject: [PATCH] LUCENE-4055: remove fieldinfos.clone() git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1339807 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/lucene/index/FieldInfos.java | 8 +------- .../org/apache/lucene/index/MutableFieldInfos.java | 13 ------------- .../org/apache/lucene/index/ReadOnlyFieldInfos.java | 12 ------------ .../org/apache/lucene/index/TestFieldInfos.java | 4 ---- 4 files changed, 1 insertion(+), 36 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java index 134f2d861e0..e617935625e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java +++ b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java @@ -25,14 +25,8 @@ import org.apache.lucene.index.FieldInfo.IndexOptions; * Collection of {@link FieldInfo}s (accessible by number or by name). * @lucene.experimental */ -public abstract class FieldInfos implements Cloneable,Iterable { +public abstract class FieldInfos implements Iterable { - /** - * Returns a deep clone of this FieldInfos instance. - */ - @Override - public abstract FieldInfos clone(); - /** * Return the fieldinfo object referenced by the field name * @return the FieldInfo object or null when the given fieldName diff --git a/lucene/core/src/java/org/apache/lucene/index/MutableFieldInfos.java b/lucene/core/src/java/org/apache/lucene/index/MutableFieldInfos.java index 0bf303f4ab8..efb8446f62a 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MutableFieldInfos.java +++ b/lucene/core/src/java/org/apache/lucene/index/MutableFieldInfos.java @@ -133,19 +133,6 @@ final class MutableFieldInfos extends FieldInfos { + " already taken"; return fieldNumber; } - - /** - * Returns a deep clone of this FieldInfos instance. - */ - @Override - synchronized public MutableFieldInfos clone() { - MutableFieldInfos fis = new MutableFieldInfos(globalFieldNumbers); - for (FieldInfo fi : this) { - FieldInfo clone = fi.clone(); - fis.putInternal(clone); - } - return fis; - } /** * Assumes the fields are not storing term vectors. diff --git a/lucene/core/src/java/org/apache/lucene/index/ReadOnlyFieldInfos.java b/lucene/core/src/java/org/apache/lucene/index/ReadOnlyFieldInfos.java index cb1d5755c1c..08a5f10d3ec 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ReadOnlyFieldInfos.java +++ b/lucene/core/src/java/org/apache/lucene/index/ReadOnlyFieldInfos.java @@ -112,16 +112,4 @@ public final class ReadOnlyFieldInfos extends FieldInfos { public FieldInfo fieldInfo(int fieldNumber) { return (fieldNumber >= 0) ? byNumber.get(fieldNumber) : null; } - - // nocommit: probably unnecessary - @Override - public ReadOnlyFieldInfos clone() { - FieldInfo infos[] = new FieldInfo[size()]; - int upto = 0; - for (FieldInfo info : this) { - infos[upto++] = info.clone(); - } - return new ReadOnlyFieldInfos(infos); - } - } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java index b32cbaa2b9c..a25f1e196df 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java @@ -104,10 +104,6 @@ public class TestFieldInfos extends LuceneTestCase { FieldInfos fieldInfos = createAndWriteFieldInfos(dir, name); FieldInfos readOnly = readFieldInfos(dir, name); assertReadOnly(readOnly, fieldInfos); - FieldInfos readOnlyClone = readOnly.clone(); - assertNotSame(readOnly, readOnlyClone); - // clone is also read only - no global field map - assertReadOnly(readOnlyClone, fieldInfos); dir.close(); }