jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Rename Restbase server classes to match MW API server
classes
......................................................................
Hygiene: Rename Restbase server classes to match MW API server classes
While writing the Wiktionary definition endpoint I had the idea that a
definition for our purposes was notionally separate from a page, and so
I renamed these. But this doesn't reflect the endpoint structure (which
still contains /page/) and ruins the correspondence with the MW API server
classes. So it's better to change them back.
Change-Id: Icc848f4fddc56b400efdf7214bd058d574836bda
---
M app/src/main/java/org/wikipedia/server/ContentServiceFactory.java
R app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
R app/src/main/java/org/wikipedia/server/restbase/RbPageService.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
4 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/server/ContentServiceFactory.java
b/app/src/main/java/org/wikipedia/server/ContentServiceFactory.java
index 29874be..eb12d8d 100644
--- a/app/src/main/java/org/wikipedia/server/ContentServiceFactory.java
+++ b/app/src/main/java/org/wikipedia/server/ContentServiceFactory.java
@@ -2,7 +2,7 @@
import org.wikipedia.Site;
import org.wikipedia.server.mwapi.MwPageService;
-import org.wikipedia.server.restbase.RbContentService;
+import org.wikipedia.server.restbase.RbPageService;
import org.wikipedia.settings.RbSwitch;
/**
@@ -13,7 +13,7 @@
public final class ContentServiceFactory {
public static PageService create(Site site) {
if (RbSwitch.INSTANCE.isRestBaseEnabled(site)) {
- return new RbContentService(site);
+ return new RbPageService(site);
} else {
return new MwPageService(site);
}
diff --git
a/app/src/main/java/org/wikipedia/server/restbase/RbEndpointsCache.java
b/app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
similarity index 61%
rename from
app/src/main/java/org/wikipedia/server/restbase/RbEndpointsCache.java
rename to
app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
index 52ae3e5..417abbc 100644
--- a/app/src/main/java/org/wikipedia/server/restbase/RbEndpointsCache.java
+++ b/app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
@@ -11,16 +11,16 @@
* It's good to cache the Retrofit web service since it's a memory intensive
object.
* Keep the same instance around as long as we're dealing with the same domain.
*/
-public final class RbEndpointsCache {
- public static final RbEndpointsCache INSTANCE = new RbEndpointsCache();
+public final class RbPageEndpointsCache {
+ public static final RbPageEndpointsCache INSTANCE = new
RbPageEndpointsCache();
private Site site;
- private RbContentService.RbEndpoints cachedWebService;
+ private RbPageService.RbEndpoints cachedWebService;
- private RbEndpointsCache() {
+ private RbPageEndpointsCache() {
}
- public RbContentService.RbEndpoints getRbEndpoints(Site newSite) {
+ public RbPageService.RbEndpoints getRbEndpoints(Site newSite) {
if (!newSite.equals(site)) {
cachedWebService = createRbService(newSite);
site = newSite;
@@ -28,11 +28,11 @@
return cachedWebService;
}
- private RbContentService.RbEndpoints createRbService(Site site) {
- RbContentService.RbEndpoints webService =
RestAdapterFactory.newInstance(site,
+ private RbPageService.RbEndpoints createRbService(Site site) {
+ RbPageService.RbEndpoints webService =
RestAdapterFactory.newInstance(site,
String.format(Locale.ROOT, Prefs.getRestbaseUriFormat(),
WikipediaApp.getInstance().getNetworkProtocol(),
site.getDomain()))
- .create(RbContentService.RbEndpoints.class);
+ .create(RbPageService.RbEndpoints.class);
return webService;
}
}
diff --git
a/app/src/main/java/org/wikipedia/server/restbase/RbContentService.java
b/app/src/main/java/org/wikipedia/server/restbase/RbPageService.java
similarity index 97%
rename from
app/src/main/java/org/wikipedia/server/restbase/RbContentService.java
rename to app/src/main/java/org/wikipedia/server/restbase/RbPageService.java
index 0fdb254..f4614ad 100644
--- a/app/src/main/java/org/wikipedia/server/restbase/RbContentService.java
+++ b/app/src/main/java/org/wikipedia/server/restbase/RbPageService.java
@@ -22,13 +22,13 @@
/**
* Retrofit web service client for RESTBase Nodejs API.
*/
-public class RbContentService implements PageService {
+public class RbPageService implements PageService {
private final RbEndpoints webService;
private WikipediaZeroHandler responseHeaderHandler;
- public RbContentService(final Site site) {
+ public RbPageService(final Site site) {
responseHeaderHandler =
WikipediaApp.getInstance().getWikipediaZeroHandler();
- webService = RbEndpointsCache.INSTANCE.getRbEndpoints(site);
+ webService = RbPageEndpointsCache.INSTANCE.getRbEndpoints(site);
}
@Override
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
index 2eca049..f55541f 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
@@ -21,7 +21,7 @@
import org.wikipedia.page.linkpreview.SwipeableBottomDialog;
import org.wikipedia.server.ContentServiceFactory;
import org.wikipedia.server.PageService;
-import org.wikipedia.server.restbase.RbContentService;
+import org.wikipedia.server.restbase.RbPageService;
import org.wikipedia.server.restbase.RbDefinition;
import org.wikipedia.util.log.L;
import org.wikipedia.views.AppTextView;
@@ -106,8 +106,8 @@
}
PageService contentService = ContentServiceFactory.create(new
Site(pageTitle.getSite().getLanguageCode() + WIKTIONARY_DOMAIN));
- if (contentService instanceof RbContentService) {
- ((RbContentService) contentService).define(
+ if (contentService instanceof RbPageService) {
+ ((RbPageService) contentService).define(
addUnderscores(selectedText),
definitionOnLoadCallback);
} else {
--
To view, visit https://gerrit.wikimedia.org/r/272853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc848f4fddc56b400efdf7214bd058d574836bda
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
