DATAMONGO-2385 - Remove unnecessary null checks in MongoConverters.

Original pull request: spring-projects#802.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java

@@ -110,7 +110,7 @@ enum ObjectIdToStringConverter implements Converter<ObjectId, String> {
 		INSTANCE;
 
 		public String convert(ObjectId id) {
-			return id == null ? null : id.toString();
+			return id.toString();
 		}
 	}
 
@@ -136,7 +136,7 @@ enum ObjectIdToBigIntegerConverter implements Converter<ObjectId, BigInteger> {
 		INSTANCE;
 
 		public BigInteger convert(ObjectId source) {
-			return source == null ? null : new BigInteger(source.toString(), 16);
+			return new BigInteger(source.toString(), 16);
 		}
 	}
 
@@ -149,15 +149,15 @@ enum BigIntegerToObjectIdConverter implements Converter<BigInteger, ObjectId> {
 		INSTANCE;
 
 		public ObjectId convert(BigInteger source) {
-			return source == null ? null : new ObjectId(source.toString(16));
+			return new ObjectId(source.toString(16));
 		}
 	}
 
 	enum BigDecimalToStringConverter implements Converter<BigDecimal, String> {
 		INSTANCE;
 
 		public String convert(BigDecimal source) {
-			return source == null ? null : source.toString();
+			return source.toString();
 		}
 	}
 
@@ -168,7 +168,7 @@ enum BigDecimalToDecimal128Converter implements Converter<BigDecimal, Decimal128
 		INSTANCE;
 
 		public Decimal128 convert(BigDecimal source) {
-			return source == null ? null : new Decimal128(source);
+			return new Decimal128(source);
 		}
 	}
 
@@ -195,7 +195,7 @@ enum BigIntegerToStringConverter implements Converter<BigInteger, String> {
 		INSTANCE;
 
 		public String convert(BigInteger source) {
-			return source == null ? null : source.toString();
+			return source.toString();
 		}
 	}
 
@@ -238,11 +238,6 @@ enum DocumentToStringConverter implements Converter<Document, String> {
 
 		@Override
 		public String convert(Document source) {
-
-			if (source == null) {
-				return null;
-			}
-
 			return source.toJson();
 		}
 	}
@@ -258,7 +253,7 @@ enum TermToStringConverter implements Converter<Term, String> {
 
 		@Override
 		public String convert(Term source) {
-			return source == null ? null : source.getFormatted();
+			return source.getFormatted();
 		}
 	}
 
@@ -273,7 +268,7 @@ enum DocumentToNamedMongoScriptConverter implements Converter<Document, NamedMon
 		@Override
 		public NamedMongoScript convert(Document source) {
 
-			if (source == null) {
+			if(source.isEmpty()) {
 				return null;
 			}
 
@@ -295,10 +290,6 @@ enum NamedMongoScriptToDocumentConverter implements Converter<NamedMongoScript,
 		@Override
 		public Document convert(NamedMongoScript source) {
 
-			if (source == null) {
-				return new Document();
-			}
-
 			Document document = new Document();
 
 			document.put("_id", source.getName());
@@ -325,7 +316,7 @@ enum CurrencyToStringConverter implements Converter<Currency, String> {
 		 */
 		@Override
 		public String convert(Currency source) {
-			return source == null ? null : source.getCurrencyCode();
+			return source.getCurrencyCode();
 		}
 	}
 
@@ -461,7 +452,7 @@ enum LongToAtomicLongConverter implements Converter<Long, AtomicLong> {
 
 		@Override
 		public AtomicLong convert(Long source) {
-			return source != null ? new AtomicLong(source) : null;
+			return new AtomicLong(source);
 		}
 	}
 
@@ -477,7 +468,7 @@ enum IntegerToAtomicIntegerConverter implements Converter<Integer, AtomicInteger
 
 		@Override
 		public AtomicInteger convert(Integer source) {
-			return source != null ? new AtomicInteger(source) : null;
+			return new AtomicInteger(source);
 		}
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NamedMongoScriptConvertsUnitTests.java

@@ -56,11 +56,6 @@ public static class NamedMongoScriptToDocumentConverterUnitTests {
 
 		NamedMongoScriptToDocumentConverter converter = NamedMongoScriptToDocumentConverter.INSTANCE;
 
-		@Test // DATAMONGO-479
-		public void convertShouldReturnEmptyDocWhenScriptIsNull() {
-			assertThat(converter.convert(null)).isEqualTo(new Document());
-		}
-
 		@Test // DATAMONGO-479
 		public void convertShouldConvertScriptNameCorreclty() {
 
@@ -87,9 +82,9 @@ public static class DocumentToNamedMongoScriptConverterUnitTests {
 
 		DocumentToNamedMongoScriptConverter converter = DocumentToNamedMongoScriptConverter.INSTANCE;
 
-		@Test // DATAMONGO-479
-		public void convertShouldReturnNullIfSourceIsNull() {
-			assertThat(converter.convert(null)).isNull();
+		@Test // DATAMONGO-479, DATAMONGO-2385
+		public void convertShouldReturnNullIfSourceIsEmpty() {
+			assertThat(converter.convert(new Document())).isNull();
 		}
 
 		@Test // DATAMONGO-479

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/TermToStringConverterUnitTests.java

@@ -15,11 +15,9 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
-
 import org.springframework.data.mongodb.core.convert.MongoConverters.TermToStringConverter;
 import org.springframework.data.mongodb.core.query.Term;
 import org.springframework.data.mongodb.core.query.Term.Type;
@@ -29,11 +27,6 @@
  */
 public class TermToStringConverterUnitTests {
 
-	@Test // DATAMONGO-973
-	public void shouldNotConvertNull() {
-		assertThat(TermToStringConverter.INSTANCE.convert(null)).isNull();
-	}
-
 	@Test // DATAMONGO-973
 	public void shouldUseFormattedRepresentationForConversion() {