honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use include-tagged macro for high level client docs (#23438) 

This should make it simpler to include example snippets from
tests.
This commit is contained in:
Nik Everett 2017-03-20 14:50:19 -04:00 committed by GitHub
parent 48ecc2aa3a
commit 23b8b97275
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java
View File

@ -56,35 +56,35 @@ public class DeleteDocumentationIT extends ESRestHighLevelClientTestCase {
public void testDelete() throws IOException { public void testDelete() throws IOException {
RestHighLevelClient client = highLevelClient(); RestHighLevelClient client = highLevelClient();
// tag::delete-request[] // tag::delete-request
DeleteRequest request = new DeleteRequest( DeleteRequest request = new DeleteRequest(
"index", // <1> "index", // <1>
"type", // <2> "type", // <2>
"id"); // <3> "id"); // <3>
// end::delete-request[] // end::delete-request
// tag::delete-request-props[] // tag::delete-request-props
request.timeout(TimeValue.timeValueSeconds(1)); // <1> request.timeout(TimeValue.timeValueSeconds(1)); // <1>
request.timeout("1s"); // <2> request.timeout("1s"); // <2>
request.setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL); // <3> request.setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL); // <3>
request.setRefreshPolicy("wait_for"); // <4> request.setRefreshPolicy("wait_for"); // <4>
request.version(2); // <5> request.version(2); // <5>
request.versionType(VersionType.EXTERNAL); // <6> request.versionType(VersionType.EXTERNAL); // <6>
// end::delete-request-props[] // end::delete-request-props
// tag::delete-execute[] // tag::delete-execute
DeleteResponse response = client.delete(request); DeleteResponse response = client.delete(request);
// end::delete-execute[] // end::delete-execute
try { try {
// tag::delete-notfound[] // tag::delete-notfound
if (response.getResult().equals(DocWriteResponse.Result.NOT_FOUND)) { if (response.getResult().equals(DocWriteResponse.Result.NOT_FOUND)) {
throw new Exception("Can't find document to be removed"); // <1> throw new Exception("Can't find document to be removed"); // <1>
} }
// end::delete-notfound[] // end::delete-notfound
} catch (Exception ignored) { } } catch (Exception ignored) { }
// tag::delete-execute-async[] // tag::delete-execute-async
client.deleteAsync(request, new ActionListener<DeleteResponse>() { client.deleteAsync(request, new ActionListener<DeleteResponse>() {
@Override @Override
public void onResponse(DeleteResponse deleteResponse) { public void onResponse(DeleteResponse deleteResponse) {
@ -96,9 +96,9 @@ public class DeleteDocumentationIT extends ESRestHighLevelClientTestCase {
// <2> // <2>
} }
}); });
// end::delete-execute-async[] // end::delete-execute-async
// tag::delete-conflict[] // tag::delete-conflict
try { try {
client.delete(request); client.delete(request);
} catch (ElasticsearchException exception) { } catch (ElasticsearchException exception) {
@ -106,7 +106,7 @@ public class DeleteDocumentationIT extends ESRestHighLevelClientTestCase {
// <1> // <1>
} }
} }
// end::delete-conflict[] // end::delete-conflict
} }
} }

26
docs/java-rest/high-level/document/delete.asciidoc
View File

@ -6,19 +6,20 @@
The most simple Delete Request needs is: The most simple Delete Request needs is:
["source","java",subs="attributes,callouts"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
sys2::[perl -ne 'exit if /end::delete-request/; print if $tag; $tag = $tag || /tag::delete-request/' {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java] include-tagged::{doc-tests}/DeleteDocumentationIT.java[delete-request]
-------------------------------------------------- --------------------------------------------------
<1> Index name <1> Index name
<2> Type <2> Type
<3> Document id <3> Document id
You can also provide the following properties: You can also provide the following properties:
["source","java",subs="attributes,callouts"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
sys2::[perl -ne 'exit if /end::delete-request-props/; print if $tag; $tag = $tag || /tag::delete-request-props/' {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java] include-tagged::{doc-tests}/DeleteDocumentationIT.java[delete-request-props]
-------------------------------------------------- --------------------------------------------------
<1> Timeout <1> Timeout
<2> Timeout as String <2> Timeout as String
@ -30,17 +31,17 @@ sys2::[perl -ne 'exit if /end::delete-request-props/; print if $tag; $tag = $tag
[[java-rest-high-document-delete-sync]] [[java-rest-high-document-delete-sync]]
==== Execution ==== Execution
["source","java",subs="attributes,callouts"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
sys2::[perl -ne 'exit if /end::delete-execute/; print if $tag; $tag = $tag || /tag::delete-execute/' {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java] include-tagged::{doc-tests}/DeleteDocumentationIT.java[delete-execute]
-------------------------------------------------- --------------------------------------------------
[[java-rest-high-document-delete-async]] [[java-rest-high-document-delete-async]]
==== Asynchronous Execution ==== Asynchronous Execution
["source","java",subs="attributes,callouts"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
sys2::[perl -ne 'exit if /end::delete-execute-async/; print if $tag; $tag = $tag || /tag::delete-execute-async/' {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java] include-tagged::{doc-tests}/DeleteDocumentationIT.java[delete-execute-async]
-------------------------------------------------- --------------------------------------------------
<1> Implement if needed when execution did not throw an exception <1> Implement if needed when execution did not throw an exception
<2> Implement if needed in case of failure <2> Implement if needed in case of failure
@ -50,18 +51,17 @@ sys2::[perl -ne 'exit if /end::delete-execute-async/; print if $tag; $tag = $tag
In the Delete Response object, you can check for example the result of the operation: In the Delete Response object, you can check for example the result of the operation:
["source","java",subs="attributes,callouts"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
sys2::[perl -ne 'exit if /end::delete-notfound/; print if $tag; $tag = $tag || /tag::delete-notfound/' {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java] include-tagged::{doc-tests}/DeleteDocumentationIT.java[delete-notfound]
-------------------------------------------------- --------------------------------------------------
<1> Do something if we did not find the document which should have been deleted <1> Do something if we did not find the document which should have been deleted
Note that if you have a version conflict because you defined the version within the Note that if you have a version conflict because you defined the version within the
<<java-rest-high-document-delete-request>>, it will raise an `ElasticsearchException` like: <<java-rest-high-document-delete-request>>, it will raise an `ElasticsearchException` like:
["source","java",subs="attributes,callouts"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
sys2::[perl -ne 'exit if /end::delete-conflict/; print if $tag; $tag = $tag || /tag::delete-conflict/' {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DeleteDocumentationIT.java] include-tagged::{doc-tests}/DeleteDocumentationIT.java[delete-conflict]
-------------------------------------------------- --------------------------------------------------
<1> We got a version conflict <1> We got a version conflict

4
docs/java-rest/high-level/document/index.asciidoc
View File

@ -1 +1,5 @@
:doc-tests: {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation
include::delete.asciidoc[] include::delete.asciidoc[]
:doc-tests!: