From aa6fccc07e925071c0c88540396877649c74b625 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 3 May 2023 13:05:49 +0200 Subject: [PATCH] Polishing. Original pull request #661 See #660 --- .../conference/ElasticsearchOperationsTest.java | 5 +++-- .../conference/ReactiveElasticsearchOperationsTest.java | 5 +++-- .../conference/ReactiveElasticsearchRepositoryTest.java | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java b/elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java index a1dac2ba..4a52ba8a 100644 --- a/elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java +++ b/elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java @@ -52,7 +52,7 @@ class ElasticsearchOperationsTest { private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); @Container // - private static ElasticsearchContainer container = new ElasticsearchContainer( + private static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) // .withPassword("foobar") // .withReuse(true); @@ -65,7 +65,8 @@ class ElasticsearchOperationsTest { Assert.notNull(container, "TestContainer is not initialized!"); return ClientConfiguration.builder() // - .connectedTo(container.getHttpHostAddress()).usingSsl(container.createSslContextFromCa()) // + .connectedTo(container.getHttpHostAddress()) // + .usingSsl(container.createSslContextFromCa()) // .withBasicAuth("elastic", "foobar") // .build(); } diff --git a/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java b/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java index b5b83a5c..8b885d38 100644 --- a/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java +++ b/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java @@ -53,7 +53,7 @@ class ReactiveElasticsearchOperationsTest { private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); @Container // - private static ElasticsearchContainer container = new ElasticsearchContainer( + private static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) // .withPassword("foobar") // .withReuse(true); @@ -66,7 +66,8 @@ class ReactiveElasticsearchOperationsTest { Assert.notNull(container, "TestContainer is not initialized!"); return ClientConfiguration.builder() // - .connectedTo(container.getHttpHostAddress()).usingSsl(container.createSslContextFromCa()) // + .connectedTo(container.getHttpHostAddress()) // + .usingSsl(container.createSslContextFromCa()) // .withBasicAuth("elastic", "foobar") // .build(); } diff --git a/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java b/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java index afa4a6fe..a48d338c 100644 --- a/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java +++ b/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java @@ -49,7 +49,7 @@ class ReactiveElasticsearchRepositoryTest { private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); @Container // - private static ElasticsearchContainer container = new ElasticsearchContainer( + private static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) // .withPassword("foobar") // .withReuse(true); @@ -62,7 +62,8 @@ class ReactiveElasticsearchRepositoryTest { Assert.notNull(container, "TestContainer is not initialized!"); return ClientConfiguration.builder() // - .connectedTo(container.getHttpHostAddress()).usingSsl(container.createSslContextFromCa()) // + .connectedTo(container.getHttpHostAddress()) // + .usingSsl(container.createSslContextFromCa()) // .withBasicAuth("elastic", "foobar") // .build(); }