Spring/spring-data-elasticsearch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAES-771 - Polishing.

Browse Source
This commit is contained in:
Peter-Josef Meisch
2020-03-29 19:54:00 +02:00
parent c73d1973bc
commit abf886e877
9 changed files with 40 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java
View File

@@ -59,15 +59,11 @@ public class ElasticsearchRestTemplateCallbackTests {
private ElasticsearchRestTemplate template;
@Mock
private RestHighLevelClient client;
@Mock private RestHighLevelClient client;
@Mock
private IndexResponse indexResponse;
@Mock
private BulkResponse bulkResponse;
@Mock
private BulkItemResponse bulkItemResponse;
@Mock private IndexResponse indexResponse;
@Mock private BulkResponse bulkResponse;
@Mock private BulkItemResponse bulkItemResponse;
@BeforeEach
public void setUp() throws Exception {
@@ -77,7 +73,7 @@ public class ElasticsearchRestTemplateCallbackTests {
doReturn("response-id").when(indexResponse).getId();
doReturn(bulkResponse).when(client).bulk(any(BulkRequest.class), any(RequestOptions.class));
doReturn(new BulkItemResponse[] {bulkItemResponse, bulkItemResponse}).when(bulkResponse).getItems();
doReturn(new BulkItemResponse[] { bulkItemResponse, bulkItemResponse }).when(bulkResponse).getItems();
doReturn("response-id").when(bulkItemResponse).getId();
}

26
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateCallbackTests.java
View File

@@ -59,23 +59,15 @@ public class ElasticsearchTransportTemplateCallbackTests {
private ElasticsearchTemplate template;
@Mock
private Client client;
@Mock private Client client;
@Mock
private IndexRequestBuilder indexRequestBuilder;
@Mock
private ActionFuture<IndexResponse> indexResponseActionFuture;
@Mock
private IndexResponse indexResponse;
@Mock
private BulkRequestBuilder bulkRequestBuilder;
@Mock
private ActionFuture<BulkResponse> bulkResponseActionFuture;
@Mock
private BulkResponse bulkResponse;
@Mock
private BulkItemResponse bulkItemResponse;
@Mock private IndexRequestBuilder indexRequestBuilder;
@Mock private ActionFuture<IndexResponse> indexResponseActionFuture;
@Mock private IndexResponse indexResponse;
@Mock private BulkRequestBuilder bulkRequestBuilder;
@Mock private ActionFuture<BulkResponse> bulkResponseActionFuture;
@Mock private BulkResponse bulkResponse;
@Mock private BulkItemResponse bulkItemResponse;
@BeforeEach
public void setUp() {
@@ -89,7 +81,7 @@ public class ElasticsearchTransportTemplateCallbackTests {
when(client.prepareBulk()).thenReturn(bulkRequestBuilder);
doReturn(bulkResponseActionFuture).when(bulkRequestBuilder).execute();
when(bulkResponseActionFuture.actionGet()).thenReturn(bulkResponse);
doReturn(new BulkItemResponse[] {bulkItemResponse, bulkItemResponse}).when(bulkResponse).getItems();
doReturn(new BulkItemResponse[] { bulkItemResponse, bulkItemResponse }).when(bulkResponse).getItems();
doReturn("response-id").when(bulkItemResponse).getId();
}

21
src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java
View File

@@ -59,17 +59,12 @@ public class ReactiveElasticsearchTemplateCallbackTests {
private ReactiveElasticsearchTemplate template;
@Mock
private ReactiveElasticsearchClient client;
@Mock private ReactiveElasticsearchClient client;
@Mock
private IndexResponse indexResponse;
@Mock
private BulkResponse bulkResponse;
@Mock
private BulkItemResponse bulkItemResponse;
@Mock
private DocWriteResponse docWriteResponse;
@Mock private IndexResponse indexResponse;
@Mock private BulkResponse bulkResponse;
@Mock private BulkItemResponse bulkItemResponse;
@Mock private DocWriteResponse docWriteResponse;
@BeforeEach
public void setUp() {
@@ -79,7 +74,7 @@ public class ReactiveElasticsearchTemplateCallbackTests {
doReturn("response-id").when(indexResponse).getId();
when(client.bulk(any(BulkRequest.class))).thenReturn(Mono.just(bulkResponse));
doReturn(new BulkItemResponse[] {bulkItemResponse, bulkItemResponse}).when(bulkResponse).getItems();
doReturn(new BulkItemResponse[] { bulkItemResponse, bulkItemResponse }).when(bulkResponse).getItems();
doReturn(docWriteResponse).when(bulkItemResponse).getResponse();
doReturn("response-id").when(docWriteResponse).getId();
}
@@ -154,8 +149,8 @@ public class ReactiveElasticsearchTemplateCallbackTests {
Person entity1 = new Person("init1", "luke1");
Person entity2 = new Person("init2", "luke2");
List<Person> saved = template.saveAll(Arrays.asList(entity1, entity2), IndexCoordinates.of("index"))
.toStream().collect(Collectors.toList());
List<Person> saved = template.saveAll(Arrays.asList(entity1, entity2), IndexCoordinates.of("index")).toStream()
.collect(Collectors.toList());
verify(afterSaveCallback, times(2)).onAfterSave(any());
assertThat(saved.get(0).getId()).isEqualTo("after-save");