Sniedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263016
Change subject: Hygiene: refer to interfaces not implementations
......................................................................
Hygiene: refer to interfaces not implementations
No functional changes intended. Prefer interfaces to concrete
implementations for APIs and reference holding.
Change-Id: I7faac58f84eba251ac00db0f38f190f2b2d1e483
---
M lib/src/main/java/org/mediawiki/api/json/Api.java
M lib/src/test/java/org/mediawiki/json/ApiConstructionTest.java
M lib/src/test/java/org/mediawiki/json/ApiTest.java
3 files changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi
refs/changes/16/263016/1
diff --git a/lib/src/main/java/org/mediawiki/api/json/Api.java
b/lib/src/main/java/org/mediawiki/api/json/Api.java
index 0dcff38..a53863c 100644
--- a/lib/src/main/java/org/mediawiki/api/json/Api.java
+++ b/lib/src/main/java/org/mediawiki/api/json/Api.java
@@ -34,7 +34,7 @@
/**
* Any custom headers, if specified by the appropriate constructor
*/
- private HashMap<String, String> customHeaders;
+ private Map<String, String> customHeaders;
/**
* Default API endpoint
@@ -78,7 +78,7 @@
* @param userAgent Custom User-Agent to simplify identification of
consuming application
* @param customHeaders Any extra headers to send with each request, e.g.
User-Agent.
*/
- public Api(final String domain, final String userAgent, HashMap<String,
String> customHeaders) {
+ public Api(final String domain, final String userAgent, Map<String,
String> customHeaders) {
this(domain, true, DEFAULT_ENDPOINT, customHeaders);
this.customHeaders.put("User-Agent", userAgent);
}
@@ -92,7 +92,7 @@
* @param domain Domain name of the MediaWiki API to connect to
* @param customHeaders Any extra headers to send with each request, e.g.
User-Agent.
*/
- public Api(final String domain, HashMap<String, String> customHeaders) {
+ public Api(final String domain, Map<String, String> customHeaders) {
this(domain, true, DEFAULT_ENDPOINT, customHeaders);
}
@@ -130,7 +130,7 @@
* @param endpointPath Path to the api.php file. Require preceding slash.
* @param customHeaders Any extra headers to send with each request, e.g.
User-Agent.
*/
- public Api(final String domain, final boolean useSecure, final String
endpointPath, HashMap<String, String> customHeaders) {
+ public Api(final String domain, final boolean useSecure, final String
endpointPath, Map<String, String> customHeaders) {
String protocol;
if (useSecure) {
protocol = "https";
diff --git a/lib/src/test/java/org/mediawiki/json/ApiConstructionTest.java
b/lib/src/test/java/org/mediawiki/json/ApiConstructionTest.java
index 5b9adba..4abe105 100644
--- a/lib/src/test/java/org/mediawiki/json/ApiConstructionTest.java
+++ b/lib/src/test/java/org/mediawiki/json/ApiConstructionTest.java
@@ -4,6 +4,7 @@
import org.junit.Test;
import java.util.HashMap;
+import java.util.Map;
/**
* Tests for different ways to construct the Api object.
@@ -31,7 +32,7 @@
"https://test.wikipedia.org/w/api.php";,
new Api("test.wikipedia.org",
"java-mwapi-UA").getApiUrl().toString()
);
- HashMap<String, String> additionalHeaders = new java.util.HashMap<>();
+ Map<String, String> additionalHeaders = new java.util.HashMap<>();
additionalHeaders.put("X-Java-Mwapi-UnitTest", "java-mwapi-UA");
assertEquals(
"https://test.wikipedia.org/w/api.php";,
diff --git a/lib/src/test/java/org/mediawiki/json/ApiTest.java
b/lib/src/test/java/org/mediawiki/json/ApiTest.java
index 37f715e..67dff50 100644
--- a/lib/src/test/java/org/mediawiki/json/ApiTest.java
+++ b/lib/src/test/java/org/mediawiki/json/ApiTest.java
@@ -167,7 +167,7 @@
* @return API with test-friendly construction
*/
public Api getApi() {
- HashMap<String, String> getApi = new HashMap<>();
+ Map<String, String> getApi = new HashMap<>();
getApi.put("X-Java-Mwapi-UnitTest", "java-mwapi-UA");
return new Api("test.wikipedia.org", "java-mwapi-UA", getApi);
}
--
To view, visit https://gerrit.wikimedia.org/r/263016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7faac58f84eba251ac00db0f38f190f2b2d1e483
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Sniedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
