Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340676 )
Change subject: Hygiene: rename PageService classes to PageClients
......................................................................
Hygiene: rename PageService classes to PageClients
Bug: T156917
Change-Id: Ib239c7c2edb47b0d93dfb93a0d1a3148637291d3
---
R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java
R app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
R app/src/main/java/org/wikipedia/dataclient/page/PageClientFactory.java
R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
M
app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java
M app/src/main/java/org/wikipedia/page/PageDataClient.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
11 files changed, 43 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/76/340676/1
diff --git
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
similarity index 98%
rename from
app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
rename to
app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
index ed53bde..41335a1 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
@@ -4,9 +4,9 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.ServiceError;
import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.page.PageClient;
import org.wikipedia.dataclient.page.PageLead;
import org.wikipedia.dataclient.page.PageRemaining;
-import org.wikipedia.dataclient.page.PageService;
import org.wikipedia.dataclient.page.PageSummary;
import org.wikipedia.dataclient.retrofit.RetrofitException;
import org.wikipedia.settings.RbSwitch;
@@ -24,11 +24,11 @@
/**
* Retrofit web service client for MediaWiki PHP API.
*/
-public class MwPageService implements PageService {
+public class MwPageClient implements PageClient {
private final Service service;
private WikipediaZeroHandler responseHeaderHandler;
- public MwPageService(final WikiSite wiki) {
+ public MwPageClient(final WikiSite wiki) {
responseHeaderHandler =
WikipediaApp.getInstance().getWikipediaZeroHandler();
service = MwPageServiceCache.INSTANCE.getService(wiki);
}
diff --git
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java
index 0e6af71..42e362e 100644
---
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java
+++
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java
@@ -17,7 +17,7 @@
public static final MwPageServiceCache INSTANCE = new MwPageServiceCache();
@Nullable private WikiSite wiki;
- private MwPageService.Service service;
+ private MwPageClient.Service service;
public static Retrofit retrofit(@NonNull WikiSite wiki) {
return RetrofitFactory.newInstance(wiki);
@@ -26,7 +26,7 @@
private MwPageServiceCache() {
}
- public MwPageService.Service getService(WikiSite newWikiSite) {
+ public MwPageClient.Service getService(WikiSite newWikiSite) {
if (!newWikiSite.equals(wiki)) {
service = createService(newWikiSite);
wiki = newWikiSite;
@@ -40,7 +40,7 @@
}
}
- private MwPageService.Service createService(WikiSite wiki) {
- return retrofit(wiki).create(MwPageService.Service.class);
+ private MwPageClient.Service createService(WikiSite wiki) {
+ return retrofit(wiki).create(MwPageClient.Service.class);
}
}
diff --git a/app/src/main/java/org/wikipedia/dataclient/page/PageService.java
b/app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
similarity index 98%
rename from app/src/main/java/org/wikipedia/dataclient/page/PageService.java
rename to app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
index 3a003b2..b6c0b59 100644
--- a/app/src/main/java/org/wikipedia/dataclient/page/PageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
@@ -7,7 +7,7 @@
* Usually we would use direct Retrofit Callbacks here but since we have two
ways of
* getting to the data (MW API and RESTBase) we add this layer of indirection
-- until we drop one.
*/
-public interface PageService {
+public interface PageClient {
/**
* Gets a page summary for a given title -- for link previews
*
diff --git
a/app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java
b/app/src/main/java/org/wikipedia/dataclient/page/PageClientFactory.java
similarity index 63%
rename from
app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java
rename to app/src/main/java/org/wikipedia/dataclient/page/PageClientFactory.java
index 3c7b93f..90d4bd7 100644
--- a/app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/page/PageClientFactory.java
@@ -3,8 +3,8 @@
import android.support.annotation.NonNull;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.dataclient.mwapi.page.MwPageService;
-import org.wikipedia.dataclient.restbase.page.RbPageService;
+import org.wikipedia.dataclient.mwapi.page.MwPageClient;
+import org.wikipedia.dataclient.restbase.page.RbPageClient;
import org.wikipedia.page.Namespace;
import org.wikipedia.settings.RbSwitch;
@@ -13,17 +13,17 @@
* MediaWiki PHP API and the new Nodejs Mobile Content Service hosted in the
RESTBase
* infrastructure.
*/
-public final class PageServiceFactory {
+public final class PageClientFactory {
// TODO: remove the namespace check if and when Parsoid's handling of File
pages is updated
// T135242
- public static PageService create(@NonNull WikiSite wiki, @NonNull
Namespace namespace) {
+ public static PageClient create(@NonNull WikiSite wiki, @NonNull Namespace
namespace) {
if (RbSwitch.INSTANCE.isRestBaseEnabled(wiki) && !namespace.file()) {
- return new RbPageService(wiki);
+ return new RbPageClient(wiki);
} else {
- return new MwPageService(wiki);
+ return new MwPageClient(wiki);
}
}
- private PageServiceFactory() {
+ private PageClientFactory() {
}
}
diff --git
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
similarity index 97%
rename from
app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
rename to
app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
index f380185..cce7c0e 100644
---
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
@@ -8,9 +8,9 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.ServiceError;
import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.page.PageClient;
import org.wikipedia.dataclient.page.PageLead;
import org.wikipedia.dataclient.page.PageRemaining;
-import org.wikipedia.dataclient.page.PageService;
import org.wikipedia.dataclient.page.PageSummary;
import org.wikipedia.dataclient.restbase.RbDefinition;
import org.wikipedia.dataclient.retrofit.RetrofitException;
@@ -31,11 +31,11 @@
/**
* Retrofit web service client for RESTBase Nodejs API.
*/
-public class RbPageService implements PageService {
+public class RbPageClient implements PageClient {
private final Service service;
private WikipediaZeroHandler responseHeaderHandler;
- public RbPageService(final WikiSite wiki) {
+ public RbPageClient(final WikiSite wiki) {
responseHeaderHandler =
WikipediaApp.getInstance().getWikipediaZeroHandler();
service = RbPageServiceCache.INSTANCE.getService(wiki);
}
@@ -140,7 +140,7 @@
throw new IOException(err == null ? rsp.message() : err.getDetails());
}
- /* Not defined in the PageService interface since the Wiktionary
definition endpoint exists only
+ /* Not defined in the PageClient interface since the Wiktionary definition
endpoint exists only
* in the mobile content service, and does not concern the wholesale
retrieval of the contents
* of a wiki page.
*/
diff --git
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java
index d208156..0c4d595 100644
---
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java
+++
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java
@@ -18,7 +18,7 @@
public static final RbPageServiceCache INSTANCE = new RbPageServiceCache();
private WikiSite wiki;
- private RbPageService.Service service;
+ private RbPageClient.Service service;
private Retrofit retrofit;
public static Retrofit retrofit(@NonNull WikiSite wiki) {
@@ -31,7 +31,7 @@
return retrofit;
}
- public RbPageService.Service getService(WikiSite newWikiSite) {
+ public RbPageClient.Service getService(WikiSite newWikiSite) {
if (!newWikiSite.equals(wiki)) {
service = createService(newWikiSite);
wiki = newWikiSite;
@@ -45,9 +45,9 @@
}
}
- private RbPageService.Service createService(WikiSite wiki) {
+ private RbPageClient.Service createService(WikiSite wiki) {
retrofit = retrofit(wiki);
- return retrofit.create(RbPageService.Service.class);
+ return retrofit.create(RbPageClient.Service.class);
}
private RbPageServiceCache() { }
diff --git a/app/src/main/java/org/wikipedia/page/PageDataClient.java
b/app/src/main/java/org/wikipedia/page/PageDataClient.java
index aba12b5..9f94aed 100644
--- a/app/src/main/java/org/wikipedia/page/PageDataClient.java
+++ b/app/src/main/java/org/wikipedia/page/PageDataClient.java
@@ -21,9 +21,9 @@
import org.wikipedia.bridge.CommunicationBridge;
import org.wikipedia.database.contract.PageImageHistoryContract;
import org.wikipedia.dataclient.ServiceError;
+import org.wikipedia.dataclient.page.PageClientFactory;
import org.wikipedia.dataclient.page.PageLead;
import org.wikipedia.dataclient.page.PageRemaining;
-import org.wikipedia.dataclient.page.PageServiceFactory;
import org.wikipedia.edit.EditHandler;
import org.wikipedia.edit.EditSectionActivity;
import org.wikipedia.history.HistoryEntry;
@@ -251,7 +251,7 @@
@VisibleForTesting
protected void loadLeadSection(final int startSequenceNum) {
app.getSessionFunnel().leadSectionFetchStart();
- PageServiceFactory.create(model.getTitle().getWikiSite(),
model.getTitle().namespace())
+ PageClientFactory.create(model.getTitle().getWikiSite(),
model.getTitle().namespace())
.pageLead(model.getTitle().getPrefixedText(),
calculateLeadImageWidth(),
!app.isImageDownloadEnabled(), new PageLead.Callback() {
@Override
@@ -663,7 +663,7 @@
private void loadRemainingSections(final int startSequenceNum) {
app.getSessionFunnel().restSectionsFetchStart();
- PageServiceFactory.create(model.getTitle().getWikiSite(),
model.getTitle().namespace())
+ PageClientFactory.create(model.getTitle().getWikiSite(),
model.getTitle().namespace())
.pageRemaining(model.getTitle().getPrefixedText(),
!app.isImageDownloadEnabled(),
new PageRemaining.Callback() {
@Override
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index 0e63c39..e023a62 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -23,7 +23,7 @@
import org.wikipedia.activity.FragmentUtil;
import org.wikipedia.analytics.GalleryFunnel;
import org.wikipedia.analytics.LinkPreviewFunnel;
-import org.wikipedia.dataclient.page.PageServiceFactory;
+import org.wikipedia.dataclient.page.PageClientFactory;
import org.wikipedia.dataclient.page.PageSummary;
import org.wikipedia.gallery.GalleryActivity;
import org.wikipedia.gallery.GalleryCollection;
@@ -219,7 +219,7 @@
}
private void loadContent() {
- PageServiceFactory.create(pageTitle.getWikiSite(),
pageTitle.namespace()).pageSummary(
+ PageClientFactory.create(pageTitle.getWikiSite(),
pageTitle.namespace()).pageSummary(
pageTitle.getPrefixedText(),
linkPreviewOnLoadCallback);
}
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
index f8ccfde..41f6027 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
@@ -8,8 +8,8 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory;
-import org.wikipedia.dataclient.page.PageService;
-import org.wikipedia.dataclient.page.PageServiceFactory;
+import org.wikipedia.dataclient.page.PageClient;
+import org.wikipedia.dataclient.page.PageClientFactory;
import org.wikipedia.page.Page;
import org.wikipedia.page.PageTitle;
import org.wikipedia.readinglist.page.ReadingListPageRow;
@@ -170,7 +170,7 @@
}
@NonNull
- private PageService getApiService(@NonNull PageTitle title) {
- return PageServiceFactory.create(title.getWikiSite(),
title.namespace());
+ private PageClient getApiService(@NonNull PageTitle title) {
+ return PageClientFactory.create(title.getWikiSite(),
title.namespace());
}
}
diff --git
a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
index f991505..770755b 100644
--- a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
+++ b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
@@ -16,9 +16,9 @@
import org.wikipedia.Constants;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.dataclient.page.PageClient;
+import org.wikipedia.dataclient.page.PageClientFactory;
import org.wikipedia.dataclient.page.PageLead;
-import org.wikipedia.dataclient.page.PageService;
-import org.wikipedia.dataclient.page.PageServiceFactory;
import org.wikipedia.page.PageActivity;
import org.wikipedia.page.PageTitle;
import org.wikipedia.staticdata.MainPageNameData;
@@ -126,8 +126,8 @@
return (int) (res.getDimension(R.dimen.leadImageWidth) /
DimenUtil.getDensityScalar());
}
- private PageService getApiService(PageTitle title) {
- return PageServiceFactory.create(title.getWikiSite(),
title.namespace());
+ private PageClient getApiService(PageTitle title) {
+ return PageClientFactory.create(title.getWikiSite(),
title.namespace());
}
private interface Callback {
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
index 03b7745..8e42c54 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
@@ -16,11 +16,11 @@
import org.wikipedia.activity.FragmentUtil;
import org.wikipedia.analytics.WiktionaryDialogFunnel;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.dataclient.page.PageService;
-import org.wikipedia.dataclient.page.PageServiceFactory;
+import org.wikipedia.dataclient.page.PageClient;
+import org.wikipedia.dataclient.page.PageClientFactory;
import org.wikipedia.dataclient.restbase.RbDefinition;
-import org.wikipedia.dataclient.restbase.page.RbPageService;
-import org.wikipedia.dataclient.restbase.page.RbPageService.DefinitionCallback;
+import org.wikipedia.dataclient.restbase.page.RbPageClient;
+import org.wikipedia.dataclient.restbase.page.RbPageClient.DefinitionCallback;
import org.wikipedia.page.ExtendedBottomSheetDialogFragment;
import org.wikipedia.page.LinkMovementMethodExt;
import org.wikipedia.page.Namespace;
@@ -108,9 +108,9 @@
// TODO: centralize the Wiktionary domain better. Maybe a
SharedPreference that defaults to
// https://wiktionary.org.
- PageService pageService = PageServiceFactory.create(new
WikiSite(pageTitle.getWikiSite().languageCode() + WIKTIONARY_DOMAIN),
Namespace.MAIN);
- if (pageService instanceof RbPageService) {
- ((RbPageService) pageService).define(
+ PageClient pageClient = PageClientFactory.create(new
WikiSite(pageTitle.getWikiSite().languageCode() + WIKTIONARY_DOMAIN),
Namespace.MAIN);
+ if (pageClient instanceof RbPageClient) {
+ ((RbPageClient) pageClient).define(
addUnderscores(selectedText),
definitionOnLoadCallback);
} else {
--
To view, visit https://gerrit.wikimedia.org/r/340676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib239c7c2edb47b0d93dfb93a0d1a3148637291d3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
