Add @Nullable annotations where appropriate

Found via error-prone 2.1.0.
pull/218/head
Andrew Gaul 2017-08-21 19:43:53 -07:00
rodzic 51aa2e7fcd
commit f6c3ab9e75
5 zmienionych plików z 16 dodań i 0 usunięć

Wyświetl plik

@ -323,6 +323,11 @@
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>jackson-dataformat-xml</artifactId>
<version>2.8.8</version> <version>2.8.8</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>

Wyświetl plik

@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.annotation.Nullable;
import javax.crypto.Mac; import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -171,6 +172,7 @@ final class AwsSignature {
return BaseEncoding.base16().lowerCase().encode(hash); return BaseEncoding.base16().lowerCase().encode(hash);
} }
@Nullable
private static String[] extractSignedHeaders(String authorization) { private static String[] extractSignedHeaders(String authorization) {
int index = authorization.indexOf("SignedHeaders="); int index = authorization.indexOf("SignedHeaders=");
if (index < 0) { if (index < 0) {

Wyświetl plik

@ -20,6 +20,8 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.hash.HashCode; import com.google.common.hash.HashCode;
@ -53,6 +55,7 @@ final class NullBlobStore extends ForwardingBlobStore {
} }
@Override @Override
@Nullable
public BlobMetadata blobMetadata(String container, String name) { public BlobMetadata blobMetadata(String container, String name) {
Blob blob = getBlob(container, name); Blob blob = getBlob(container, name);
if (blob == null) { if (blob == null) {
@ -62,11 +65,13 @@ final class NullBlobStore extends ForwardingBlobStore {
} }
@Override @Override
@Nullable
public Blob getBlob(String container, String name) { public Blob getBlob(String container, String name) {
return getBlob(container, name, GetOptions.NONE); return getBlob(container, name, GetOptions.NONE);
} }
@Override @Override
@Nullable
public Blob getBlob(String container, String name, GetOptions options) { public Blob getBlob(String container, String name, GetOptions options) {
Blob blob = super.getBlob(container, name, options); Blob blob = super.getBlob(container, name, options);
if (blob == null) { if (blob == null) {

Wyświetl plik

@ -46,6 +46,7 @@ import java.util.TreeMap;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.crypto.Mac; import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -212,6 +213,7 @@ public class S3ProxyHandler {
if (authenticationType != AuthenticationType.NONE) { if (authenticationType != AuthenticationType.NONE) {
anonymousIdentity = false; anonymousIdentity = false;
blobStoreLocator = new BlobStoreLocator() { blobStoreLocator = new BlobStoreLocator() {
@Nullable
@Override @Override
public Map.Entry<String, BlobStore> locateBlobStore( public Map.Entry<String, BlobStore> locateBlobStore(
String identityArg, String container, String blob) { String identityArg, String container, String blob) {

Wyświetl plik

@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
@ -1381,6 +1382,7 @@ public final class AwsSdkTest {
private static final class NullX509TrustManager private static final class NullX509TrustManager
implements X509TrustManager { implements X509TrustManager {
@Override @Override
@Nullable
public X509Certificate[] getAcceptedIssuers() { public X509Certificate[] getAcceptedIssuers() {
return null; return null;
} }