Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353109 )
Change subject: Hygiene: Update EntityClient to use formatversion=2
......................................................................
Hygiene: Update EntityClient to use formatversion=2
Includes some very light refactoring; no functional changes intended.
Bug: T150382
Change-Id: I6e0e7c1f51e9a8321865a12016ce8847429735c8
---
M app/src/main/java/org/wikipedia/wikidata/EntityClient.java
M app/src/test/res/raw/wikidata_entity_label_invalid_entity.json
2 files changed, 5 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/09/353109/1
diff --git a/app/src/main/java/org/wikipedia/wikidata/EntityClient.java
b/app/src/main/java/org/wikipedia/wikidata/EntityClient.java
index 1f05330..736aab6 100644
--- a/app/src/main/java/org/wikipedia/wikidata/EntityClient.java
+++ b/app/src/main/java/org/wikipedia/wikidata/EntityClient.java
@@ -74,17 +74,15 @@
.enqueue(new LabelCallbackAdapter(callback, qNumber,
langCode));
}
- @VisibleForTesting
- @NonNull
+ @VisibleForTesting @NonNull
Call<Entity.EntitiesResponse> requestLabels(@NonNull Service service,
@NonNull final String qNumber,
@NonNull final String
langCode) {
return service.getLabels(qNumber, langCode);
}
- @VisibleForTesting
- interface Service {
- String ACTION = "w/api.php?action=wbgetentities&format=json";
+ @VisibleForTesting interface Service {
+ String ACTION =
"w/api.php?action=wbgetentities&format=json&formatversion=2";
@GET(ACTION + "&props=labels&languagefallback=1")
@NonNull Call<Entity.EntitiesResponse> getLabels(@Query("ids")
@NonNull String idList,
diff --git a/app/src/test/res/raw/wikidata_entity_label_invalid_entity.json
b/app/src/test/res/raw/wikidata_entity_label_invalid_entity.json
index b9dc1ba..bcfb178 100644
--- a/app/src/test/res/raw/wikidata_entity_label_invalid_entity.json
+++ b/app/src/test/res/raw/wikidata_entity_label_invalid_entity.json
@@ -7,12 +7,10 @@
{
"name": "wikibase-api-no-such-entity",
"parameters": [],
- "html": {
- "*": "Could not find such an entity."
- }
+ "html": "Could not find such an entity."
}
],
- "*": "See https://www.wikidata.org/w/api.php for API usage."
+ "docref": "See https://www.wikidata.org/w/api.php for API usage."
},
"servedby": "mw1202"
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/353109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e0e7c1f51e9a8321865a12016ce8847429735c8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
