diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java index 07e0832706a..49ad1bfb644 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.node; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.collect.ImmutableMap; import org.elasticsearch.util.collect.Maps; @@ -63,7 +62,7 @@ public class DiscoveryNode implements Streamable, Serializable { public static final ImmutableList EMPTY_LIST = ImmutableList.of(); - private String nodeName = StringHelper.intern(""); + private String nodeName = "".intern(); private String nodeId; @@ -80,16 +79,16 @@ public class DiscoveryNode implements Streamable, Serializable { public DiscoveryNode(String nodeName, String nodeId, TransportAddress address, Map attributes) { if (nodeName == null) { - this.nodeName = StringHelper.intern(""); + this.nodeName = "".intern(); } else { - this.nodeName = StringHelper.intern(nodeName); + this.nodeName = nodeName.intern(); } ImmutableMap.Builder builder = ImmutableMap.builder(); for (Map.Entry entry : attributes.entrySet()) { - builder.put(StringHelper.intern(entry.getKey()), StringHelper.intern(entry.getValue())); + builder.put(entry.getKey().intern(), entry.getValue().intern()); } this.attributes = builder.build(); - this.nodeId = StringHelper.intern(nodeId); + this.nodeId = nodeId.intern(); this.address = address; } @@ -183,13 +182,13 @@ public class DiscoveryNode implements Streamable, Serializable { } @Override public void readFrom(StreamInput in) throws IOException { - nodeName = StringHelper.intern(in.readUTF()); - nodeId = StringHelper.intern(in.readUTF()); + nodeName = in.readUTF().intern(); + nodeId = in.readUTF().intern(); address = TransportAddressSerializers.addressFromStream(in); int size = in.readVInt(); ImmutableMap.Builder builder = ImmutableMap.builder(); for (int i = 0; i < size; i++) { - builder.put(StringHelper.intern(in.readUTF()), StringHelper.intern(in.readUTF())); + builder.put(in.readUTF().intern(), in.readUTF().intern()); } attributes = builder.build(); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java index 29a96efdd28..ae77153d9c0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java @@ -19,7 +19,6 @@ package org.elasticsearch.index; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.concurrent.Immutable; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; @@ -41,7 +40,7 @@ public class Index implements Serializable, Streamable { } public Index(String name) { - this.name = StringHelper.intern(name); + this.name = name.intern(); } public String name() { @@ -78,7 +77,7 @@ public class Index implements Serializable, Streamable { } @Override public void readFrom(StreamInput in) throws IOException { - name = StringHelper.intern(in.readUTF()); + name = in.readUTF().intern(); } @Override public void writeTo(StreamOutput out) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java index cc76e5a8940..3eafa63f880 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java @@ -19,12 +19,10 @@ package org.elasticsearch.index.mapper; -import org.apache.lucene.util.StringHelper; - /** * @author kimchy (shay.banon) */ public interface AllFieldMapper extends FieldMapper, InternalMapper { - public static final String NAME = StringHelper.intern("_all"); + public static final String NAME = "_all"; } \ No newline at end of file diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index 601ec7946a4..4fb19bf64bc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.Term; import org.apache.lucene.search.Filter; import org.apache.lucene.search.Query; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.concurrent.Immutable; import org.elasticsearch.util.concurrent.ThreadSafe; @@ -47,10 +46,10 @@ public interface FieldMapper { private final String fullName; public Names(String name, String indexName, String indexNameClean, String fullName) { - this.name = StringHelper.intern(name); - this.indexName = StringHelper.intern(indexName); - this.indexNameClean = StringHelper.intern(indexNameClean); - this.fullName = StringHelper.intern(fullName); + this.name = name.intern(); + this.indexName = indexName.intern(); + this.indexNameClean = indexNameClean.intern(); + this.fullName = fullName.intern(); } /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java index 484140ab756..63c86c75cb5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java @@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldSelector; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.concurrent.ThreadSafe; /** @@ -32,7 +31,7 @@ import org.elasticsearch.util.concurrent.ThreadSafe; @ThreadSafe public interface SourceFieldMapper extends FieldMapper, InternalMapper { - public final String NAME = StringHelper.intern("_source"); + public final String NAME = "_source"; /** * Returns true if the source field mapper is enabled or not. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java index f3d9d6c056c..90904cb27db 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java @@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.concurrent.ThreadSafe; /** @@ -32,7 +31,7 @@ import org.elasticsearch.util.concurrent.ThreadSafe; @ThreadSafe public interface TypeFieldMapper extends FieldMapper, InternalMapper { - public static final String NAME = StringHelper.intern("_type"); + public static final String NAME = "_type"; String value(Document document); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java index 8f98e143818..91d929db741 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.index.Term; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.concurrent.ThreadSafe; /** @@ -29,7 +28,7 @@ import org.elasticsearch.util.concurrent.ThreadSafe; @ThreadSafe public interface UidFieldMapper extends FieldMapper, InternalMapper { - public static final String NAME = StringHelper.intern("_uid"); + public static final String NAME = "_uid"; Term term(String type, String id); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java index 0cd7643bac1..8bb1b8e94b2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query.xcontent; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.index.Index; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.settings.IndexSettings; @@ -105,13 +104,13 @@ public class XContentQueryParserRegistry { private void add(Map map, XContentFilterParser filterParser) { for (String name : filterParser.names()) { - map.put(StringHelper.intern(name), filterParser); + map.put(name.intern(), filterParser); } } private void add(Map map, XContentQueryParser queryParser) { for (String name : queryParser.names()) { - map.put(StringHelper.intern(name), queryParser); + map.put(name.intern(), queryParser); } } } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/xcontent/xson/XsonXContentParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/xcontent/xson/XsonXContentParser.java index bd2f08c5be7..702d301d964 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/xcontent/xson/XsonXContentParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/xcontent/xson/XsonXContentParser.java @@ -19,7 +19,6 @@ package org.elasticsearch.util.xcontent.xson; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.Bytes; import org.elasticsearch.util.Unicode; import org.elasticsearch.util.xcontent.XContentType; @@ -88,7 +87,7 @@ public class XsonXContentParser extends AbstractXContentParser { xsonType = XsonType.FIELD_NAME; currentToken = Token.FIELD_NAME; // read the field name (interned) - currentName = StringHelper.intern(inUTF()); + currentName = inUTF().intern(); } else if (tokenType == XsonType.VALUE_STRING.code()) { xsonType = XsonType.VALUE_STRING; currentToken = Token.VALUE_STRING;