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

Fix MappingElasticsearchConverter memory leak.

Browse Source 
Original Pull Request #1928
Closes #1924
This commit is contained in:
Peter-Josef Meisch 2021-09-10 16:04:40 +02:00 committed by GitHub
parent 6941e31ba4
commit 7c35e5327e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java
View File

@ -97,6 +97,8 @@ public class MappingElasticsearchConverter
private final GenericConversionService conversionService; private final GenericConversionService conversionService;
// don't access directly, use getConversions(). to prevent null access // don't access directly, use getConversions(). to prevent null access
private CustomConversions conversions = new ElasticsearchCustomConversions(Collections.emptyList()); private CustomConversions conversions = new ElasticsearchCustomConversions(Collections.emptyList());
private final SpELContext spELContext = new SpELContext(new MapAccessor());
private final EntityInstantiators instantiators = new EntityInstantiators();
public MappingElasticsearchConverter( public MappingElasticsearchConverter(
MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) { MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
@ -159,7 +161,7 @@ public class MappingElasticsearchConverter
@Override @Override
public <R> R read(Class<R> type, Document source) { public <R> R read(Class<R> type, Document source) {
Reader reader = new Reader(mappingContext, conversionService, getConversions()); Reader reader = new Reader(mappingContext, conversionService, getConversions(), spELContext, instantiators);
return reader.read(type, source); return reader.read(type, source);
} }
@ -200,14 +202,16 @@ public class MappingElasticsearchConverter
private static class Reader extends Base { private static class Reader extends Base {
private final SpELContext spELContext; private final SpELContext spELContext;
private final EntityInstantiators instantiators = new EntityInstantiators(); private final EntityInstantiators instantiators;
public Reader( public Reader(
MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext, MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
GenericConversionService conversionService, CustomConversions conversions) { GenericConversionService conversionService, CustomConversions conversions, SpELContext spELContext,
EntityInstantiators instantiators) {
super(mappingContext, conversionService, conversions); super(mappingContext, conversionService, conversions);
this.spELContext = new SpELContext(new MapAccessor()); this.spELContext = spELContext;
this.instantiators = instantiators;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")