diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java index 20e296031..0937d79c8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java @@ -267,6 +267,7 @@ abstract class MongoConverters { */ @WritingConverter public static enum CurrencyToStringConverter implements Converter { + INSTANCE; /* @@ -275,12 +276,7 @@ abstract class MongoConverters { */ @Override public String convert(Currency source) { - - if (source == null) { - return null; - } - - return source.getCurrencyCode(); + return source == null ? null : source.getCurrencyCode(); } } @@ -292,6 +288,7 @@ abstract class MongoConverters { */ @ReadingConverter public static enum StringToCurrencyConverter implements Converter { + INSTANCE; /* @@ -300,12 +297,7 @@ abstract class MongoConverters { */ @Override public Currency convert(String source) { - - if (!StringUtils.hasText(source)) { - return null; - } - - return Currency.getInstance(source); + return StringUtils.hasText(source) ? Currency.getInstance(source) : null; } } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java index 6b7103afe..053c7bce4 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 by the original author(s). + * Copyright 2011-2016 by the original author(s). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.