From de1c2581f719008420bed51509a97a4d139a26f2 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 23 Jun 2015 09:51:17 +0200 Subject: [PATCH] DATACOUCH-129 - Ensure Spring Framework 4.2 compatibility. Removed deprecated (and in 4.2 removed) usage of ConversionServiceFactory in MappingCouchbaseConverter. Original pull request: #42. --- .../couchbase/core/convert/MappingCouchbaseConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java index d599750d..5c809fa5 100644 --- a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java +++ b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java @@ -20,7 +20,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.CollectionFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.convert.EntityInstantiator; import org.springframework.data.couchbase.core.mapping.CouchbaseDocument; import org.springframework.data.couchbase.core.mapping.CouchbaseList; @@ -80,7 +80,7 @@ public class MappingCouchbaseConverter extends AbstractCouchbaseConverter @SuppressWarnings("deprecation") public MappingCouchbaseConverter(final MappingContext, CouchbasePersistentProperty> mappingContext) { - super(ConversionServiceFactory.createDefaultConversionService()); + super(new DefaultConversionService()); this.mappingContext = mappingContext; typeMapper = new DefaultCouchbaseTypeMapper(DefaultCouchbaseTypeMapper.DEFAULT_TYPE_KEY);