Remove findbugs annotations from code and build path.

- jsr305 is needed by guava, which declares it as optional dep.
- Remaining modules with annotations do not affect the container.

6 files changed, 8 insertions, 17 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java
index cde43881249..e5e7ae1ef56 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java
@@ -3,7 +3,6 @@ package com.yahoo.jdisc.http.filter;
 
 import com.yahoo.jdisc.http.HttpRequest.Method;
 
-import javax.annotation.Nonnull;
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
@@ -28,7 +27,6 @@ public interface RequestView {
      * Returns an immutable view of all values of a named header field.
      * Returns an empty list if no such header is present.
      */
-    @Nonnull
     List<String> getHeaders(String name);
 
     /**
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
index 8207a67cfdd..cbed273b7ee 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
@@ -9,7 +9,6 @@ import com.yahoo.jdisc.http.servlet.ServletRequest;
 import com.yahoo.jdisc.http.servlet.ServletResponse;
 import com.yahoo.jdisc.http.server.jetty.FilterInvoker;
 
-import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URI;
@@ -85,8 +84,7 @@ public class SecurityFilterInvoker implements FilterInvoker {
             return request.getAttribute(name);
         }
 
-
-        @Nonnull @Override
+        @Override
         public List<String> getHeaders(String name) {
             return Collections.unmodifiableList(Collections.list(request.getHeaders(name)));
         }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
index 877eb78346a..d45b406a375 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
@@ -14,8 +14,6 @@ import com.yahoo.jdisc.Response;
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.http.HttpResponse;
 
-import javax.annotation.Nonnull;
-
 /**
  * Implementation of TypedFilterChain for DiscFilterResponse
  * @author tejalk
@@ -77,7 +75,7 @@ public class SecurityResponseFilterChain extends AbstractResource implements Res
             return request.context().get(name);
         }
 
-        @Nonnull @Override
+        @Override
         public List<String> getHeaders(String name) {
             List<String> headers = request.headers().get(name);
             return headers == null ? Collections.emptyList() : Collections.unmodifiableList(headers);
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
index eb7174e2f0f..a764c75f766 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
@@ -3,7 +3,6 @@ package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.handler.CompletionHandler;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.WriteListener;
 import java.io.IOException;
@@ -50,14 +49,14 @@ public class ServletOutputStreamWriter {
 
     private final Object monitor = new Object();
 
-    @GuardedBy("monitor")
+    // GuardedBy("monitor")
     private State state = State.NOT_STARTED;
 
-    @GuardedBy("state")
+    // GuardedBy("state")
     private final ServletOutputStream outputStream;
     private final Executor executor;
 
-    @GuardedBy("monitor")
+    // GuardedBy("monitor")
     private final Deque<ResponseContentPart> responseContentQueue = new ArrayDeque<>();
 
     private final MetricReporter metricReporter;
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
index a80f5bb3c14..9314247b83b 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
@@ -5,7 +5,6 @@ import com.google.common.base.Preconditions;
 import com.yahoo.jdisc.handler.CompletionHandler;
 import com.yahoo.jdisc.handler.ContentChannel;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import java.io.IOException;
@@ -59,7 +58,7 @@ class ServletRequestReader implements ReadListener {
      *    called from a user (request handler) owned thread
      *    (i.e. when being called from user code, don't call back into user code.)
      */
-    @GuardedBy("monitor")
+    // GuardedBy("monitor")
     private State state = State.READING;
 
     /**
@@ -73,7 +72,7 @@ class ServletRequestReader implements ReadListener {
      * - complete the finished future non-exceptionally,
      *   since then we would not be able to report writeCompletionHandler.failed(exception) calls
      */
-    @GuardedBy("monitor")
+    // GuardedBy("monitor")
     private int numberOfOutstandingUserCalls = 0;
 
     /**
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
index 846850b6244..0188e7c2f09 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
@@ -11,7 +11,6 @@ import com.yahoo.jdisc.http.HttpResponse;
 import com.yahoo.jdisc.service.BindingSetNotFoundException;
 import org.eclipse.jetty.http.MimeTypes;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -52,7 +51,7 @@ public class ServletResponseController {
     //all calls to the servletOutputStreamWriter must hold the monitor first to ensure visibility of servletResponse changes.
     private final ServletOutputStreamWriter servletOutputStreamWriter;
 
-    @GuardedBy("monitor")
+    // GuardedBy("monitor")
     private boolean responseCommitted = false;
 
     public ServletResponseController(