1 files changed, 3 insertions, 12 deletions
diff --git a/android/arch/persistence/room/RoomDatabase.java b/android/arch/persistence/room/RoomDatabase.java
index 8c940246..cdad868d 100644
--- a/android/arch/persistence/room/RoomDatabase.java
+++ b/android/arch/persistence/room/RoomDatabase.java
@@ -49,7 +49,7 @@ import java.util.concurrent.locks.ReentrantLock;
  *
  * @see Database
  */
-//@SuppressWarnings({"unused", "WeakerAccess"})
+@SuppressWarnings({"unused", "WeakerAccess"})
 public abstract class RoomDatabase {
     private static final String DB_IMPL_SUFFIX = "_Impl";
     // set by the generated open helper.
@@ -153,9 +153,7 @@ public abstract class RoomDatabase {
      *
      * @hide
      */
-    @SuppressWarnings("WeakerAccess")
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    // used in generated code
     public void assertNotMainThread() {
         if (mAllowMainThreadQueries) {
             return;
@@ -300,7 +298,6 @@ public abstract class RoomDatabase {
      * @return True if there is an active transaction in current thread, false otherwise.
      * @see SupportSQLiteDatabase#inTransaction()
      */
-    @SuppressWarnings("WeakerAccess")
     public boolean inTransaction() {
         return mOpenHelper.getWritableDatabase().inTransaction();
     }
@@ -310,6 +307,7 @@ public abstract class RoomDatabase {
      *
      * @param <T> The type of the abstract database class.
      */
+    @SuppressWarnings("unused")
     public static class Builder<T extends RoomDatabase> {
         private final Class<T> mDatabaseClass;
         private final String mName;
@@ -339,8 +337,7 @@ public abstract class RoomDatabase {
          * @param factory The factory to use to access the database.
          * @return this
          */
-        @NonNull
-        public Builder<T> openHelperFactory(@Nullable SupportSQLiteOpenHelper.Factory factory) {
+        public Builder<T> openHelperFactory(SupportSQLiteOpenHelper.Factory factory) {
             mFactory = factory;
             return this;
         }
@@ -364,7 +361,6 @@ public abstract class RoomDatabase {
          *                   changes.
          * @return this
          */
-        @NonNull
         public Builder<T> addMigrations(Migration... migrations) {
             mMigrationContainer.addMigrations(migrations);
             return this;
@@ -382,7 +378,6 @@ public abstract class RoomDatabase {
          *
          * @return this
          */
-        @NonNull
         public Builder<T> allowMainThreadQueries() {
             mAllowMainThreadQueries = true;
             return this;
@@ -405,7 +400,6 @@ public abstract class RoomDatabase {
          *
          * @return this
          */
-        @NonNull
         public Builder<T> fallbackToDestructiveMigration() {
             mRequireMigration = false;
             return this;
@@ -417,7 +411,6 @@ public abstract class RoomDatabase {
          * @param callback The callback.
          * @return this
          */
-        @NonNull
         public Builder<T> addCallback(@NonNull Callback callback) {
             if (mCallbacks == null) {
                 mCallbacks = new ArrayList<>();
@@ -434,7 +427,6 @@ public abstract class RoomDatabase {
          *
          * @return A new database instance.
          */
-        @NonNull
         public T build() {
             //noinspection ConstantConditions
             if (mContext == null) {
@@ -501,7 +493,6 @@ public abstract class RoomDatabase {
          * @return An ordered list of {@link Migration} objects that should be run to migrate
          * between the given versions. If a migration path cannot be found, returns {@code null}.
          */
-        @SuppressWarnings("WeakerAccess")
         @Nullable
         public List<Migration> findMigrationPath(int start, int end) {
             if (start == end) {