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

DATAES-449 - Pass route parameter to created search request.

Browse Source 
Original PR: #383
This commit is contained in:
Peter-Josef Meisch 2020-01-25 18:54:51 +01:00 committed by GitHub
parent 37f15853c0
commit 13761b073a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java
View File

@ -560,6 +560,10 @@ class RequestFactory {
sourceBuilder.trackTotalHits(query.getTrackTotalHits()); sourceBuilder.trackTotalHits(query.getTrackTotalHits());
} }
if (StringUtils.hasLength(query.getRoute())) {
request.routing(query.getRoute());
}
request.source(sourceBuilder); request.source(sourceBuilder);
return request; return request;
} }
@ -726,6 +730,10 @@ class RequestFactory {
searchRequestBuilder.setTrackTotalHits(query.getTrackTotalHits()); searchRequestBuilder.setTrackTotalHits(query.getTrackTotalHits());
} }
if (StringUtils.hasLength(query.getRoute())) {
searchRequestBuilder.setRouting(query.getRoute());
}
return searchRequestBuilder; return searchRequestBuilder;
} }

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

@ -15,10 +15,12 @@
*/ */
package org.springframework.data.elasticsearch.core; package org.springframework.data.elasticsearch.core;
import static org.assertj.core.api.Assertions.*;
import static org.skyscreamer.jsonassert.JSONAssert.*; import static org.skyscreamer.jsonassert.JSONAssert.*;
import java.util.Collections; import java.util.Collections;
import org.elasticsearch.action.search.SearchRequest;
import org.json.JSONException; import org.json.JSONException;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -103,6 +105,18 @@ class RequestFactoryTest {
assertEquals(expected, searchRequest, false); assertEquals(expected, searchRequest, false);
} }
@Test // DATAES-449
void shouldAddRouting() throws JSONException {
String route = "route66";
CriteriaQuery query = new CriteriaQuery(new Criteria("lastName").is("Smith"));
query.setRoute(route);
converter.updateQuery(query, Person.class);
SearchRequest searchRequest = requestFactory.searchRequest(query, Person.class, IndexCoordinates.of("persons"));
assertThat(searchRequest.routing()).isEqualTo(route);
}
static class Person { static class Person {
@Id String id; @Id String id;
@Field(name = "last-name") String lastName; @Field(name = "last-name") String lastName;