From f6a37f4601c2f0c1e46d5c83406c685d0abe1f2c Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 17 Apr 2020 21:40:54 +0200 Subject: [PATCH] DATAES-772 - Polishing. --- .../elasticsearch/core/SearchHitSupport.java | 2 +- .../core/event/AfterConvertCallback.java | 4 +- .../event/ReactiveAfterConvertCallback.java | 4 +- ...actElasticsearchTemplateCallbackTests.java | 94 +++++++--------- ...lasticsearchRestTemplateCallbackTests.java | 22 ++-- ...csearchTransportTemplateCallbackTests.java | 22 ++-- ...iveElasticsearchTemplateCallbackTests.java | 103 +++++++----------- .../core/SearchHitSupportTest.java | 7 +- 8 files changed, 114 insertions(+), 144 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitSupport.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitSupport.java index 271af855..bc629888 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitSupport.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitSupport.java @@ -97,7 +97,7 @@ public final class SearchHitSupport { } private static CloseableIterator unwrapSearchHitsIterator(SearchHitsIterator iterator) { - + return new CloseableIterator() { @Override public boolean hasNext() { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/event/AfterConvertCallback.java b/src/main/java/org/springframework/data/elasticsearch/core/event/AfterConvertCallback.java index 53e110c3..f6998d4d 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/event/AfterConvertCallback.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/event/AfterConvertCallback.java @@ -30,8 +30,8 @@ import org.springframework.data.mapping.callback.EntityCallback; public interface AfterConvertCallback extends EntityCallback { /** - * Entity callback method invoked after a domain object is materialized from a {@link Document}. Can return either - * the same or a modified instance of the domain object. + * Entity callback method invoked after a domain object is materialized from a {@link Document}. Can return either the + * same or a modified instance of the domain object. * * @param entity the domain object (the result of the conversion). * @param document must not be {@literal null}. diff --git a/src/main/java/org/springframework/data/elasticsearch/core/event/ReactiveAfterConvertCallback.java b/src/main/java/org/springframework/data/elasticsearch/core/event/ReactiveAfterConvertCallback.java index 62aa3abb..abeac001 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/event/ReactiveAfterConvertCallback.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/event/ReactiveAfterConvertCallback.java @@ -31,8 +31,8 @@ import org.springframework.data.mapping.callback.EntityCallback; public interface ReactiveAfterConvertCallback extends EntityCallback { /** - * Entity callback method invoked after a domain object is materialized from a {@link Document}. Can return either - * the same or a modified instance of the domain object. + * Entity callback method invoked after a domain object is materialized from a {@link Document}. Can return either the + * same or a modified instance of the domain object. * * @param entity the domain object (the result of the conversion). * @param document must not be {@literal null}. diff --git a/src/test/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplateCallbackTests.java index 4c17bfdb..8f732fe8 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplateCallbackTests.java @@ -69,7 +69,7 @@ abstract class AbstractElasticsearchTemplateCallbackTests { protected final void initTemplate(AbstractElasticsearchTemplate template) { this.template = template; - + this.template.setEntityCallbacks(EntityCallbacks.create(afterSaveCallback, afterConvertCallback)); } @@ -206,9 +206,7 @@ abstract class AbstractElasticsearchTemplateCallbackTests { } private Document lukeDocument() { - return Document.create() - .append("id", "init") - .append("firstname", "luke"); + return Document.create().append("id", "init").append("firstname", "luke"); } @Test // DATAES-772 @@ -235,8 +233,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { List results = template.multiGet(queryForTwo(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } @@ -267,8 +265,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test AggregatedPage results = template.queryForPage(queryForTwo(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.getContent().get(0).id).isEqualTo("after-convert"); assertThat(results.getContent().get(1).id).isEqualTo("after-convert"); } @@ -279,8 +277,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test List> results = template.queryForPage(singletonList(queryForTwo()), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); List persons = results.get(0).getContent(); assertThat(persons.get(0).id).isEqualTo("after-convert"); assertThat(persons.get(1).id).isEqualTo("after-convert"); @@ -290,14 +288,12 @@ abstract class AbstractElasticsearchTemplateCallbackTests { void queryForPageWithMultipleQueriesAndEntityClassesShouldInvokeAfterConvertCallback() { @SuppressWarnings("deprecation") // we know what we test - List> results = template.queryForPage(singletonList(queryForTwo()), - singletonList(Person.class), index); + List> results = template.queryForPage(singletonList(queryForTwo()), singletonList(Person.class), + index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); - List persons = results.get(0).getContent().stream() - .map(Person.class::cast) - .collect(Collectors.toList()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); + List persons = results.get(0).getContent().stream().map(Person.class::cast).collect(Collectors.toList()); assertThat(persons.get(0).id).isEqualTo("after-convert"); assertThat(persons.get(1).id).isEqualTo("after-convert"); } @@ -307,8 +303,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { CloseableIterator results = template.stream(queryForTwo(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.next().id).isEqualTo("after-convert"); assertThat(results.next().id).isEqualTo("after-convert"); } @@ -322,8 +318,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { assertThat(results.next().id).isEqualTo("after-convert"); assertThat(results.next().id).isEqualTo("after-convert"); - verify(afterConvertCallback, times(4)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(4)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); } private void skipItemsFromScrollStart(CloseableIterator results) { @@ -337,8 +333,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test List results = template.queryForList(queryForTwo(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } @@ -349,8 +345,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test List> results = template.queryForList(singletonList(queryForTwo()), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); List persons = results.get(0); assertThat(persons.get(0).id).isEqualTo("after-convert"); assertThat(persons.get(1).id).isEqualTo("after-convert"); @@ -362,11 +358,9 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test List> results = template.queryForList(singletonList(queryForTwo()), singletonList(Person.class), index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); - List persons = results.get(0).stream() - .map(Person.class::cast) - .collect(Collectors.toList()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); + List persons = results.get(0).stream().map(Person.class::cast).collect(Collectors.toList()); assertThat(persons.get(0).id).isEqualTo("after-convert"); assertThat(persons.get(1).id).isEqualTo("after-convert"); } @@ -377,8 +371,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test AggregatedPage results = template.moreLikeThis(moreLikeThisQuery(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.getContent().get(0).id).isEqualTo("after-convert"); assertThat(results.getContent().get(1).id).isEqualTo("after-convert"); } @@ -408,8 +402,7 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHit result = template.searchOne(queryForOne(), Person.class, index); - verify(afterConvertCallback) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); assertThat(result.getContent().id).isEqualTo("after-convert"); } @@ -418,8 +411,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { List> results = template.multiSearch(singletonList(queryForTwo()), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); List> hits = results.get(0).getSearchHits(); assertThat(hits.get(0).getContent().id).isEqualTo("after-convert"); assertThat(hits.get(1).getContent().id).isEqualTo("after-convert"); @@ -428,11 +421,11 @@ abstract class AbstractElasticsearchTemplateCallbackTests { @Test // DATAES-772 void multiSearchWithMultipleEntityClassesShouldInvokeAfterConvertCallback() { - List> results = template.multiSearch(singletonList(queryForTwo()), - singletonList(Person.class), index); + List> results = template.multiSearch(singletonList(queryForTwo()), singletonList(Person.class), + index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); List> hits = results.get(0).getSearchHits(); assertThat(((Person) hits.get(0).getContent()).id).isEqualTo("after-convert"); assertThat(((Person) hits.get(1).getContent()).id).isEqualTo("after-convert"); @@ -443,8 +436,7 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHits results = template.search(queryForTwo(), Person.class); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); List> hits = results.getSearchHits(); assertThat(hits.get(0).getContent().id).isEqualTo("after-convert"); assertThat(hits.get(1).getContent().id).isEqualTo("after-convert"); @@ -455,8 +447,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHits results = template.search(queryForTwo(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); List> hits = results.getSearchHits(); assertThat(hits.get(0).getContent().id).isEqualTo("after-convert"); assertThat(hits.get(1).getContent().id).isEqualTo("after-convert"); @@ -467,8 +459,7 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHits results = template.search(moreLikeThisQuery(), Person.class); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); List> hits = results.getSearchHits(); assertThat(hits.get(0).getContent().id).isEqualTo("after-convert"); assertThat(hits.get(1).getContent().id).isEqualTo("after-convert"); @@ -479,8 +470,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHits results = template.search(moreLikeThisQuery(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); List> hits = results.getSearchHits(); assertThat(hits.get(0).getContent().id).isEqualTo("after-convert"); assertThat(hits.get(1).getContent().id).isEqualTo("after-convert"); @@ -491,8 +482,7 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHitsIterator results = template.searchForStream(queryForTwo(), Person.class); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); assertThat(results.next().getContent().id).isEqualTo("after-convert"); assertThat(results.next().getContent().id).isEqualTo("after-convert"); } @@ -502,8 +492,8 @@ abstract class AbstractElasticsearchTemplateCallbackTests { SearchHitsIterator results = template.searchForStream(queryForTwo(), Person.class, index); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.next().getContent().id).isEqualTo("after-convert"); assertThat(results.next().getContent().id).isEqualTo("after-convert"); } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java index 4cabf0c7..a2a3ec57 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java @@ -77,15 +77,15 @@ class ElasticsearchRestTemplateCallbackTests extends AbstractElasticsearchTempla doReturn(true).when(getResponse).isExists(); doReturn(false).when(getResponse).isSourceEmpty(); doReturn(new HashMap() { - { - put("id", "init"); - put("firstname", "luke"); - } + { + put("id", "init"); + put("firstname", "luke"); + } }).when(getResponse).getSourceAsMap(); doReturn(multiGetResponse).when(client).mget(any(MultiGetRequest.class), any(RequestOptions.class)); - doReturn(new MultiGetItemResponse[]{multiGetItemResponse, multiGetItemResponse}) - .when(multiGetResponse).getResponses(); + doReturn(new MultiGetItemResponse[] { multiGetItemResponse, multiGetItemResponse }).when(multiGetResponse) + .getResponses(); doReturn(getResponse).when(multiGetItemResponse).getResponse(); doReturn(searchResponse).when(client).search(any(SearchRequest.class), any(RequestOptions.class)); @@ -93,14 +93,14 @@ class ElasticsearchRestTemplateCallbackTests extends AbstractElasticsearchTempla doReturn("scroll-id").when(searchResponse).getScrollId(); doReturn(new BytesArray(new byte[8])).when(searchHit).getSourceRef(); doReturn(new HashMap() { - { - put("id", "init"); - put("firstname", "luke"); - } + { + put("id", "init"); + put("firstname", "luke"); + } }).when(searchHit).getSourceAsMap(); MultiSearchResponse multiSearchResponse = new MultiSearchResponse( - new MultiSearchResponse.Item[]{ multiSearchResponseItem }, 1L); + new MultiSearchResponse.Item[] { multiSearchResponseItem }, 1L); doReturn(multiSearchResponse).when(client).multiSearch(any(MultiSearchRequest.class), any()); doReturn(searchResponse).when(multiSearchResponseItem).getResponse(); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateCallbackTests.java index 32fdca74..7078d627 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateCallbackTests.java @@ -98,17 +98,17 @@ class ElasticsearchTransportTemplateCallbackTests extends AbstractElasticsearchT doReturn(true).when(getResponse).isExists(); doReturn(false).when(getResponse).isSourceEmpty(); doReturn(new HashMap() { - { - put("id", "init"); - put("firstname", "luke"); - } + { + put("id", "init"); + put("firstname", "luke"); + } }).when(getResponse).getSourceAsMap(); when(client.prepareMultiGet()).thenReturn(multiGetRequestBuilder); doReturn(multiGetResponseActionFuture).when(multiGetRequestBuilder).execute(); when(multiGetResponseActionFuture.actionGet()).thenReturn(multiGetResponse); - doReturn(new MultiGetItemResponse[]{ multiGetItemResponse, multiGetItemResponse }) - .when(multiGetResponse).getResponses(); + doReturn(new MultiGetItemResponse[] { multiGetItemResponse, multiGetItemResponse }).when(multiGetResponse) + .getResponses(); doReturn(getResponse).when(multiGetItemResponse).getResponse(); when(client.prepareSearch(anyVararg())).thenReturn(searchRequestBuilder); @@ -123,15 +123,15 @@ class ElasticsearchTransportTemplateCallbackTests extends AbstractElasticsearchT doReturn("scroll-id").when(searchResponse).getScrollId(); doReturn(new BytesArray(new byte[8])).when(searchHit).getSourceRef(); doReturn(new HashMap() { - { - put("id", "init"); - put("firstname", "luke"); - } + { + put("id", "init"); + put("firstname", "luke"); + } }).when(searchHit).getSourceAsMap(); when(client.multiSearch(any(MultiSearchRequest.class))).thenReturn(multiSearchResponseActionFuture); MultiSearchResponse multiSearchResponse = new MultiSearchResponse( - new MultiSearchResponse.Item[]{ multiSearchResponseItem }, 1L); + new MultiSearchResponse.Item[] { multiSearchResponseItem }, 1L); when(multiSearchResponseActionFuture.actionGet()).thenReturn(multiSearchResponse); doReturn(searchResponse).when(multiSearchResponseItem).getResponse(); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java index aa3aed78..b682f074 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java @@ -99,10 +99,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { doReturn(true).when(getResult).isExists(); doReturn(false).when(getResult).isSourceEmpty(); doReturn(new HashMap() { - { - put("id", "init"); - put("firstname", "luke"); - } + { + put("id", "init"); + put("firstname", "luke"); + } }).when(getResult).getSource(); doReturn(Mono.just(getResult)).when(client).get(any(GetRequest.class)); @@ -110,10 +110,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { when(client.search(any(SearchRequest.class))).thenReturn(Flux.just(searchHit, searchHit)); doReturn(new BytesArray(new byte[8])).when(searchHit).getSourceRef(); doReturn(new HashMap() { - { - put("id", "init"); - put("firstname", "luke"); - } + { + put("id", "init"); + put("firstname", "luke"); + } }).when(searchHit).getSourceAsMap(); when(client.scroll(any(SearchRequest.class))).thenReturn(Flux.just(searchHit, searchHit)); @@ -222,12 +222,11 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); - List results = template.multiGet(pagedQueryForTwo(), Person.class, index) - .timeout(Duration.ofSeconds(1)) + List results = template.multiGet(pagedQueryForTwo(), Person.class, index).timeout(Duration.ofSeconds(1)) .toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } @@ -294,27 +293,21 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); @SuppressWarnings("deprecation") // we know what we test - List results = template.find(pagedQueryForTwo(), Person.class) - .timeout(Duration.ofSeconds(1)).toStream() + List results = template.find(pagedQueryForTwo(), Person.class).timeout(Duration.ofSeconds(1)).toStream() .collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } - + private Query pagedQueryForTwo() { - return new NativeSearchQueryBuilder() - .withIds(Arrays.asList("init1", "init2")) - .withPageable(PageRequest.of(0, 10)) + return new NativeSearchQueryBuilder().withIds(Arrays.asList("init1", "init2")).withPageable(PageRequest.of(0, 10)) .build(); } private Document lukeDocument() { - return Document.create() - .append("id", "init") - .append("firstname", "luke"); + return Document.create().append("id", "init").append("firstname", "luke"); } @Test // DATAES-772 @@ -325,20 +318,16 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); @SuppressWarnings("deprecation") // we know what we test - List results = template.find(scrollingQueryForTwo(), Person.class) - .timeout(Duration.ofSeconds(1)) - .toStream().collect(Collectors.toList()); + List results = template.find(scrollingQueryForTwo(), Person.class).timeout(Duration.ofSeconds(1)).toStream() + .collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } private Query scrollingQueryForTwo() { - return new NativeSearchQueryBuilder() - .withIds(Arrays.asList("init1", "init2")) - .build(); + return new NativeSearchQueryBuilder().withIds(Arrays.asList("init1", "init2")).build(); } @Test // DATAES-772 @@ -349,12 +338,11 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); @SuppressWarnings("deprecation") // we know what we test - List results = template.find(pagedQueryForTwo(), Person.class, index) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + List results = template.find(pagedQueryForTwo(), Person.class, index).timeout(Duration.ofSeconds(1)) + .toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } @@ -367,12 +355,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); @SuppressWarnings("deprecation") // we know what we test - List results = template.find(pagedQueryForTwo(), Person.class, Person.class) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + List results = template.find(pagedQueryForTwo(), Person.class, Person.class).timeout(Duration.ofSeconds(1)) + .toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } @@ -386,11 +372,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { @SuppressWarnings("deprecation") // we know what we test List results = template.find(pagedQueryForTwo(), Person.class, Person.class, index) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + .timeout(Duration.ofSeconds(1)).toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).id).isEqualTo("after-convert"); assertThat(results.get(1).id).isEqualTo("after-convert"); } @@ -402,12 +387,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); - List> results = template.search(pagedQueryForTwo(), Person.class) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + List> results = template.search(pagedQueryForTwo(), Person.class).timeout(Duration.ofSeconds(1)) + .toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); assertThat(results.get(0).getContent().id).isEqualTo("after-convert"); assertThat(results.get(1).getContent().id).isEqualTo("after-convert"); } @@ -420,11 +403,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); List> results = template.search(pagedQueryForTwo(), Person.class, index) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + .timeout(Duration.ofSeconds(1)).toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).getContent().id).isEqualTo("after-convert"); assertThat(results.get(1).getContent().id).isEqualTo("after-convert"); } @@ -437,11 +419,9 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); List> results = template.search(pagedQueryForTwo(), Person.class, Person.class) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + .timeout(Duration.ofSeconds(1)).toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), any()); assertThat(results.get(0).getContent().id).isEqualTo("after-convert"); assertThat(results.get(1).getContent().id).isEqualTo("after-convert"); } @@ -454,11 +434,10 @@ public class ReactiveElasticsearchTemplateCallbackTests { template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback)); List> results = template.search(pagedQueryForTwo(), Person.class, Person.class, index) - .timeout(Duration.ofSeconds(1)).toStream() - .collect(Collectors.toList()); + .timeout(Duration.ofSeconds(1)).toStream().collect(Collectors.toList()); - verify(afterConvertCallback, times(2)) - .onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), eq(index)); + verify(afterConvertCallback, times(2)).onAfterConvert(eq(new Person("init", "luke")), eq(lukeDocument()), + eq(index)); assertThat(results.get(0).getContent().id).isEqualTo("after-convert"); assertThat(results.get(1).getContent().id).isEqualTo("after-convert"); } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/SearchHitSupportTest.java b/src/test/java/org/springframework/data/elasticsearch/core/SearchHitSupportTest.java index b73645dd..6ef6f8cc 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/SearchHitSupportTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/SearchHitSupportTest.java @@ -34,8 +34,9 @@ class SearchHitSupportTest { void unwrapsSearchHitsIteratorToCloseableIteratorOfEntities() { TestStringSearchHitsIterator searchHitsIterator = new TestStringSearchHitsIterator(); - @SuppressWarnings("unchecked") CloseableIterator unwrappedIterator = - (CloseableIterator) SearchHitSupport.unwrapSearchHits(searchHitsIterator); + @SuppressWarnings("unchecked") + CloseableIterator unwrappedIterator = (CloseableIterator) SearchHitSupport + .unwrapSearchHits(searchHitsIterator); assertThat(unwrappedIterator.next()).isEqualTo("one"); assertThat(unwrappedIterator.next()).isEqualTo("two"); @@ -86,4 +87,4 @@ class SearchHitSupportTest { return new SearchHit<>("id", 1.0f, new Object[0], emptyMap(), nextString); } } -} \ No newline at end of file +}