Polishing.

Add nullability annotation. Return early on null value conversion.

See #3633
Original pull request: #3643.
This commit is contained in:
Mark Paluch
2021-06-09 12:06:43 +02:00
parent 2f3fb4aea9
commit 5cf801ff8e

View File

@@ -378,6 +378,10 @@ public class QueryMapper {
}
}
if (value == null) {
return null;
}
if (isNestedKeyword(value)) {
return getMappedKeyword(new Keyword((Bson) value), documentField.getPropertyEntity());
}
@@ -635,7 +639,7 @@ public class QueryMapper {
* @param candidate
* @return
*/
protected boolean isNestedKeyword(Object candidate) {
protected boolean isNestedKeyword(@Nullable Object candidate) {
if (!(candidate instanceof Document)) {
return false;
@@ -683,6 +687,7 @@ public class QueryMapper {
* @param value the actual value. Can be {@literal null}.
* @return the potentially converted target value.
*/
@Nullable
private Object applyFieldTargetTypeHintToValue(Field documentField, @Nullable Object value) {
if (value == null || documentField.getProperty() == null || !documentField.getProperty().hasExplicitWriteTarget()) {