Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268323
Change subject: Hygiene: update database and JSON Java packaging
......................................................................
Hygiene: update database and JSON Java packaging
No functional changes.
• Move Database, DatabaseTable, DatabaseClient, and
SQLiteContentProvider from org.wikipedia.data to
org.wikipedia.database.
• Move GsonMarshaller, GsonUnmarshaller, GsonUtil,
SessionUnmarshaller, and TabUnmarshaller from org.wikipedia.data to
org.wikipedia.json.
Change-Id: I1e3e10d742bda36e70a31877ee5c07d3d2b6823b
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
R app/src/main/java/org/wikipedia/database/Database.java
R app/src/main/java/org/wikipedia/database/DatabaseClient.java
R app/src/main/java/org/wikipedia/database/DatabaseTable.java
R app/src/main/java/org/wikipedia/database/SQLiteContentProvider.java
M
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
M
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
M app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
M app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
M app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
R app/src/main/java/org/wikipedia/json/GsonMarshaller.java
R app/src/main/java/org/wikipedia/json/GsonUnmarshaller.java
R app/src/main/java/org/wikipedia/json/GsonUtil.java
R app/src/main/java/org/wikipedia/json/SessionUnmarshaller.java
R app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
M app/src/main/java/org/wikipedia/page/Section.java
M app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
M app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
M app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
M app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
M app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
25 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/23/268323/1
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index e6030b8..05339bd 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -22,8 +22,8 @@
import org.wikipedia.analytics.SessionFunnel;
import org.wikipedia.crash.CrashReporter;
import org.wikipedia.crash.hockeyapp.HockeyAppCrashReporter;
-import org.wikipedia.data.DatabaseClient;
-import org.wikipedia.data.Database;
+import org.wikipedia.database.DatabaseClient;
+import org.wikipedia.database.Database;
import org.wikipedia.drawable.DrawableUtil;
import org.wikipedia.editing.EditTokenStorage;
import org.wikipedia.editing.summaries.EditSummary;
diff --git a/app/src/main/java/org/wikipedia/data/Database.java
b/app/src/main/java/org/wikipedia/database/Database.java
similarity index 97%
rename from app/src/main/java/org/wikipedia/data/Database.java
rename to app/src/main/java/org/wikipedia/database/Database.java
index 9e0a5e2..234536c 100644
--- a/app/src/main/java/org/wikipedia/data/Database.java
+++ b/app/src/main/java/org/wikipedia/database/Database.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/org/wikipedia/data/DatabaseClient.java
b/app/src/main/java/org/wikipedia/database/DatabaseClient.java
similarity index 98%
rename from app/src/main/java/org/wikipedia/data/DatabaseClient.java
rename to app/src/main/java/org/wikipedia/database/DatabaseClient.java
index 82f85d3..c2bcd5e 100644
--- a/app/src/main/java/org/wikipedia/data/DatabaseClient.java
+++ b/app/src/main/java/org/wikipedia/database/DatabaseClient.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
import android.content.ContentProviderClient;
import android.content.Context;
diff --git a/app/src/main/java/org/wikipedia/data/DatabaseTable.java
b/app/src/main/java/org/wikipedia/database/DatabaseTable.java
similarity index 99%
rename from app/src/main/java/org/wikipedia/data/DatabaseTable.java
rename to app/src/main/java/org/wikipedia/database/DatabaseTable.java
index 92fb897..1736bee 100644
--- a/app/src/main/java/org/wikipedia/data/DatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/database/DatabaseTable.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
import android.content.ContentProviderClient;
import android.content.ContentValues;
diff --git a/app/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
b/app/src/main/java/org/wikipedia/database/SQLiteContentProvider.java
similarity index 99%
rename from app/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
rename to app/src/main/java/org/wikipedia/database/SQLiteContentProvider.java
index b43cf4f..13b28c2 100644
--- a/app/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
+++ b/app/src/main/java/org/wikipedia/database/SQLiteContentProvider.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
import android.content.ContentProvider;
import android.content.ContentResolver;
diff --git
a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
index facfc14..c14ac83 100644
---
a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
+++
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
@@ -1,6 +1,6 @@
package org.wikipedia.editing.summaries;
-import org.wikipedia.data.SQLiteContentProvider;
+import org.wikipedia.database.SQLiteContentProvider;
public class EditSummaryContentProvider extends
SQLiteContentProvider<EditSummary> {
public EditSummaryContentProvider() {
diff --git
a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
index 86d9c5d..8df7cc7 100644
---
a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
+++
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
@@ -4,7 +4,7 @@
import android.database.Cursor;
import android.support.annotation.NonNull;
-import org.wikipedia.data.DatabaseTable;
+import org.wikipedia.database.DatabaseTable;
import java.util.Date;
diff --git
a/app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
b/app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
index 254a9dd..0f25e2b 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
@@ -6,7 +6,7 @@
import android.net.Uri;
import android.support.annotation.NonNull;
-import org.wikipedia.data.SQLiteContentProvider;
+import org.wikipedia.database.SQLiteContentProvider;
import org.wikipedia.pageimages.PageImage;
public class HistoryEntryContentProvider extends
SQLiteContentProvider<HistoryEntry> {
diff --git
a/app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
b/app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
index 3fbb916..ea99e70 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
@@ -10,7 +10,7 @@
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
-import org.wikipedia.data.DatabaseTable;
+import org.wikipedia.database.DatabaseTable;
import java.util.Date;
diff --git a/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
b/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
index 8e9bfe6..8db0c97 100644
--- a/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
+++ b/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
@@ -2,7 +2,7 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
-import org.wikipedia.data.DatabaseClient;
+import org.wikipedia.database.DatabaseClient;
import android.util.Log;
diff --git a/app/src/main/java/org/wikipedia/data/GsonMarshaller.java
b/app/src/main/java/org/wikipedia/json/GsonMarshaller.java
similarity index 93%
rename from app/src/main/java/org/wikipedia/data/GsonMarshaller.java
rename to app/src/main/java/org/wikipedia/json/GsonMarshaller.java
index 4d4858d..a6bb2b8 100644
--- a/app/src/main/java/org/wikipedia/data/GsonMarshaller.java
+++ b/app/src/main/java/org/wikipedia/json/GsonMarshaller.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.json;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
diff --git a/app/src/main/java/org/wikipedia/data/GsonUnmarshaller.java
b/app/src/main/java/org/wikipedia/json/GsonUnmarshaller.java
similarity index 97%
rename from app/src/main/java/org/wikipedia/data/GsonUnmarshaller.java
rename to app/src/main/java/org/wikipedia/json/GsonUnmarshaller.java
index 468f9eb..a6599f4 100644
--- a/app/src/main/java/org/wikipedia/data/GsonUnmarshaller.java
+++ b/app/src/main/java/org/wikipedia/json/GsonUnmarshaller.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.json;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
diff --git a/app/src/main/java/org/wikipedia/data/GsonUtil.java
b/app/src/main/java/org/wikipedia/json/GsonUtil.java
similarity index 92%
rename from app/src/main/java/org/wikipedia/data/GsonUtil.java
rename to app/src/main/java/org/wikipedia/json/GsonUtil.java
index 9ffc5cc..6d32a9e 100644
--- a/app/src/main/java/org/wikipedia/data/GsonUtil.java
+++ b/app/src/main/java/org/wikipedia/json/GsonUtil.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.json;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/app/src/main/java/org/wikipedia/data/SessionUnmarshaller.java
b/app/src/main/java/org/wikipedia/json/SessionUnmarshaller.java
similarity index 96%
rename from app/src/main/java/org/wikipedia/data/SessionUnmarshaller.java
rename to app/src/main/java/org/wikipedia/json/SessionUnmarshaller.java
index e50b349..0f5c007 100644
--- a/app/src/main/java/org/wikipedia/data/SessionUnmarshaller.java
+++ b/app/src/main/java/org/wikipedia/json/SessionUnmarshaller.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.json;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
diff --git a/app/src/main/java/org/wikipedia/data/TabUnmarshaller.java
b/app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
similarity index 97%
rename from app/src/main/java/org/wikipedia/data/TabUnmarshaller.java
rename to app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
index e0fe55e..f73aa61 100644
--- a/app/src/main/java/org/wikipedia/data/TabUnmarshaller.java
+++ b/app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.json;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
diff --git a/app/src/main/java/org/wikipedia/page/Section.java
b/app/src/main/java/org/wikipedia/page/Section.java
index 7290a6f..24fb092 100644
--- a/app/src/main/java/org/wikipedia/page/Section.java
+++ b/app/src/main/java/org/wikipedia/page/Section.java
@@ -2,7 +2,7 @@
import android.support.annotation.NonNull;
-import org.wikipedia.data.GsonUtil;
+import org.wikipedia.json.GsonUtil;
import org.json.JSONException;
import org.json.JSONObject;
diff --git
a/app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
b/app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
index 6e82183..b18293e 100644
--- a/app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
+++ b/app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
@@ -1,6 +1,6 @@
package org.wikipedia.pageimages;
-import org.wikipedia.data.SQLiteContentProvider;
+import org.wikipedia.database.SQLiteContentProvider;
public class PageImageContentProvider extends SQLiteContentProvider<PageImage>
{
public PageImageContentProvider() {
diff --git
a/app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
b/app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
index c00b41e..3f89f61 100644
--- a/app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
@@ -9,7 +9,7 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
-import org.wikipedia.data.DatabaseTable;
+import org.wikipedia.database.DatabaseTable;
public class PageImageDatabaseTable extends DatabaseTable<PageImage> {
diff --git
a/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
b/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
index 6a4d584..4cf3b70 100644
--- a/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
+++ b/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
@@ -4,7 +4,7 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
-import org.wikipedia.data.DatabaseClient;
+import org.wikipedia.database.DatabaseClient;
public class DeleteSavedPageTask extends SaneAsyncTask<Boolean> {
private final WikipediaApp app;
diff --git a/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
b/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
index 5e8695b..817d694 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
@@ -1,6 +1,6 @@
package org.wikipedia.savedpages;
-import org.wikipedia.data.DatabaseClient;
+import org.wikipedia.database.DatabaseClient;
import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
index 58ee882..683725e 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
@@ -6,7 +6,7 @@
import android.net.Uri;
import android.support.annotation.NonNull;
-import org.wikipedia.data.SQLiteContentProvider;
+import org.wikipedia.database.SQLiteContentProvider;
import org.wikipedia.pageimages.PageImage;
public class SavedPageContentProvider extends SQLiteContentProvider<SavedPage>
{
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
index d842752..9a27358 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
@@ -12,7 +12,7 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
-import org.wikipedia.data.DatabaseTable;
+import org.wikipedia.database.DatabaseTable;
import org.wikipedia.util.StringUtil;
import java.io.File;
diff --git
a/app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
b/app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
index 33718a2..dd09705 100644
--- a/app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
+++ b/app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
@@ -1,6 +1,6 @@
package org.wikipedia.search;
-import org.wikipedia.data.SQLiteContentProvider;
+import org.wikipedia.database.SQLiteContentProvider;
public class RecentSearchContentProvider extends
SQLiteContentProvider<RecentSearch> {
public RecentSearchContentProvider() {
diff --git
a/app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
b/app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
index 8a24334..0243fa0 100644
--- a/app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
@@ -1,6 +1,6 @@
package org.wikipedia.search;
-import org.wikipedia.data.DatabaseTable;
+import org.wikipedia.database.DatabaseTable;
import android.content.ContentProviderClient;
import android.content.ContentValues;
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 2a6f395..a286106 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -8,9 +8,9 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.analytics.SessionData;
import org.wikipedia.analytics.SessionFunnel;
-import org.wikipedia.data.GsonMarshaller;
-import org.wikipedia.data.SessionUnmarshaller;
-import org.wikipedia.data.TabUnmarshaller;
+import org.wikipedia.json.GsonMarshaller;
+import org.wikipedia.json.SessionUnmarshaller;
+import org.wikipedia.json.TabUnmarshaller;
import org.wikipedia.page.tabs.Tab;
import org.wikipedia.theme.Theme;
import org.wikipedia.util.StringUtil;
--
To view, visit https://gerrit.wikimedia.org/r/268323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e3e10d742bda36e70a31877ee5c07d3d2b6823b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
