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

Allow CustomConversions for entities - adaption for 4.0.x.

Browse Source
This commit is contained in:
Peter-Josef Meisch 2021-01-29 11:55:10 +01:00
parent eefd5a2187
commit 40cff583f4
No known key found for this signature in database
GPG Key ID: DE108246970C7708
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/java/org/springframework/data/elasticsearch/core/mapping/EntityCustomConversionIntegrationTests.java
View File

@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.elasticsearch.common.geo.GeoPoint;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
@ -40,7 +41,6 @@ import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.IndexOperations;
import org.springframework.data.elasticsearch.core.SearchHits; import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions; import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
import org.springframework.data.elasticsearch.core.geo.GeoJsonPoint;
import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.query.Query;
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
@ -72,7 +72,7 @@ public class EntityCustomConversionIntegrationTests {
void setUp() { void setUp() {
IndexOperations indexOps = operations.indexOps(Entity.class); IndexOperations indexOps = operations.indexOps(Entity.class);
indexOps.create(); indexOps.create();
indexOps.putMapping(); indexOps.putMapping(indexOps.createMapping());
} }
@AfterEach @AfterEach
@ -86,7 +86,7 @@ public class EntityCustomConversionIntegrationTests {
Entity entity = Entity.builder() // Entity entity = Entity.builder() //
.value("hello") // .value("hello") //
.location(GeoJsonPoint.of(8.0, 42.7)) // .location(new GeoPoint(42.7, 8.0)) //
.build(); .build();
org.springframework.data.elasticsearch.core.document.Document document = org.springframework.data.elasticsearch.core.document.Document org.springframework.data.elasticsearch.core.document.Document document = org.springframework.data.elasticsearch.core.document.Document
@ -104,10 +104,11 @@ public class EntityCustomConversionIntegrationTests {
Entity entity = Entity.builder() // Entity entity = Entity.builder() //
.value("hello") // .value("hello") //
.location(GeoJsonPoint.of(8.0, 42.7)) // .location(new GeoPoint(42.7, 8.0)) //
.build(); .build();
Entity savedEntity = operations.save(entity); Entity savedEntity = operations.save(entity);
operations.indexOps(Entity.class).refresh();
SearchHits<Entity> searchHits = operations.search(Query.findAll(), Entity.class); SearchHits<Entity> searchHits = operations.search(Query.findAll(), Entity.class);
assertThat(searchHits.getTotalHits()).isEqualTo(1); assertThat(searchHits.getTotalHits()).isEqualTo(1);
@ -122,7 +123,7 @@ public class EntityCustomConversionIntegrationTests {
@Document(indexName = "entity-with-custom-conversions") @Document(indexName = "entity-with-custom-conversions")
static class Entity { static class Entity {
private String value; private String value;
private GeoJsonPoint location; private GeoPoint location;
} }
@WritingConverter @WritingConverter
@ -131,8 +132,8 @@ public class EntityCustomConversionIntegrationTests {
public Map<String, Object> convert(Entity source) { public Map<String, Object> convert(Entity source) {
LinkedHashMap<String, Object> target = new LinkedHashMap<>(); LinkedHashMap<String, Object> target = new LinkedHashMap<>();
target.put("the_value", source.getValue()); target.put("the_value", source.getValue());
target.put("the_lat", "" + source.getLocation().getY()); target.put("the_lat", String.valueOf(source.getLocation().getLat()));
target.put("the_lon", "" + source.getLocation().getX()); target.put("the_lon", String.valueOf(source.getLocation().getLon()));
return target; return target;
} }
} }
@ -144,10 +145,10 @@ public class EntityCustomConversionIntegrationTests {
public Entity convert(Map<String, Object> source) { public Entity convert(Map<String, Object> source) {
Entity entity = new Entity(); Entity entity = new Entity();
entity.setValue((String) source.get("the_value")); entity.setValue((String) source.get("the_value"));
entity.setLocation(GeoJsonPoint.of( // entity.setLocation(new GeoPoint( //
Double.parseDouble((String) (source.get("the_lon"))), // Double.parseDouble((String) (source.get("the_lat"))), //
Double.parseDouble((String) (source.get("the_lat"))) // Double.parseDouble((String) (source.get("the_lon"))) //
)); ));
return entity; return entity;
} }
} }