Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-21 03:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ReactiveIndicesTemplate: Refresh not called on bound indices.

Browse Source 
Original Pull Request #2444
Closes #2441

(cherry picked from commit 0971acfe25e82207d6c0dfe7f5de361692328693)
This commit is contained in:
Urs Keller 2023-02-03 19:56:47 +01:00 committed by Peter-Josef Meisch
parent b005c77cad
commit 5cf7b2baae
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveIndicesTemplate.java
View File

@ -154,7 +154,8 @@ public class ReactiveIndicesTemplate
@Override
public Mono<Void> refresh() {
return Mono.from(execute(ReactiveElasticsearchIndicesClient::refresh)).then();
RefreshRequest refreshRequest = requestConverter.indicesRefreshRequest(getIndexCoordinates());
return Mono.from(execute(client -> client.refresh(refreshRequest))).then();
}
@Override

72
src/test/java/org/springframework/data/elasticsearch/client/elc/ReactiveIndicesTemplateTest.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Copyright 2021-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.elasticsearch.client.elc;
import co.elastic.clients.elasticsearch.indices.RefreshRequest;
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.transport.ElasticsearchTransport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*;
/**
* @author Urs Keller
* @since 5.0
*/
@ExtendWith(MockitoExtension.class)
class ReactiveIndicesTemplateTest {
@Mock private ElasticsearchConverter elasticsearchConverter;
@Mock private ReactiveElasticsearchIndicesClient client;
@Mock private ElasticsearchTransport transport;
@Mock private JsonpMapper jsonpMapper;
@Captor ArgumentCaptor<RefreshRequest> refreshRequest;
@BeforeEach
void setup() {
doReturn(transport).when(client)._transport();
doReturn(jsonpMapper).when(transport).jsonpMapper();
}
/**
* Tests that refresh is called with the indices bound to the template
*/
@Test
void refresh() {
IndexCoordinates indexCoordinate = IndexCoordinates.of("i1", "i2");
ReactiveIndicesTemplate template = new ReactiveIndicesTemplate(client, elasticsearchConverter, indexCoordinate);
doReturn(Mono.empty()).when(client).refresh(any(RefreshRequest.class));
template.refresh().as(StepVerifier::create).verifyComplete();
verify(client).refresh(refreshRequest.capture());
assertEquals(List.of("i1", "i2"), refreshRequest.getValue().index());
verifyNoMoreInteractions(elasticsearchConverter, client, transport, jsonpMapper);
}
}