commit 9dd44d0813e72d5389809a07e46b72c40292b6e1
author David Pursehouse <dpursehouse@collab.net> Tue Jan 23 11:35:05 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Jan 24 08:17:31 2018 +0900
tree 6c9e9f0c2c730ede501afd8ee1caa48f4dde28cf
parent 0b17b95efc12bc03b9a25607d0a470d49eb90af5

ServletTest#buildJsonRaw: Annotate queryString parameter as @Nullable

The queryString parameter may be null, but dereferencing it is
protected by a call to Strings.isNullOrEmpty.

Change-Id: I2c9a0a7dbd04719b5ad3c64016e585a8409574fe

javatests/com/google/gitiles/BUILD

diff --git a/javatests/com/google/gitiles/BUILD b/javatests/com/google/gitiles/BUILD
index 0bb414b..ee28f2f 100644
--- a/javatests/com/google/gitiles/BUILD
+++ b/javatests/com/google/gitiles/BUILD
@@ -15,6 +15,7 @@
     ) + glob(["**/ServletTest.java"]),
     deps = DEPS + [
         "//java/com/google/gitiles:servlet",
+        "//lib:jsr305",
         "//lib:servlet-api_2_5",
         "//lib:truth",
         "//lib/jgit:junit",

javatests/com/google/gitiles/ServletTest.java

diff --git a/javatests/com/google/gitiles/ServletTest.java b/javatests/com/google/gitiles/ServletTest.java
index 5c1eea1..c642a79 100644
--- a/javatests/com/google/gitiles/ServletTest.java
+++ b/javatests/com/google/gitiles/ServletTest.java
@@ -27,6 +27,7 @@
 import com.google.gson.reflect.TypeToken;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nullable;
 import org.eclipse.jgit.internal.storage.dfs.DfsRepository;
 import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
 import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
@@ -109,7 +110,7 @@
     return res;
   }
 
-  private String buildJsonRaw(String path, String queryString) throws Exception {
+  private String buildJsonRaw(String path, @Nullable String queryString) throws Exception {
     String fmt = "format=JSON";
     queryString = Strings.isNullOrEmpty(queryString) ? fmt : fmt + "&" + queryString;
     FakeHttpServletResponse res = buildResponse(path, queryString, SC_OK);