jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: add @NonNull annotations to derivations
......................................................................
Hygiene: add @NonNull annotations to derivations
Infer @NonNull annotations from super classes and usage.
Change-Id: I5258e2654ef679c10e504abe1118c1913df1e62f
---
M
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryPersistenceHelper.java
M app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
M app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
M app/src/main/java/org/wikipedia/search/RecentSearchPersistenceHelper.java
4 files changed, 15 insertions(+), 8 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryPersistenceHelper.java
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryPersistenceHelper.java
index 6e50253..7961985 100644
---
a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryPersistenceHelper.java
+++
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryPersistenceHelper.java
@@ -2,6 +2,8 @@
import android.content.ContentValues;
import android.database.Cursor;
+import android.support.annotation.NonNull;
+
import org.wikipedia.data.PersistenceHelper;
import java.util.Date;
@@ -57,12 +59,12 @@
}
@Override
- protected String getPrimaryKeySelection(EditSummary obj, String[]
selectionArgs) {
+ protected String getPrimaryKeySelection(@NonNull EditSummary obj, String[]
selectionArgs) {
return super.getPrimaryKeySelection(obj, SELECTION_KEYS);
}
@Override
- protected String[] getUnfilteredPrimaryKeySelectionArgs(EditSummary obj) {
+ protected String[] getUnfilteredPrimaryKeySelectionArgs(@NonNull
EditSummary obj) {
return new String[] {
obj.getSummary()
};
diff --git
a/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
b/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
index c413b51..03abeea 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
@@ -4,6 +4,8 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
+import android.support.annotation.NonNull;
+
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.data.PersistenceHelper;
@@ -73,12 +75,12 @@
}
@Override
- protected String getPrimaryKeySelection(HistoryEntry obj, String[]
selectionArgs) {
+ protected String getPrimaryKeySelection(@NonNull HistoryEntry obj,
String[] selectionArgs) {
return super.getPrimaryKeySelection(obj, SELECTION_KEYS);
}
@Override
- protected String[] getUnfilteredPrimaryKeySelectionArgs(HistoryEntry obj) {
+ protected String[] getUnfilteredPrimaryKeySelectionArgs(@NonNull
HistoryEntry obj) {
return new String[] {
obj.getTitle().getSite().getDomain(),
obj.getTitle().getNamespace(),
diff --git
a/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
b/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
index 4639ca0..96db4c3 100644
--- a/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
+++ b/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
@@ -4,6 +4,7 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
+import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.PageTitle;
@@ -91,12 +92,12 @@
}
@Override
- protected String getPrimaryKeySelection(PageImage obj, String[]
selectionArgs) {
+ protected String getPrimaryKeySelection(@NonNull PageImage obj, String[]
selectionArgs) {
return super.getPrimaryKeySelection(obj, SELECTION_KEYS);
}
@Override
- protected String[] getUnfilteredPrimaryKeySelectionArgs(PageImage obj) {
+ protected String[] getUnfilteredPrimaryKeySelectionArgs(@NonNull PageImage
obj) {
return new String[] {
obj.getTitle().getSite().getDomain(),
obj.getTitle().getNamespace(),
diff --git
a/app/src/main/java/org/wikipedia/search/RecentSearchPersistenceHelper.java
b/app/src/main/java/org/wikipedia/search/RecentSearchPersistenceHelper.java
index 91d6762..224e92d 100644
--- a/app/src/main/java/org/wikipedia/search/RecentSearchPersistenceHelper.java
+++ b/app/src/main/java/org/wikipedia/search/RecentSearchPersistenceHelper.java
@@ -4,6 +4,8 @@
import android.content.ContentValues;
import android.database.Cursor;
+import android.support.annotation.NonNull;
+
import java.util.Date;
public class RecentSearchPersistenceHelper extends
PersistenceHelper<RecentSearch> {
@@ -57,12 +59,12 @@
}
@Override
- protected String getPrimaryKeySelection(RecentSearch obj, String[]
selectionArgs) {
+ protected String getPrimaryKeySelection(@NonNull RecentSearch obj,
String[] selectionArgs) {
return super.getPrimaryKeySelection(obj, SELECTION_KEYS);
}
@Override
- protected String[] getUnfilteredPrimaryKeySelectionArgs(RecentSearch obj) {
+ protected String[] getUnfilteredPrimaryKeySelectionArgs(@NonNull
RecentSearch obj) {
return new String[] {
obj.getText(),
};
--
To view, visit https://gerrit.wikimedia.org/r/262910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5258e2654ef679c10e504abe1118c1913df1e62f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
