From 69a4217c4bfedc5df7dc967b85b132735930c135 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 1 Aug 2019 11:49:13 +0200 Subject: [PATCH] DATAMONGO-2328 - Polishing. Replace static imports with qualified access. Original pull request: #773. --- .../core/convert/AbstractMongoConverter.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java index 8b3733c1a..d50c5bd91 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java @@ -15,8 +15,6 @@ */ package org.springframework.data.mongodb.core.convert; -import static org.springframework.data.convert.ConverterBuilder.*; - import java.math.BigInteger; import java.util.Date; @@ -26,6 +24,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; +import org.springframework.data.convert.ConverterBuilder; import org.springframework.data.convert.CustomConversions; import org.springframework.data.convert.EntityInstantiators; import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToObjectIdConverter; @@ -98,20 +97,23 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali } if (!conversionService.canConvert(Date.class, Long.class)) { - conversionService.addConverter(writing(Date.class, Long.class, Date::getTime).getWritingConverter()); + conversionService + .addConverter(ConverterBuilder.writing(Date.class, Long.class, Date::getTime).getWritingConverter()); } if (!conversionService.canConvert(Long.class, Date.class)) { - conversionService.addConverter(reading(Long.class, Date.class, Date::new).getReadingConverter()); + conversionService.addConverter(ConverterBuilder.reading(Long.class, Date.class, Date::new).getReadingConverter()); } if (!conversionService.canConvert(ObjectId.class, Date.class)) { conversionService.addConverter( - reading(ObjectId.class, Date.class, objectId -> new Date(objectId.getTimestamp())).getReadingConverter()); + ConverterBuilder.reading(ObjectId.class, Date.class, objectId -> new Date(objectId.getTimestamp())) + .getReadingConverter()); } - conversionService.addConverter(reading(Code.class, String.class, Code::getCode).getReadingConverter()); + conversionService + .addConverter(ConverterBuilder.reading(Code.class, String.class, Code::getCode).getReadingConverter()); conversions.registerConvertersIn(conversionService); }