Skip to content

Correct errors - HRLC TermVectorRequest #35705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2018
Merged

Correct errors - HRLC TermVectorRequest #35705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
6 changes: 3 additions & 3 deletions client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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 =
Expand Down
8 changes: 4 additions & 4 deletions ...-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down