From b49a0dc9be2d32870917e2b48d1ccc5170fbc583 Mon Sep 17 00:00:00 2001
From: Mayya Sharipova <mayya.sharipova@elastic.co>
Date: Mon, 19 Nov 2018 12:57:01 -0500
Subject: [PATCH] Correct errors - HRLC TermVectorRequest

Relates to #35266, #35614
---
 .../org/elasticsearch/client/core/TermVectorsRequest.java | 7 -------
 .../src/test/java/org/elasticsearch/client/CrudIT.java    | 6 +++---
 .../client/documentation/CRUDDocumentationIT.java         | 8 ++++----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsRequest.java
index ee5aaacbf0c20..30e97d3fc9ca8 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsRequest.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsRequest.java
@@ -170,13 +170,6 @@ public void setPerFieldAnalyzer(Map<String, String> perFieldAnalyzer) {
         this.perFieldAnalyzer = perFieldAnalyzer;
     }
 
-    /**
-     * Sets an artifical document on what to request _termvectors
-     */
-    public void setDoc(XContentBuilder docBuilder) {
-        this.docBuilder = docBuilder;
-    }
-
     /**
      * Sets conditions for terms filtering
      */
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java
index 6f145efff5598..cc94deab0ecbd 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java
@@ -1214,7 +1214,7 @@ public void testMultiTermvectors() throws IOException {
         {
             // test _mtermvectors where MultiTermVectorsRequest is constructed with ids and a template
             String[] expectedIds = {"1", "2"};
-            TermVectorsRequest tvRequestTemplate = new TermVectorsRequest(sourceIndex, "_doc");
+            TermVectorsRequest tvRequestTemplate = new TermVectorsRequest(sourceIndex, "_doc", "fake_id");
             tvRequestTemplate.setFields("field");
             MultiTermVectorsRequest mtvRequest = new MultiTermVectorsRequest(expectedIds, tvRequestTemplate);
 
@@ -1236,10 +1236,10 @@ public void testMultiTermvectors() throws IOException {
             TermVectorsRequest tvRequest1 = new TermVectorsRequest(sourceIndex, "_doc", "1");
             tvRequest1.setFields("field");
             mtvRequest.add(tvRequest1);
-            TermVectorsRequest tvRequest2 = new TermVectorsRequest(sourceIndex, "_doc");
+
             XContentBuilder docBuilder = XContentFactory.jsonBuilder();
             docBuilder.startObject().field("field", "valuex").endObject();
-            tvRequest2.setDoc(docBuilder);
+            TermVectorsRequest tvRequest2 = new TermVectorsRequest(sourceIndex, "_doc", docBuilder);
             mtvRequest.add(tvRequest2);
 
             MultiTermVectorsResponse mtvResponse =
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
index 6f7c21c2db813..a2190080e0265 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
@@ -1692,18 +1692,18 @@ public void testMultiTermVectors() throws Exception {
                 new TermVectorsRequest("authors", "_doc", "1");
             tvrequest1.setFields("user");
             request.add(tvrequest1); // <2>
-            TermVectorsRequest tvrequest2 =
-                new TermVectorsRequest("authors", "_doc");
+
             XContentBuilder docBuilder = XContentFactory.jsonBuilder();
             docBuilder.startObject().field("user", "guest-user").endObject();
-            tvrequest2.setDoc(docBuilder);
+            TermVectorsRequest tvrequest2 =
+                new TermVectorsRequest("authors", "_doc", docBuilder);
             request.add(tvrequest2); // <3>
             // end::multi-term-vectors-request
         }
 
         // tag::multi-term-vectors-request-template
         TermVectorsRequest tvrequestTemplate =
-            new TermVectorsRequest("authors", "_doc"); // <1>
+            new TermVectorsRequest("authors", "_doc", "fake_id"); // <1>
         tvrequestTemplate.setFields("user");
         String[] ids = {"1", "2"};
         MultiTermVectorsRequest request =