Remove type parameters from Client.prepareDelete() and Client.prepareUpdate()

modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionTests.java

@@ -521,7 +521,6 @@ public void testInvalidUpdateScript() throws Exception {
             ensureGreen("test_index");
             indexRandom(true, client().prepareIndex("test_index", "doc", "1").setSource("text_field", "text"));
             UpdateRequestBuilder urb = client().prepareUpdate().setIndex("test_index");
-            urb.setType("doc");
             urb.setId("1");
             urb.setScript(new Script(ScriptType.INLINE, ExpressionScriptEngine.NAME, "0", Collections.emptyMap()));
             urb.get();

modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionTests.java

@@ -56,7 +56,7 @@ public void testAllOpsDisabledIndexedScripts() throws IOException {
                 .get();
         client().prepareIndex("test", "scriptTest", "1").setSource("{\"theField\":\"foo\"}", XContentType.JSON).get();
         try {
-            client().prepareUpdate("test", "scriptTest", "1")
+            client().prepareUpdate("test", "1")
                     .setScript(new Script(ScriptType.STORED, null, "script1", Collections.emptyMap())).get();
             fail("update script should have been rejected");
         } catch(Exception e) {

modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java

@@ -192,7 +192,7 @@ public void testWithDeletes() throws Exception {
              * the updates cause that.
              */
             UpdateResponse updateResponse;
-            updateResponse = client().prepareUpdate(indexName, "doc", idToUpdate)
+            updateResponse = client().prepareUpdate(indexName, idToUpdate)
                     .setRouting("1")
                     .setDoc(Requests.INDEX_CONTENT_TYPE, "count", 1)
                     .setDetectNoop(false)

modules/parent-join/src/test/java/org/elasticsearch/join/query/ChildQuerySearchIT.java

@@ -707,7 +707,7 @@ public void testParentChildQueriesCanHandleNoRelevantTypesInIndex() throws Excep
         assertNoFailures(response);
         assertThat(response.getHits().getTotalHits().value, equalTo(0L));
 
-        client().prepareIndex("test", "doc").setSource(jsonBuilder().startObject().field("text", "value").endObject())
+        client().prepareIndex("test").setSource(jsonBuilder().startObject().field("text", "value").endObject())
             .setRefreshPolicy(RefreshPolicy.IMMEDIATE).get();
 
         response = client().prepareSearch("test")

modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.index.IndexNotFoundException;
-import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.rankeval.PrecisionAtK.Detail;
@@ -61,21 +60,21 @@ public void setup() {
         createIndex(TEST_INDEX);
         ensureGreen();
 
-        client().prepareIndex(TEST_INDEX, MapperService.SINGLE_MAPPING_NAME).setId("1")
+        client().prepareIndex(TEST_INDEX).setId("1")
                 .setSource("text", "berlin", "title", "Berlin, Germany", "population", 3670622).get();
-        client().prepareIndex(TEST_INDEX, MapperService.SINGLE_MAPPING_NAME).setId("2").setSource("text", "amsterdam", "population", 851573)
+        client().prepareIndex(TEST_INDEX).setId("2").setSource("text", "amsterdam", "population", 851573)
                 .get();
-        client().prepareIndex(TEST_INDEX, MapperService.SINGLE_MAPPING_NAME).setId("3").setSource("text", "amsterdam", "population", 851573)
+        client().prepareIndex(TEST_INDEX).setId("3").setSource("text", "amsterdam", "population", 851573)
                 .get();
-        client().prepareIndex(TEST_INDEX, MapperService.SINGLE_MAPPING_NAME).setId("4").setSource("text", "amsterdam", "population", 851573)
+        client().prepareIndex(TEST_INDEX).setId("4").setSource("text", "amsterdam", "population", 851573)
                 .get();
-        client().prepareIndex(TEST_INDEX, MapperService.SINGLE_MAPPING_NAME).setId("5").setSource("text", "amsterdam", "population", 851573)
+        client().prepareIndex(TEST_INDEX).setId("5").setSource("text", "amsterdam", "population", 851573)
                 .get();
-        client().prepareIndex(TEST_INDEX, MapperService.SINGLE_MAPPING_NAME).setId("6").setSource("text", "amsterdam", "population", 851573)
+        client().prepareIndex(TEST_INDEX).setId("6").setSource("text", "amsterdam", "population", 851573)
                 .get();
 
         // add another index for testing closed indices etc...
-        client().prepareIndex("test2", MapperService.SINGLE_MAPPING_NAME).setId("7").setSource("text", "amsterdam", "population", 851573)
+        client().prepareIndex("test2").setId("7").setSource("text", "amsterdam", "population", 851573)
                 .get();
         refresh();
 

modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryConcurrentTests.java

@@ -42,7 +42,7 @@ public void testConcurrentDeleteByQueriesOnDifferentDocs() throws Throwable {
         List<IndexRequestBuilder> builders = new ArrayList<>();
         for (int i = 0; i < docs; i++) {
             for (int t = 0; t < threads.length; t++) {
-                builders.add(client().prepareIndex("test", "doc").setSource("field", t));
+                builders.add(client().prepareIndex("test").setSource("field", t));
             }
         }
         indexRandom(true, true, true, builders);

modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java

@@ -91,7 +91,7 @@ protected Settings nodeSettings() {
 
     @Before
     public void setupSourceIndex() {
-        client().prepareIndex("source", "test").setSource("test", "test").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get();
+        client().prepareIndex("source").setSource("test", "test").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get();
     }
 
     @Before

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java

@@ -177,7 +177,7 @@ private void testCase(
         // Build the test data. Don't use indexRandom because that won't work consistently with such small thread pools.
         BulkRequestBuilder bulk = client().prepareBulk();
         for (int i = 0; i < DOC_COUNT; i++) {
-            bulk.add(client().prepareIndex("source", "test").setSource("foo", "bar " + i));
+            bulk.add(client().prepareIndex("source").setSource("foo", "bar " + i));
         }
 
         Retry retry = new Retry(BackoffPolicy.exponentialBackoff(), client().threadPool());

plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java

@@ -102,13 +102,13 @@ public void testSimpleWorkflow() {
 
         logger.info("--> delete some data");
         for (int i = 0; i < 50; i++) {
-            client.prepareDelete("test-idx-1", "doc", Integer.toString(i)).get();
+            client.prepareDelete("test-idx-1", Integer.toString(i)).get();
         }
         for (int i = 50; i < 100; i++) {
-            client.prepareDelete("test-idx-2", "doc", Integer.toString(i)).get();
+            client.prepareDelete("test-idx-2", Integer.toString(i)).get();
         }
         for (int i = 0; i < 100; i += 2) {
-            client.prepareDelete("test-idx-3", "doc", Integer.toString(i)).get();
+            client.prepareDelete("test-idx-3", Integer.toString(i)).get();
         }
         client().admin().indices().prepareRefresh().get();
         assertThat(count(client, "test-idx-1"), equalTo(50L));

server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java

@@ -39,15 +39,6 @@ public DeleteRequestBuilder(ElasticsearchClient client, DeleteAction action, @Nu
         super(client, action, new DeleteRequest(index));
     }
 
-    /**
-     * Sets the type of the document to delete.
-     * @deprecated types are being removed
-     */
-    @Deprecated
-    public DeleteRequestBuilder setType(String type) {
-        return this;
-    }
-
     /**
      * Sets the id of the document to delete.
      */

server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java

@@ -40,24 +40,10 @@ public UpdateRequestBuilder(ElasticsearchClient client, UpdateAction action) {
         super(client, action, new UpdateRequest());
     }
 
-    @Deprecated
-    public UpdateRequestBuilder(ElasticsearchClient client, UpdateAction action, String index, String type, String id) {
-        super(client, action, new UpdateRequest(index, id));
-    }
-
     public UpdateRequestBuilder(ElasticsearchClient client, UpdateAction action, String index, String id) {
         super(client, action, new UpdateRequest(index, id));
     }
 
-    /**
-     * Sets the type of the indexed document.
-     * @deprecated types are being removed
-     */
-    @Deprecated
-    public UpdateRequestBuilder setType(String type) {
-        return this;
-    }
-
     /**
      * Sets the id of the indexed document.
      */

server/src/main/java/org/elasticsearch/client/Client.java

@@ -100,7 +100,7 @@ public interface Client extends ElasticsearchClient, Releasable {
 
 
     /**
-     * Index a JSON source associated with a given index and type.
+     * Index a JSON source associated with a given index.
      * <p>
      * The id is optional, if it is not provided, one will be generated automatically.
      *
@@ -111,7 +111,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     ActionFuture<IndexResponse> index(IndexRequest request);
 
     /**
-     * Index a document associated with a given index and type.
+     * Index a document associated with a given index.
      * <p>
      * The id is optional, if it is not provided, one will be generated automatically.
      *
@@ -122,12 +122,32 @@ public interface Client extends ElasticsearchClient, Releasable {
     void index(IndexRequest request, ActionListener<IndexResponse> listener);
 
     /**
-     * Index a document associated with a given index and type.
+     * Index a document associated with a given index.
      * <p>
      * The id is optional, if it is not provided, one will be generated automatically.
      */
     IndexRequestBuilder prepareIndex();
 
+    /**
+     * Index a document associated with a given index.
+     * <p>
+     * The id is optional, if it is not provided, one will be generated automatically.
+     *
+     * @param index The index to index the document to
+     */
+    IndexRequestBuilder prepareIndex(String index);
+
+    /**
+     * Index a document associated with a given index and type.
+     * <p>
+     * The id is optional, if it is not provided, one will be generated automatically.
+     *
+     * @param index The index to index the document to
+     * @param type  The type to index the document to
+     * @param id    The id of the document
+     */
+    IndexRequestBuilder prepareIndex(String index, String type, @Nullable String id);
+
     /**
      * Updates a document based on a script.
      *
@@ -152,31 +172,10 @@ public interface Client extends ElasticsearchClient, Releasable {
     /**
      * Updates a document based on a script.
      */
-    UpdateRequestBuilder prepareUpdate(String index, String type, String id);
+    UpdateRequestBuilder prepareUpdate(String index, String id);
 
     /**
-     * Index a document associated with a given index and type.
-     * <p>
-     * The id is optional, if it is not provided, one will be generated automatically.
-     *
-     * @param index The index to index the document to
-     * @param type  The type to index the document to
-     */
-    IndexRequestBuilder prepareIndex(String index, String type);
-
-    /**
-     * Index a document associated with a given index and type.
-     * <p>
-     * The id is optional, if it is not provided, one will be generated automatically.
-     *
-     * @param index The index to index the document to
-     * @param type  The type to index the document to
-     * @param id    The id of the document
-     */
-    IndexRequestBuilder prepareIndex(String index, String type, @Nullable String id);
-
-    /**
-     * Deletes a document from the index based on the index, type and id.
+     * Deletes a document from the index based on the index and id.
      *
      * @param request The delete request
      * @return The result future
@@ -185,7 +184,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     ActionFuture<DeleteResponse> delete(DeleteRequest request);
 
     /**
-     * Deletes a document from the index based on the index, type and id.
+     * Deletes a document from the index based on the index and id.
      *
      * @param request  The delete request
      * @param listener A listener to be notified with a result
@@ -194,18 +193,17 @@ public interface Client extends ElasticsearchClient, Releasable {
     void delete(DeleteRequest request, ActionListener<DeleteResponse> listener);
 
     /**
-     * Deletes a document from the index based on the index, type and id.
+     * Deletes a document from the index based on the index and id.
      */
     DeleteRequestBuilder prepareDelete();
 
     /**
-     * Deletes a document from the index based on the index, type and id.
+     * Deletes a document from the index based on the index and id.
      *
      * @param index The index to delete the document from
-     * @param type  The type of the document to delete
      * @param id    The id of the document to delete
      */
-    DeleteRequestBuilder prepareDelete(String index, String type, String id);
+    DeleteRequestBuilder prepareDelete(String index, String id);
 
     /**
      * Executes a bulk of index / delete operations.
@@ -236,7 +234,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     BulkRequestBuilder prepareBulk(@Nullable String globalIndex);
 
     /**
-     * Gets the document that was indexed from an index with a type and id.
+     * Gets the document that was indexed from an index with an id.
      *
      * @param request The get request
      * @return The result future
@@ -245,7 +243,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     ActionFuture<GetResponse> get(GetRequest request);
 
     /**
-     * Gets the document that was indexed from an index with a type and id.
+     * Gets the document that was indexed from an index with an id.
      *
      * @param request  The get request
      * @param listener A listener to be notified with a result
@@ -254,7 +252,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     void get(GetRequest request, ActionListener<GetResponse> listener);
 
     /**
-     * Gets the document that was indexed from an index with a type and id.
+     * Gets the document that was indexed from an index with an id.
      */
     GetRequestBuilder prepareGet();
 
@@ -279,7 +277,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     MultiGetRequestBuilder prepareMultiGet();
 
     /**
-     * Search across one or more indices and one or more types with a query.
+     * Search across one or more indices with a query.
      *
      * @param request The search request
      * @return The result future
@@ -288,7 +286,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     ActionFuture<SearchResponse> search(SearchRequest request);
 
     /**
-     * Search across one or more indices and one or more types with a query.
+     * Search across one or more indices with a query.
      *
      * @param request  The search request
      * @param listener A listener to be notified of the result
@@ -297,7 +295,7 @@ public interface Client extends ElasticsearchClient, Releasable {
     void search(SearchRequest request, ActionListener<SearchResponse> listener);
 
     /**
-     * Search across one or more indices and one or more types with a query.
+     * Search across one or more indices with a query.
      */
     SearchRequestBuilder prepareSearch(String... indices);
 

server/src/main/java/org/elasticsearch/client/support/AbstractClient.java

@@ -400,8 +400,8 @@ public IndexRequestBuilder prepareIndex() {
     }
 
     @Override
-    public IndexRequestBuilder prepareIndex(String index, String type) {
-        return prepareIndex(index, type, null);
+    public IndexRequestBuilder prepareIndex(String index) {
+        return prepareIndex(index, null, null);
     }
 
     @Override
@@ -421,12 +421,12 @@ public void update(final UpdateRequest request, final ActionListener<UpdateRespo
 
     @Override
     public UpdateRequestBuilder prepareUpdate() {
-        return new UpdateRequestBuilder(this, UpdateAction.INSTANCE, null, null, null);
+        return new UpdateRequestBuilder(this, UpdateAction.INSTANCE, null, null);
     }
 
     @Override
-    public UpdateRequestBuilder prepareUpdate(String index, String type, String id) {
-        return new UpdateRequestBuilder(this, UpdateAction.INSTANCE, index, type, id);
+    public UpdateRequestBuilder prepareUpdate(String index, String id) {
+        return new UpdateRequestBuilder(this, UpdateAction.INSTANCE, index, id);
     }
 
     @Override
@@ -445,8 +445,8 @@ public DeleteRequestBuilder prepareDelete() {
     }
 
     @Override
-    public DeleteRequestBuilder prepareDelete(String index, String type, String id) {
-        return prepareDelete().setIndex(index).setType(type).setId(id);
+    public DeleteRequestBuilder prepareDelete(String index, String id) {
+        return prepareDelete().setIndex(index).setId(id);
     }
 
     @Override

server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java

@@ -450,7 +450,7 @@ public void waitForTaskCompletion(Task task) {
             }
             // Need to run the task in a separate thread because node client's .execute() is blocked by our task listener
             index = new Thread(() -> {
-                IndexResponse indexResponse = client().prepareIndex("test", "test").setSource("test", "test").get();
+                IndexResponse indexResponse = client().prepareIndex("test").setSource("test", "test").get();
                 assertArrayEquals(ReplicationResponse.EMPTY, indexResponse.getShardInfo().getFailures());
             });
             index.start();

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java

@@ -57,11 +57,11 @@ protected void setUpRepository() throws Exception {
 
         int docs = between(10, 100);
         for (int i = 0; i < docs; i++) {
-            client().prepareIndex(INDEX_NAME, "type").setSource("test", "init").execute().actionGet();
+            client().prepareIndex(INDEX_NAME).setSource("test", "init").execute().actionGet();
         }
         docs = between(10, 100);
         for (int i = 0; i < docs; i++) {
-            client().prepareIndex(OTHER_INDEX_NAME, "type").setSource("test", "init").execute().actionGet();
+            client().prepareIndex(OTHER_INDEX_NAME).setSource("test", "init").execute().actionGet();
         }
 
         logger.info("--> register a repository");