From 73785e075e666bcf0b2db548db449c4210d453bc Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Mon, 31 Aug 2015 15:48:32 +0200
Subject: [PATCH] add default impl for resolveIndex()

---
 .../elasticsearch/action/delete/TransportDeleteAction.java   | 5 -----
 .../org/elasticsearch/action/index/TransportIndexAction.java | 5 -----
 .../support/replication/TransportReplicationAction.java      | 4 +++-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
index 8e2df0388e4..5e16916bac1 100644
--- a/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
+++ b/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
@@ -94,11 +94,6 @@ public class TransportDeleteAction extends TransportReplicationAction<DeleteRequ
         }
     }
 
-    @Override
-    protected boolean resolveIndex() {
-        return true;
-    }
-
     @Override
     protected void resolveRequest(final ClusterState state, final InternalRequest request, final ActionListener<DeleteResponse> listener) {
         request.request().routing(state.metaData().resolveIndexRouting(request.request().routing(), request.request().index()));
diff --git a/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
index 97620829f3a..83e70c2f504 100644
--- a/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
+++ b/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
@@ -120,11 +120,6 @@ public class TransportIndexAction extends TransportReplicationAction<IndexReques
         }
     }
 
-    @Override
-    protected boolean resolveIndex() {
-        return true;
-    }
-
     @Override
     protected void resolveRequest(ClusterState state, InternalRequest request, ActionListener<IndexResponse> indexResponseActionListener) {
         MetaData metaData = clusterService.state().metaData();
diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
index 155c30756ca..f6925009189 100644
--- a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -142,7 +142,9 @@ public abstract class TransportReplicationAction<Request extends ReplicationRequ
         return state.blocks().indexBlockedException(ClusterBlockLevel.WRITE, request.concreteIndex());
     }
 
-    protected abstract boolean resolveIndex();
+    protected boolean resolveIndex() {
+        return true;
+    }
 
     /**
      * Resolves the request, by default doing nothing. Can be subclassed to do