Skip to content

Commit e2fbc64

Browse files
authored
Use JSpecify for nullability. (#2071)
Closes #2022. Signed-off-by: mikereiche <[email protected]>
1 parent b0811ce commit e2fbc64

26 files changed

+31
-25
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343

4444
<dependencies>
4545

46+
<dependency>
47+
<groupId>org.jspecify</groupId>
48+
<artifactId>jspecify</artifactId>
49+
<version>1.0.0</version>
50+
</dependency>
51+
4652
<dependency>
4753
<groupId>io.github.openfeign.querydsl</groupId>
4854
<artifactId>querydsl-apt</artifactId>

src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.cache.Cache;
2929
import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManager;
3030
import org.springframework.data.couchbase.CouchbaseClientFactory;
31-
import org.springframework.lang.Nullable;
31+
import org.jspecify.annotations.Nullable;
3232
import org.springframework.util.Assert;
3333

3434
public class CouchbaseCacheManager extends AbstractTransactionSupportingCacheManager {

src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.time.Duration;
2020

21-
import org.springframework.lang.Nullable;
21+
import org.jspecify.annotations.Nullable;
2222

2323
import com.couchbase.client.java.codec.Transcoder;
2424

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
3131
import org.springframework.data.couchbase.core.query.Query;
3232
import org.springframework.data.mapping.context.MappingContext;
33-
import org.springframework.lang.Nullable;
33+
import org.jspecify.annotations.Nullable;
3434

3535
import com.couchbase.client.java.Collection;
3636
import com.couchbase.client.java.query.QueryScanConsistency;

src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.data.couchbase.core.support.WithAnalyticsConsistency;
2828
import org.springframework.data.couchbase.core.support.WithAnalyticsOptions;
2929
import org.springframework.data.couchbase.core.support.WithAnalyticsQuery;
30-
import org.springframework.lang.Nullable;
30+
import org.jspecify.annotations.Nullable;
3131

3232
import com.couchbase.client.java.analytics.AnalyticsOptions;
3333
import com.couchbase.client.java.analytics.AnalyticsScanConsistency;

src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.data.couchbase.core.support.WithDistinct;
3030
import org.springframework.data.couchbase.core.support.WithQuery;
3131
import org.springframework.data.couchbase.core.support.WithQueryOptions;
32-
import org.springframework.lang.Nullable;
32+
import org.jspecify.annotations.Nullable;
3333

3434
import com.couchbase.client.java.query.QueryOptions;
3535
import com.couchbase.client.java.query.QueryScanConsistency;

src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.core.convert.converter.Converter;
2121
import org.springframework.core.convert.converter.ConverterFactory;
2222
import org.springframework.data.convert.ReadingConverter;
23-
import org.springframework.lang.Nullable;
23+
import org.jspecify.annotations.Nullable;
2424
import org.springframework.util.Assert;
2525

2626
import com.couchbase.client.core.encryption.CryptoManager;

src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
2020
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
2121
import org.springframework.data.util.TypeInformation;
22-
import org.springframework.lang.Nullable;
22+
import org.jspecify.annotations.Nullable;
2323

2424
/**
2525
* {@link ValueConversionContext} that allows to delegate read/write to an underlying {@link CouchbaseConverter}.

src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.core.convert.converter.Converter;
2121
import org.springframework.core.convert.converter.ConverterFactory;
2222
import org.springframework.data.convert.ReadingConverter;
23-
import org.springframework.lang.Nullable;
23+
import org.jspecify.annotations.Nullable;
2424
import org.springframework.util.Assert;
2525

2626
import com.couchbase.client.core.encryption.CryptoManager;

src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
import org.springframework.data.mapping.model.ValueExpressionParameterValueProvider;
7777
import org.springframework.data.util.TypeInformation;
7878
import org.springframework.expression.spel.standard.SpelExpressionParser;
79-
import org.springframework.lang.Nullable;
79+
import org.jspecify.annotations.Nullable;
8080
import org.springframework.util.Assert;
8181
import org.springframework.util.CollectionUtils;
8282

0 commit comments

Comments
 (0)