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

DATAES-786 - Move the creation of SearchHit(s) from ElasticsearchConverter closer to ElasticsearchTemplate..

Browse Source 
Original PR: #427
This commit is contained in:
Roman Puchkovskiy
2020-04-16 08:50:16 +04:00
committed by GitHub
parent 39fb25cbb9
commit ff08d06c45
9 changed files with 365 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
View File

@@ -1093,7 +1093,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scroll.getScrollId());
assertThat(sampleEntities).hasSize(30);
@@ -1120,7 +1120,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scroll.getScrollId());
assertThat(sampleEntities).hasSize(30);
@@ -1148,7 +1148,8 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scrollId = scroll.getScrollId();
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000, SampleEntity.class);
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000,
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scrollId);
assertThat(sampleEntities).hasSize(30);
@@ -1175,7 +1176,8 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scrollId = scroll.getScrollId();
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000, SampleEntity.class);
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000,
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scrollId);
assertThat(sampleEntities).hasSize(30);
@@ -1202,7 +1204,8 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scrollId = scroll.getScrollId();
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000, SampleEntity.class);
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000,
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scrollId);
assertThat(sampleEntities).hasSize(30);
@@ -1229,7 +1232,8 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scrollId = scroll.getScrollId();
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000, SampleEntity.class);
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000,
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scrollId);
assertThat(sampleEntities).hasSize(30);
@@ -1256,7 +1260,8 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scrollId = scroll.getScrollId();
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000, SampleEntity.class);
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000,
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scrollId);
assertThat(sampleEntities).hasSize(30);
@@ -1283,7 +1288,8 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scrollId = scroll.getScrollId();
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000, SampleEntity.class);
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scrollId, 1000,
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scrollId);
assertThat(sampleEntities).hasSize(30);
@@ -1568,7 +1574,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(),
scrollTimeInMillis, SampleEntity.class);
scrollTimeInMillis, SampleEntity.class, index);
entities.addAll(scroll.getSearchHits());
}
@@ -2469,7 +2475,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scroll.getScrollId());
@@ -2507,7 +2513,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scroll.getScrollId());
@@ -2540,7 +2546,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
((AbstractElasticsearchTemplate) operations).searchScrollClear(scroll.getScrollId());
assertThat(sampleEntities).hasSize(3);
@@ -2587,7 +2593,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
// then
@@ -2636,7 +2642,7 @@ public abstract class ElasticsearchTemplateTests {
while (scroll.hasSearchHits()) {
sampleEntities.addAll(scroll.getSearchHits());
scroll = ((AbstractElasticsearchTemplate) operations).searchScrollContinue(scroll.getScrollId(), 1000,
SampleEntity.class);
SampleEntity.class, index);
}
// then

4
src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java
View File

@@ -253,11 +253,11 @@ public class MappingElasticsearchConverterUnitTests {
}
@Test // DATAES-530
public void shouldMapJsonStringToObject() {
public void shouldReadJsonStringToObject() {
// Given
// When
Car result = mappingElasticsearchConverter.mapDocument(Document.parse(JSON_STRING), Car.class);
Car result = mappingElasticsearchConverter.read(Car.class, Document.parse(JSON_STRING));
// Then
assertThat(result).isNotNull();