Skip to content

Commit 1303e20

Browse files
ludochgae-java-bot
authored andcommitted
Upgrade to latest Guava version, that warns us to move to jspecify Nullable annotation (https://jspecify.dev/) similar to what Guava does, so that we can continue to use the transitive dep while we are preparing to define an explicit dependency.
PiperOrigin-RevId: 739269882 Change-Id: I806c778c0228a82c4feeedeb23ed603cedfd3f20
1 parent cfc664a commit 1303e20

180 files changed

Lines changed: 215 additions & 221 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

THIRD-PARTY.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ The repository contains 3rd-party code under the following licenses:
171171
* Spring Web MVC (org.springframework:spring-webmvc:5.3.22 - https://github.com/spring-projects/spring-framework)
172172
* Truth Core (com.google.truth:truth:1.1.3 - http://github.com/google/truth/truth)
173173
* Truth Extension for Java8 (com.google.truth.extensions:truth-java8-extension:1.1.3 - http://github.com/google/truth/truth-extensions-parent/truth-java8-extension)
174+
* Jspecify (org.jspecify:jspecify:1.0.0 - https://jspecify.dev)
174175

175176
Apache License, Version 2.0, Eclipse Public License - Version 1.0
176177

@@ -258,12 +259,7 @@ The repository contains 3rd-party code under the following licenses:
258259

259260
* MySQL Connector/J (mysql:mysql-connector-java:8.0.28 - http://dev.mysql.com/doc/connector-j/en/)
260261

261-
GNU General Public License, version 2, The MIT License
262-
263-
* Checker Qual (org.checkerframework:checker-compat-qual:2.5.3 - https://checkerframework.org)
264-
* Checker Qual (org.checkerframework:checker-compat-qual:2.5.5 - https://checkerframework.org)
265-
266-
Go License
262+
Go License
267263

268264
* RE2/J (com.google.re2j:re2j:1.5 - http://github.com/google/re2j)
269265

@@ -297,7 +293,6 @@ The repository contains 3rd-party code under the following licenses:
297293

298294
* Animal Sniffer Annotations (org.codehaus.mojo:animal-sniffer-annotations:1.20 - http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations)
299295
* Animal Sniffer Annotations (org.codehaus.mojo:animal-sniffer-annotations:1.21 - https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations)
300-
* Checker Qual (org.checkerframework:checker-qual:3.24.0 - https://checkerframework.org)
301296
* jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
302297
* jsoup Java HTML Parser (org.jsoup:jsoup:1.15.3 - https://jsoup.org/)
303298
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.30 - http://www.slf4j.org)

api/src/main/java/com/google/appengine/api/appidentity/AppIdentityServiceFailureException.java

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

1717
package com.google.appengine.api.appidentity;
1818

19-
import org.checkerframework.checker.nullness.qual.Nullable;
19+
import org.jspecify.annotations.Nullable;
2020

2121
/**
2222
* {@link AppIdentityServiceFailureException} is thrown when any unknown error occurs while

api/src/main/java/com/google/appengine/api/appidentity/AppIdentityServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import java.util.Random;
4747
import java.util.concurrent.Semaphore;
4848
import java.util.concurrent.atomic.AtomicReference;
49-
import org.checkerframework.checker.nullness.qual.Nullable;
49+
import org.jspecify.annotations.Nullable;
5050

5151
/** Implementation of the AppIdentityService interface. */
5252
class AppIdentityServiceImpl implements AppIdentityService {

api/src/main/java/com/google/appengine/api/blobstore/BlobInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.io.ObjectInputStream;
2222
import java.io.Serializable;
2323
import java.util.Date;
24-
import org.checkerframework.checker.nullness.qual.Nullable;
24+
import org.jspecify.annotations.Nullable;
2525

2626
/**
2727
* {@code BlobInfo} contains metadata about a blob. This metadata is gathered by

api/src/main/java/com/google/appengine/api/blobstore/BlobInfoFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.google.appengine.api.datastore.Query;
2929
import java.util.Date;
3030
import java.util.Iterator;
31-
import org.checkerframework.checker.nullness.qual.Nullable;
31+
import org.jspecify.annotations.Nullable;
3232

3333
/**
3434
* {@code BlobInfoFactory} provides a trivial interface for retrieving

api/src/main/java/com/google/appengine/api/blobstore/BlobKey.java

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

1919
import java.io.Serializable;
2020
import java.util.Objects;
21-
import org.checkerframework.checker.nullness.qual.Nullable;
21+
import org.jspecify.annotations.Nullable;
2222

2323
/**
2424
* {@code BlobKey} contains the string identifier of a large (possibly

api/src/main/java/com/google/appengine/api/blobstore/BlobstoreInputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.base.Preconditions;
2323
import java.io.IOException;
2424
import java.io.InputStream;
25-
import org.checkerframework.checker.nullness.qual.Nullable;
25+
import org.jspecify.annotations.Nullable;
2626

2727
/**
2828
* BlobstoreInputStream provides an InputStream view of a blob in

api/src/main/java/com/google/appengine/api/blobstore/BlobstoreService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import javax.servlet.http.HttpServletRequest;
2323
import javax.servlet.http.HttpServletResponse;
24-
import org.checkerframework.checker.nullness.qual.Nullable;
24+
import org.jspecify.annotations.Nullable;
2525

2626
/**
2727
* {@code BlobstoreService} allows you to manage the creation and

api/src/main/java/com/google/appengine/api/blobstore/BlobstoreServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.Map;
4141
import javax.servlet.http.HttpServletRequest;
4242
import javax.servlet.http.HttpServletResponse;
43-
import org.checkerframework.checker.nullness.qual.Nullable;
43+
import org.jspecify.annotations.Nullable;
4444

4545
/**
4646
* {@code BlobstoreServiceImpl} is an implementation of {@link BlobstoreService} that makes API

api/src/main/java/com/google/appengine/api/blobstore/ByteRange.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Objects;
2222
import java.util.regex.Matcher;
2323
import java.util.regex.Pattern;
24-
import org.checkerframework.checker.nullness.qual.Nullable;
24+
import org.jspecify.annotations.Nullable;
2525

2626
/**
2727
* A byte range as parsed from a request Range header. Format produced by this class is

0 commit comments

Comments
 (0)