From cc4dd988720d8ac2898046cd1f7c3f1aded124c2 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 30 Oct 2018 09:14:07 -0400 Subject: [PATCH] Docs: Fix build for java-api The java-api docs had some broken references. Mostly because it is difficult to build them so they are difficult to check. Relates to #34528 --- .../test/java/org/elasticsearch/client/BulkProcessorIT.java | 2 +- docs/java-api/docs/bulk.asciidoc | 4 ++-- docs/java-api/index.asciidoc | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/BulkProcessorIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/BulkProcessorIT.java index 378eb4f0069..95b2fc0a43b 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/BulkProcessorIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/BulkProcessorIT.java @@ -303,7 +303,7 @@ public class BulkProcessorIT extends ESRestHighLevelClientTestCase { processor.add(new IndexRequest("blogs", "post_type", "1") // <2> .source(XContentType.JSON, "title", "some title")); } - // end::bulk-request-mix-pipeline + // end::bulk-processor-mix-parameters latch.await(); Iterable hits = searchAll(new SearchRequest("tweets").routing("routing")); diff --git a/docs/java-api/docs/bulk.asciidoc b/docs/java-api/docs/bulk.asciidoc index 6141fabbf5b..1c2882d9c07 100644 --- a/docs/java-api/docs/bulk.asciidoc +++ b/docs/java-api/docs/bulk.asciidoc @@ -176,7 +176,7 @@ Global parameters can be specified on the BulkRequest as well as BulkProcessor, ["source","java",subs="attributes,callouts,macros"] -------------------------------------------------- -include-tagged::{doc-tests}/BulkProcessorIT.java[bulk-processor-mix-parameters] +include-tagged::{hlrc-tests}/BulkProcessorIT.java[bulk-processor-mix-parameters] -------------------------------------------------- <1> global parameters from the BulkRequest will be applied on a sub request <2> local pipeline parameter on a sub request will override global parameters from BulkRequest @@ -184,7 +184,7 @@ include-tagged::{doc-tests}/BulkProcessorIT.java[bulk-processor-mix-parameters] ["source","java",subs="attributes,callouts,macros"] -------------------------------------------------- -include-tagged::{doc-tests}/BulkRequestWithGlobalParametersIT.java[bulk-request-mix-pipeline] +include-tagged::{hlrc-tests}/BulkRequestWithGlobalParametersIT.java[bulk-request-mix-pipeline] -------------------------------------------------- <1> local pipeline parameter on a sub request will override global pipeline from the BulkRequest <2> global parameter from the BulkRequest will be applied on a sub request diff --git a/docs/java-api/index.asciidoc b/docs/java-api/index.asciidoc index 5c3a94d57f4..72b18d49646 100644 --- a/docs/java-api/index.asciidoc +++ b/docs/java-api/index.asciidoc @@ -131,6 +131,7 @@ and add it as a dependency. As an example, we will use the `slf4j-simple` logger -------------------------------------------------- :client-tests: {docdir}/../../server/src/test/java/org/elasticsearch/client/documentation +:hlrc-tests: {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client :client-reindex-tests: {docdir}/../../modules/reindex/src/test/java/org/elasticsearch/client/documentation