Merge pull request elastic#13218 from brwe/resolve-index-default-impl

add default impl for resolveIndex()
truemped · Aug 31, 2015 · a7e2400 · a7e2400
2 parents a492179 + 73785e0
commit a7e2400
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -94,11 +94,6 @@ public void onFailure(Throwable e) {
         }
     }
 
-    @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
@@ -120,11 +120,6 @@ public void onFailure(Throwable e) {
         }
     }
 
-    @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/...rc/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/...rc/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -142,7 +142,9 @@ protected ClusterBlockException checkRequestBlock(ClusterState state, InternalRe
         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