Skip to content

Commit 047f070

Browse files
Fix nullable annotations.
Transition nullable annotations previously missed to jspecify. See: #4874
1 parent fa12c3c commit 047f070

File tree

15 files changed

+22
-29
lines changed

15 files changed

+22
-29
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.bson.BsonBinarySubType;
3131
import org.bson.BsonNull;
3232
import org.bson.Document;
33+
import org.jspecify.annotations.Nullable;
3334
import org.springframework.data.mongodb.core.mapping.Field;
3435
import org.springframework.data.mongodb.core.query.Collation;
3536
import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty;
@@ -43,7 +44,6 @@
4344
import org.springframework.data.util.Optionals;
4445
import org.springframework.lang.CheckReturnValue;
4546
import org.springframework.lang.Contract;
46-
import org.springframework.lang.Nullable;
4747
import org.springframework.util.Assert;
4848
import org.springframework.util.ObjectUtils;
4949

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import java.util.concurrent.TimeUnit;
1919

2020
import org.bson.Document;
21+
import org.jspecify.annotations.Nullable;
2122
import org.springframework.core.convert.converter.Converter;
2223
import org.springframework.data.mongodb.core.index.IndexDefinition;
2324
import org.springframework.data.mongodb.core.index.IndexInfo;
24-
import org.springframework.lang.Nullable;
2525
import org.springframework.util.ObjectUtils;
2626

2727
import com.mongodb.client.model.Collation;
@@ -124,8 +124,7 @@ private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexO
124124
};
125125
}
126126

127-
@Nullable
128-
public static Collation fromDocument(@Nullable Document source) {
127+
public static @Nullable Collation fromDocument(@Nullable Document source) {
129128

130129
if (source == null) {
131130
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import org.bson.UuidRepresentation;
2727
import org.bson.codecs.configuration.CodecRegistry;
28+
import org.jspecify.annotations.Nullable;
2829
import org.springframework.beans.factory.config.AbstractFactoryBean;
29-
import org.springframework.lang.Nullable;
3030
import org.springframework.util.CollectionUtils;
3131
import org.springframework.util.StringUtils;
3232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.data.mongodb.core;
1717

1818
import org.bson.Document;
19-
import org.springframework.lang.Nullable;
19+
import org.jspecify.annotations.Nullable;
2020

2121
/**
2222
* {@link CursorPreparer} that exposes its {@link Document sort document}.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import java.util.function.Supplier;
1919

2020
import org.bson.Document;
21+
import org.jspecify.annotations.Nullable;
2122
import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
2223
import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
2324
import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let;
2425
import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable;
2526
import org.springframework.lang.Contract;
26-
import org.springframework.lang.Nullable;
2727
import org.springframework.util.Assert;
2828

2929
/**
@@ -42,17 +42,13 @@ public class LookupOperation implements FieldsExposingAggregationOperation, Inhe
4242

4343
private final String from;
4444

45-
@Nullable //
46-
private final Field localField;
45+
private final @Nullable Field localField;
4746

48-
@Nullable //
49-
private final Field foreignField;
47+
private final @Nullable Field foreignField;
5048

51-
@Nullable //
52-
private final Let let;
49+
private final @Nullable Let let;
5350

54-
@Nullable //
55-
private final AggregationPipeline pipeline;
51+
private final @Nullable AggregationPipeline pipeline;
5652

5753
private final ExposedField as;
5854

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.bson.Document;
3434
import org.bson.types.Binary;
3535

36+
import org.jspecify.annotations.Nullable;
3637
import org.springframework.core.CollectionFactory;
3738
import org.springframework.data.mongodb.core.convert.MongoConversionContext;
3839
import org.springframework.data.mongodb.core.convert.MongoConversionContext.OperatorContext;
@@ -45,7 +46,6 @@
4546
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
4647
import org.springframework.data.mongodb.core.mapping.Queryable;
4748
import org.springframework.data.mongodb.util.BsonUtils;
48-
import org.springframework.lang.Nullable;
4949
import org.springframework.util.ObjectUtils;
5050
import org.springframework.util.StringUtils;
5151

@@ -72,9 +72,8 @@ public MongoEncryptionConverter(Encryption<BsonValue, BsonBinary> encryption, En
7272
this.keyResolver = keyResolver;
7373
}
7474

75-
@Nullable
7675
@Override
77-
public Object read(Object value, MongoConversionContext context) {
76+
public @Nullable Object read(Object value, MongoConversionContext context) {
7877

7978
Object decrypted = EncryptingConverter.super.read(value, context);
8079
return decrypted instanceof BsonValue bsonValue ? BsonUtils.toJavaType(bsonValue) : decrypted;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Map;
1919
import java.util.Objects;
2020

21-
import org.springframework.lang.Nullable;
21+
import org.jspecify.annotations.Nullable;
2222
import org.springframework.util.Assert;
2323
import org.springframework.util.ObjectUtils;
2424

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import java.util.Optional;
1919

2020
import org.bson.Document;
21+
import org.jspecify.annotations.Nullable;
2122
import org.springframework.data.mongodb.core.query.Collation;
22-
import org.springframework.lang.Nullable;
2323
import org.springframework.lang.Contract;
2424
import org.springframework.util.Assert;
2525
import org.springframework.util.StringUtils;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
package org.springframework.data.mongodb.core.index;
1717

1818
import org.bson.Document;
19+
import org.jspecify.annotations.Nullable;
1920
import org.springframework.data.mapping.context.MappingContext;
2021
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
2122
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
2223
import org.springframework.data.util.TypeInformation;
23-
import org.springframework.lang.Nullable;
2424

2525
/**
2626
* Definition for an Atlas Search Index (Search Index or Vector Index).

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import java.util.function.Supplier;
1919

2020
import org.bson.Document;
21+
import org.jspecify.annotations.Nullable;
2122
import org.springframework.data.mapping.context.MappingContext;
2223
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
2324
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
2425
import org.springframework.data.util.Lazy;
2526
import org.springframework.data.util.TypeInformation;
26-
import org.springframework.lang.Nullable;
2727

2828
/**
2929
* Index information for a MongoDB Search Index.

0 commit comments

Comments
 (0)