diff --git a/buildSrc/src/main/resources/checkstyle.xml b/buildSrc/src/main/resources/checkstyle.xml
index 660c3661a465..c6873b2c1277 100644
--- a/buildSrc/src/main/resources/checkstyle.xml
+++ b/buildSrc/src/main/resources/checkstyle.xml
@@ -12,11 +12,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java b/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java
index ce2e0907560c..90801715b7e2 100644
--- a/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java
@@ -45,6 +45,7 @@ import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseListener;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
import javax.net.ssl.SSLContext;
import java.io.IOException;
@@ -93,8 +94,8 @@ public class RestClientDocumentation {
//tag::rest-client-init
RestClient restClient = RestClient.builder(
- new HttpHost("localhost", 9200, "http"),
- new HttpHost("localhost", 9201, "http")).build();
+ new HttpHost("localhost", 9200, "http"),
+ new HttpHost("localhost", 9201, "http")).build();
//end::rest-client-init
//tag::rest-client-close
@@ -103,26 +104,30 @@ public class RestClientDocumentation {
{
//tag::rest-client-init-default-headers
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
Header[] defaultHeaders = new Header[]{new BasicHeader("header", "value")};
builder.setDefaultHeaders(defaultHeaders); // <1>
//end::rest-client-init-default-headers
}
{
//tag::rest-client-init-max-retry-timeout
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
builder.setMaxRetryTimeoutMillis(10000); // <1>
//end::rest-client-init-max-retry-timeout
}
{
//tag::rest-client-init-node-selector
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
builder.setNodeSelector(NodeSelector.SKIP_DEDICATED_MASTERS); // <1>
//end::rest-client-init-node-selector
}
{
//tag::rest-client-init-allocation-aware-selector
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
builder.setNodeSelector(new NodeSelector() { // <1>
@Override
public void select(Iterable nodes) {
@@ -155,7 +160,8 @@ public class RestClientDocumentation {
}
{
//tag::rest-client-init-failure-listener
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
builder.setFailureListener(new RestClient.FailureListener() {
@Override
public void onFailure(Node node) {
@@ -166,24 +172,30 @@ public class RestClientDocumentation {
}
{
//tag::rest-client-init-request-config-callback
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
- builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
- @Override
- public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder requestConfigBuilder) {
- return requestConfigBuilder.setSocketTimeout(10000); // <1>
- }
- });
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
+ builder.setRequestConfigCallback(
+ new RestClientBuilder.RequestConfigCallback() {
+ @Override
+ public RequestConfig.Builder customizeRequestConfig(
+ RequestConfig.Builder requestConfigBuilder) {
+ return requestConfigBuilder.setSocketTimeout(10000); // <1>
+ }
+ });
//end::rest-client-init-request-config-callback
}
{
//tag::rest-client-init-client-config-callback
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "http"));
- builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
- @Override
- public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
- return httpClientBuilder.setProxy(new HttpHost("proxy", 9000, "http")); // <1>
- }
- });
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "http"));
+ builder.setHttpClientConfigCallback(new HttpClientConfigCallback() {
+ @Override
+ public HttpAsyncClientBuilder customizeHttpClient(
+ HttpAsyncClientBuilder httpClientBuilder) {
+ return httpClientBuilder.setProxy(
+ new HttpHost("proxy", 9000, "http")); // <1>
+ }
+ });
//end::rest-client-init-client-config-callback
}
@@ -281,58 +293,74 @@ public class RestClientDocumentation {
public void testCommonConfiguration() throws Exception {
{
//tag::rest-client-config-timeouts
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200))
- .setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200))
+ .setRequestConfigCallback(
+ new RestClientBuilder.RequestConfigCallback() {
@Override
- public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder requestConfigBuilder) {
- return requestConfigBuilder.setConnectTimeout(5000)
- .setSocketTimeout(60000);
+ public RequestConfig.Builder customizeRequestConfig(
+ RequestConfig.Builder requestConfigBuilder) {
+ return requestConfigBuilder
+ .setConnectTimeout(5000)
+ .setSocketTimeout(60000);
}
})
- .setMaxRetryTimeoutMillis(60000);
+ .setMaxRetryTimeoutMillis(60000);
//end::rest-client-config-timeouts
}
{
//tag::rest-client-config-threads
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200))
- .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
- @Override
- public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
- return httpClientBuilder.setDefaultIOReactorConfig(
- IOReactorConfig.custom().setIoThreadCount(1).build());
- }
- });
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200))
+ .setHttpClientConfigCallback(new HttpClientConfigCallback() {
+ @Override
+ public HttpAsyncClientBuilder customizeHttpClient(
+ HttpAsyncClientBuilder httpClientBuilder) {
+ return httpClientBuilder.setDefaultIOReactorConfig(
+ IOReactorConfig.custom()
+ .setIoThreadCount(1)
+ .build());
+ }
+ });
//end::rest-client-config-threads
}
{
//tag::rest-client-config-basic-auth
- final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ final CredentialsProvider credentialsProvider =
+ new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
- new UsernamePasswordCredentials("user", "password"));
+ new UsernamePasswordCredentials("user", "password"));
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200))
- .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
- @Override
- public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
- return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
- }
- });
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200))
+ .setHttpClientConfigCallback(new HttpClientConfigCallback() {
+ @Override
+ public HttpAsyncClientBuilder customizeHttpClient(
+ HttpAsyncClientBuilder httpClientBuilder) {
+ return httpClientBuilder
+ .setDefaultCredentialsProvider(credentialsProvider);
+ }
+ });
//end::rest-client-config-basic-auth
}
{
//tag::rest-client-config-disable-preemptive-auth
- final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ final CredentialsProvider credentialsProvider =
+ new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
- new UsernamePasswordCredentials("user", "password"));
+ new UsernamePasswordCredentials("user", "password"));
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200))
- .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
- @Override
- public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
- httpClientBuilder.disableAuthCaching(); // <1>
- return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
- }
- });
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200))
+ .setHttpClientConfigCallback(new HttpClientConfigCallback() {
+ @Override
+ public HttpAsyncClientBuilder customizeHttpClient(
+ HttpAsyncClientBuilder httpClientBuilder) {
+ httpClientBuilder.disableAuthCaching(); // <1>
+ return httpClientBuilder
+ .setDefaultCredentialsProvider(credentialsProvider);
+ }
+ });
//end::rest-client-config-disable-preemptive-auth
}
{
@@ -343,15 +371,18 @@ public class RestClientDocumentation {
try (InputStream is = Files.newInputStream(keyStorePath)) {
truststore.load(is, keyStorePass.toCharArray());
}
- SSLContextBuilder sslBuilder = SSLContexts.custom().loadTrustMaterial(truststore, null);
+ SSLContextBuilder sslBuilder = SSLContexts.custom()
+ .loadTrustMaterial(truststore, null);
final SSLContext sslContext = sslBuilder.build();
- RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "https"))
- .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
- @Override
- public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
- return httpClientBuilder.setSSLContext(sslContext);
- }
- });
+ RestClientBuilder builder = RestClient.builder(
+ new HttpHost("localhost", 9200, "https"))
+ .setHttpClientConfigCallback(new HttpClientConfigCallback() {
+ @Override
+ public HttpAsyncClientBuilder customizeHttpClient(
+ HttpAsyncClientBuilder httpClientBuilder) {
+ return httpClientBuilder.setSSLContext(sslContext);
+ }
+ });
//end::rest-client-config-encrypted-communication
}
}
diff --git a/client/sniffer/src/test/java/org/elasticsearch/client/sniff/documentation/SnifferDocumentation.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/documentation/SnifferDocumentation.java
index 5f305024dba2..70d7373dfc9e 100644
--- a/client/sniffer/src/test/java/org/elasticsearch/client/sniff/documentation/SnifferDocumentation.java
+++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/documentation/SnifferDocumentation.java
@@ -56,8 +56,8 @@ public class SnifferDocumentation {
{
//tag::sniffer-init
RestClient restClient = RestClient.builder(
- new HttpHost("localhost", 9200, "http"))
- .build();
+ new HttpHost("localhost", 9200, "http"))
+ .build();
Sniffer sniffer = Sniffer.builder(restClient).build();
//end::sniffer-init
@@ -69,21 +69,23 @@ public class SnifferDocumentation {
{
//tag::sniffer-interval
RestClient restClient = RestClient.builder(
- new HttpHost("localhost", 9200, "http"))
- .build();
+ new HttpHost("localhost", 9200, "http"))
+ .build();
Sniffer sniffer = Sniffer.builder(restClient)
- .setSniffIntervalMillis(60000).build();
+ .setSniffIntervalMillis(60000).build();
//end::sniffer-interval
}
{
//tag::sniff-on-failure
- SniffOnFailureListener sniffOnFailureListener = new SniffOnFailureListener();
- RestClient restClient = RestClient.builder(new HttpHost("localhost", 9200))
- .setFailureListener(sniffOnFailureListener) // <1>
- .build();
+ SniffOnFailureListener sniffOnFailureListener =
+ new SniffOnFailureListener();
+ RestClient restClient = RestClient.builder(
+ new HttpHost("localhost", 9200))
+ .setFailureListener(sniffOnFailureListener) // <1>
+ .build();
Sniffer sniffer = Sniffer.builder(restClient)
- .setSniffAfterFailureDelayMillis(30000) // <2>
- .build();
+ .setSniffAfterFailureDelayMillis(30000) // <2>
+ .build();
sniffOnFailureListener.setSniffer(sniffer); // <3>
//end::sniff-on-failure
}
@@ -103,29 +105,29 @@ public class SnifferDocumentation {
{
//tag::sniff-request-timeout
RestClient restClient = RestClient.builder(
- new HttpHost("localhost", 9200, "http"))
- .build();
+ new HttpHost("localhost", 9200, "http"))
+ .build();
NodesSniffer nodesSniffer = new ElasticsearchNodesSniffer(
- restClient,
- TimeUnit.SECONDS.toMillis(5),
- ElasticsearchNodesSniffer.Scheme.HTTP);
+ restClient,
+ TimeUnit.SECONDS.toMillis(5),
+ ElasticsearchNodesSniffer.Scheme.HTTP);
Sniffer sniffer = Sniffer.builder(restClient)
- .setNodesSniffer(nodesSniffer).build();
+ .setNodesSniffer(nodesSniffer).build();
//end::sniff-request-timeout
}
{
//tag::custom-nodes-sniffer
RestClient restClient = RestClient.builder(
- new HttpHost("localhost", 9200, "http"))
- .build();
+ new HttpHost("localhost", 9200, "http"))
+ .build();
NodesSniffer nodesSniffer = new NodesSniffer() {
- @Override
- public List sniff() throws IOException {
- return null; // <1>
- }
- };
+ @Override
+ public List sniff() throws IOException {
+ return null; // <1>
+ }
+ };
Sniffer sniffer = Sniffer.builder(restClient)
- .setNodesSniffer(nodesSniffer).build();
+ .setNodesSniffer(nodesSniffer).build();
//end::custom-nodes-sniffer
}
}
diff --git a/docs/java-rest/low-level/configuration.asciidoc b/docs/java-rest/low-level/configuration.asciidoc
index aa4e843778a8..b7da2b5ebccf 100644
--- a/docs/java-rest/low-level/configuration.asciidoc
+++ b/docs/java-rest/low-level/configuration.asciidoc
@@ -1,3 +1,4 @@
+[[java-rest-low-config]]
== Common configuration
As explained in <>, the `RestClientBuilder`
diff --git a/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/JdbcIntegrationTestCase.java b/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/JdbcIntegrationTestCase.java
index 301e15c8efbd..c6594d720511 100644
--- a/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/JdbcIntegrationTestCase.java
+++ b/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/JdbcIntegrationTestCase.java
@@ -61,7 +61,8 @@ public abstract class JdbcIntegrationTestCase extends ESRestTestCase {
// tag::connect-dm
String address = "jdbc:es://" + elasticsearchAddress; // <1>
Properties connectionProperties = connectionProperties(); // <2>
- Connection connection = DriverManager.getConnection(address, connectionProperties);
+ Connection connection =
+ DriverManager.getConnection(address, connectionProperties);
// end::connect-dm
assertNotNull("The timezone should be specified", connectionProperties.getProperty(JdbcConfiguration.TIME_ZONE));
return connection;
diff --git a/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/SimpleExampleTestCase.java b/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/SimpleExampleTestCase.java
index f5d559d9bf0b..35f2dba77792 100644
--- a/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/SimpleExampleTestCase.java
+++ b/x-pack/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/SimpleExampleTestCase.java
@@ -10,6 +10,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import static org.hamcrest.Matchers.containsString;
+
public class SimpleExampleTestCase extends JdbcIntegrationTestCase {
public void testSimpleExample() throws Exception {
index("library", builder -> {
@@ -20,13 +22,17 @@ public class SimpleExampleTestCase extends JdbcIntegrationTestCase {
// tag::simple_example
try (Statement statement = connection.createStatement();
ResultSet results = statement.executeQuery(
- "SELECT name, page_count FROM library ORDER BY page_count DESC LIMIT 1")) {
+ " SELECT name, page_count"
+ + " FROM library"
+ + " ORDER BY page_count DESC"
+ + " LIMIT 1")) {
assertTrue(results.next());
assertEquals("Don Quixote", results.getString(1));
assertEquals(1072, results.getInt(2));
- SQLException e = expectThrows(SQLException.class, () -> results.getInt(1));
- assertTrue(e.getMessage(),
- e.getMessage().contains("Unable to convert value [Don Quixote] of type [VARCHAR] to an Integer"));
+ SQLException e = expectThrows(SQLException.class, () ->
+ results.getInt(1));
+ assertThat(e.getMessage(), containsString("Unable to convert "
+ + "value [Don Quixote] of type [VARCHAR] to an Integer"));
assertFalse(results.next());
}
// end::simple_example