Merge pull request #6366 from spacecowboy/3.0-findbugsannotations

Turn on findbugs and add annotation support
neo4j · Feb 12, 2016 · 66d1ea9 · 66d1ea9
2 parents f565c9d + dd77f78
commit 66d1ea9
Show file tree

Hide file tree

Showing 118 changed files with 20,682 additions and 253 deletions.
diff --git a/community/bolt/LICENSES.txt b/community/bolt/LICENSES.txt
diff --git a/community/bolt/NOTICE.txt b/community/bolt/NOTICE.txt
@@ -28,6 +28,7 @@ Third-party licenses
 Apache Software License, Version 2.0
   Apache Commons Lang
   ConcurrentLinkedHashMap
+  FindBugs-jsr305
   Lucene Common Analyzers
   Lucene Core
   Lucene Memory
@@ -48,3 +49,6 @@ Bouncy Castle License
   Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
   Bouncy Castle Provider
 
+GNU Lesser General Public License, Version 2.1
+  FindBugs-Annotations
+
diff --git a/community/collections/LICENSES.txt b/community/collections/LICENSES.txt
diff --git a/community/collections/NOTICE.txt b/community/collections/NOTICE.txt
@@ -25,3 +25,9 @@ Full license texts are found in LICENSES.txt.
 Third-party licenses
 --------------------
 
+Apache Software License, Version 2.0
+  FindBugs-jsr305
+
+GNU Lesser General Public License, Version 2.1
+  FindBugs-Annotations
+
diff --git a/community/consistency-check-legacy/LICENSES.txt b/community/consistency-check-legacy/LICENSES.txt
diff --git a/community/consistency-check-legacy/NOTICE.txt b/community/consistency-check-legacy/NOTICE.txt
@@ -27,8 +27,12 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
+  FindBugs-jsr305
   Lucene Common Analyzers
   Lucene Core
   Lucene Memory
   Lucene QueryParsers
 
+GNU Lesser General Public License, Version 2.1
+  FindBugs-Annotations
+
diff --git a/...istency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyReportLog.java b/...istency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyReportLog.java
@@ -22,6 +22,7 @@
 import java.io.PrintWriter;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import javax.annotation.Nonnull;
 
 import org.neo4j.function.Suppliers;
 import org.neo4j.logging.AbstractLog;
@@ -57,32 +58,36 @@ public boolean isDebugEnabled()
         return false;
     }
 
+    @Nonnull
     @Override
     public Logger debugLogger()
     {
         return NullLogger.getInstance();
     }
 
+    @Nonnull
     @Override
     public Logger infoLogger()
     {
         return infoLogger;
     }
 
+    @Nonnull
     @Override
     public Logger warnLogger()
     {
         return warnLogger;
     }
 
+    @Nonnull
     @Override
     public Logger errorLogger()
     {
         return errorLogger;
     }
 
     @Override
-    public void bulk( Consumer<Log> consumer )
+    public void bulk( @Nonnull Consumer<Log> consumer )
     {
         PrintWriter writer;
         synchronized (this)

diff --git a/...ency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyReportLogger.java b/...ency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyReportLogger.java
@@ -21,6 +21,7 @@
 
 import java.io.PrintWriter;
 import java.util.function.Supplier;
+import javax.annotation.Nonnull;
 
 import org.neo4j.function.Suppliers;
 import org.neo4j.logging.AbstractPrintWriterLogger;
@@ -30,14 +31,15 @@ public class ConsistencyReportLogger extends AbstractPrintWriterLogger
 {
     private final String prefix;
 
-    public ConsistencyReportLogger( Supplier<PrintWriter> writerSupplier, Object lock, String prefix, boolean autoFlush )
+    public ConsistencyReportLogger( @Nonnull Supplier<PrintWriter> writerSupplier, @Nonnull Object lock,
+            @Nonnull String prefix, boolean autoFlush )
     {
         super( writerSupplier, lock, autoFlush );
         this.prefix = prefix;
     }
 
     @Override
-    protected void writeLog( PrintWriter out, String message )
+    protected void writeLog( @Nonnull PrintWriter out, @Nonnull String message )
     {
         out.write( prefix );
         out.write( ": " );
@@ -46,7 +48,7 @@ protected void writeLog( PrintWriter out, String message )
     }
 
     @Override
-    protected void writeLog( PrintWriter out, String message, Throwable throwable )
+    protected void writeLog( @Nonnull PrintWriter out, @Nonnull String message, @Nonnull Throwable throwable )
     {
         out.write( prefix );
         out.write( ": " );
@@ -58,7 +60,7 @@ protected void writeLog( PrintWriter out, String message, Throwable throwable )
     }
 
     @Override
-    protected Logger getBulkLogger( PrintWriter out, Object lock )
+    protected Logger getBulkLogger( @Nonnull PrintWriter out, @Nonnull Object lock )
     {
         return new ConsistencyReportLogger( Suppliers.singleton( out ), lock, prefix, false );
     }