1 files changed, 12 insertions, 12 deletions
diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardId.java b/core/src/main/java/org/elasticsearch/index/shard/ShardId.java
index 2c0eb7c9e3..f021cb4c16 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/ShardId.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/ShardId.java
@@ -40,22 +40,22 @@ public class ShardId implements Streamable, Comparable<ShardId> {
     private ShardId() {
     }
 
-    public ShardId(String index, int shardId) {
-        this(new Index(index), shardId);
-    }
-
     public ShardId(Index index, int shardId) {
         this.index = index;
         this.shardId = shardId;
         this.hashCode = computeHashCode();
     }
 
-    public Index index() {
-        return this.index;
+    public ShardId(String index, String indexUUID, int shardId) {
+        this(new Index(index, indexUUID), shardId);
+    }
+
+    public Index getIndex() {
+        return index;
     }
 
-    public String getIndex() {
-        return index().name();
+    public String getIndexName() {
+        return index.getName();
     }
 
     public int id() {
@@ -68,7 +68,7 @@ public class ShardId implements Streamable, Comparable<ShardId> {
 
     @Override
     public String toString() {
-        return "[" + index.name() + "][" + shardId + "]";
+        return "[" + index.getName() + "][" + shardId + "]";
     }
 
     @Override
@@ -76,7 +76,7 @@ public class ShardId implements Streamable, Comparable<ShardId> {
         if (this == o) return true;
         if (o == null) return false;
         ShardId shardId1 = (ShardId) o;
-        return shardId == shardId1.shardId && index.name().equals(shardId1.index.name());
+        return shardId == shardId1.shardId && index.getName().equals(shardId1.index.getName());
     }
 
     @Override
@@ -98,7 +98,7 @@ public class ShardId implements Streamable, Comparable<ShardId> {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        index = Index.readIndexName(in);
+        index = Index.readIndex(in);
         shardId = in.readVInt();
         hashCode = computeHashCode();
     }
@@ -112,7 +112,7 @@ public class ShardId implements Streamable, Comparable<ShardId> {
     @Override
     public int compareTo(ShardId o) {
         if (o.getId() == shardId) {
-            return index.name().compareTo(o.getIndex());
+            return index.getName().compareTo(o.getIndex().getName());
         }
         return Integer.compare(shardId, o.getId());
     }