Commit dfe16bd

committed

Return early for Date to BsonDateTime conversion

Add missing return statement to return value early instead of falling back to Codec based conversion. Closes: #5072

1 parent a18556f commit dfe16bdCopy full SHA for dfe16bd

File tree

+10

-2

lines changed

spring-data-mongodb/src
- main/java/org/springframework/data/mongodb/util
  - BsonUtils.java
- test/java/org/springframework/data/mongodb/util/json
  - BsonUtilsTest.java

+10

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public static BsonValue simpleToBsonValue(@Nullable Object source) {`
`344`	`344`	`* @throws IllegalArgumentException if {@literal source} does not correspond to a {@link BsonValue} type.`
`345`	`345`	`* @since 4.2`
`346`	`346`	`*/`
`347`		`- @SuppressWarnings("unchecked")`
	`347`	`+ @SuppressWarnings({ "unchecked", "rawtypes" })`
`348`	`348`	`@Contract("null, _ -> !null")`
`349`	`349`	`public static BsonValue simpleToBsonValue(@Nullable Object source, CodecRegistry codecRegistry) {`
`350`	`350`
`@@ -393,7 +393,7 @@ public static BsonValue simpleToBsonValue(@Nullable Object source, CodecRegistry`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`if (source instanceof Date date) {`
`396`		`- new BsonDateTime(date.getTime());`
	`396`	`+ returnnew BsonDateTime(date.getTime());`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`try {`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`import java.util.stream.Stream;`
`34`	`34`
`35`	`35`	`import org.bson.BsonArray;`
	`36`	`+import org.bson.BsonDateTime;`
`36`	`37`	`import org.bson.BsonDouble;`
`37`	`38`	`import org.bson.BsonInt32;`
`38`	`39`	`import org.bson.BsonInt64;`
`@@ -151,6 +152,13 @@ void convertsJavaTimeTypesToBsonDateTime(Temporal source) {`
`151`	`152`	`.isEqualTo(new Document("value", source).toBsonDocument().get("value"));`
`152`	`153`	`}`
`153`	`154`
	`155`	`+ @Test // GH-5072`
	`156`	`+ void convertsJavaDateToBsonDateTime() {`
	`157`	`+`
	`158`	`+ Date source = new Date();`
	`159`	`+ assertThat(BsonUtils.simpleToBsonValue(source)).isEqualTo(new BsonDateTime(source.getTime()));`
	`160`	`+ }`
	`161`	`+`
`154`	`162`	`@ParameterizedTest // GH-4432`
`155`	`163`	`@MethodSource("collectionLikeInstances")`
`156`	`164`	`void convertsCollectionLikeToBsonArray(Object source) {`

Comments

(0)