Add Nullable annotations.

build.gradle

@@ -30,5 +30,7 @@ ext.libraries = [
   butterknife: 'com.jakewharton:butterknife:8.4.0',
   butterknifeCompiler: 'com.jakewharton:butterknife-compiler:8.4.0',
 
-  guava: 'com.google.guava:guava:19.0'
+  guava: 'com.google.guava:guava:19.0',
+
+  jsr305: 'com.google.code.findbugs:jsr305:3.0.2'
 ]

schematic/build.gradle

@@ -13,6 +13,7 @@ buildscript {
 
 dependencies {
   compile project(':schematic-annotations')
+  provided parent.libraries.jsr305
 }
 
 android {

schematic/src/main/java/net/simonvt/schematic/Cursors.java

@@ -17,17 +17,18 @@
 package net.simonvt.schematic;
 
 import android.database.Cursor;
+import javax.annotation.Nullable;
 
 public final class Cursors {
 
   private Cursors() {
   }
 
-  public static String getString(Cursor cursor, String column) {
+  public static @Nullable String getString(Cursor cursor, String column) {
     return cursor.getString(cursor.getColumnIndexOrThrow(column));
   }
 
-  public static String getStringOrNull(Cursor cursor, String column) {
+  public static @Nullable String getStringOrNull(Cursor cursor, String column) {
     int index = cursor.getColumnIndexOrThrow(column);
     if (cursor.isNull(index)) {
       return null;
@@ -40,7 +41,7 @@ public static int getInt(Cursor cursor, String column) {
     return cursor.getInt(cursor.getColumnIndexOrThrow(column));
   }
 
-  public static Integer getIntOrNull(Cursor cursor, String column) {
+  public static @Nullable Integer getIntOrNull(Cursor cursor, String column) {
     int index = cursor.getColumnIndexOrThrow(column);
     if (cursor.isNull(index)) {
       return null;
@@ -53,7 +54,7 @@ public static long getLong(Cursor cursor, String column) {
     return cursor.getLong(cursor.getColumnIndexOrThrow(column));
   }
 
-  public static Long getLongOrNull(Cursor cursor, String column) {
+  public static @Nullable Long getLongOrNull(Cursor cursor, String column) {
     int index = cursor.getColumnIndexOrThrow(column);
     if (cursor.isNull(index)) {
       return null;
@@ -66,7 +67,7 @@ public static float getFloat(Cursor cursor, String column) {
     return cursor.getFloat(cursor.getColumnIndexOrThrow(column));
   }
 
-  public static Float getFloatOrNull(Cursor cursor, String column) {
+  public static @Nullable Float getFloatOrNull(Cursor cursor, String column) {
     int index = cursor.getColumnIndexOrThrow(column);
     if (cursor.isNull(index)) {
       return null;
@@ -79,7 +80,7 @@ public static double getDouble(Cursor cursor, String column) {
     return cursor.getDouble(cursor.getColumnIndexOrThrow(column));
   }
 
-  public static Double getDoubleOrNull(Cursor cursor, String column) {
+  public static @Nullable Double getDoubleOrNull(Cursor cursor, String column) {
     int index = cursor.getColumnIndexOrThrow(column);
     if (cursor.isNull(index)) {
       return null;

schematic/src/main/java/net/simonvt/schematic/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package net.simonvt.schematic;

schematic/src/main/java/net/simonvt/schematic/utils/SelectionBuilder.java

@@ -31,6 +31,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import javax.annotation.Nullable;
 
 /**
  * Helper for building selection clauses for {@link SQLiteDatabase}. Each
@@ -59,7 +60,7 @@ public SelectionBuilder reset() {
    * Append the given selection clause to the internal state. Each clause is
    * surrounded with parenthesis and combined using {@code AND}.
    */
-  public SelectionBuilder where(String selection, String... selectionArgs) {
+  public SelectionBuilder where(String selection, @Nullable String... selectionArgs) {
     if (TextUtils.isEmpty(selection)) {
       if (selectionArgs != null && selectionArgs.length > 0) {
         throw new IllegalArgumentException("Valid selection required when including arguments=");
@@ -147,8 +148,8 @@ public Cursor query(SQLiteDatabase db, String[] columns, String orderBy) {
   }
 
   /** Execute query using the current internal state as {@code WHERE} clause. */
-  public Cursor query(SQLiteDatabase db, String[] columns, String groupBy, String having,
-      String orderBy, String limit) {
+  public Cursor query(SQLiteDatabase db, @Nullable String[] columns, @Nullable String groupBy,
+      @Nullable String having, @Nullable String orderBy, @Nullable String limit) {
     assertTable();
     if (columns != null) mapColumns(columns);
     if (LOGV) Log.v(TAG, "query(columns=" + Arrays.toString(columns) + ") " + this);

schematic/src/main/java/net/simonvt/schematic/utils/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package net.simonvt.schematic.utils;