Dbrant has submitted this change and it was merged.
Change subject: Add port to constructor
......................................................................
Add port to constructor
Bug: T120415
Change-Id: Iffe3cf1a0ebc75da22362706cc743b69ba8b9755
---
M lib/src/main/java/org/mediawiki/api/json/Api.java
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Mholloway: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
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 3b5114a..3f25881 100644
--- a/lib/src/main/java/org/mediawiki/api/json/Api.java
+++ b/lib/src/main/java/org/mediawiki/api/json/Api.java
@@ -40,6 +40,8 @@
* Default API endpoint
*/
private static final String DEFAULT_ENDPOINT = "/w/api.php";
+ private static final int DEFAULT_HTTP_PORT = 80;
+ private static final int DEFAULT_HTTPS_PORT = 443;
/**
* Create an Api object with given only hostname.
@@ -126,15 +128,20 @@
this(domain, useSecure, endpointPath, null);
}
+ public Api(final String domain, final boolean useSecure, final String
endpointPath, Map<String, String> customHeaders) {
+ this(domain, useSecure ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT,
useSecure, endpointPath, customHeaders);
+ }
+
/**
* Create an Api object
*
* @param domain Domain name of the MediaWiki API to connect to
+ * @param port URL port number.
* @param useSecure true to use https, false to use http
* @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, Map<String, String> customHeaders) {
+ public Api(final String domain, int port, final boolean useSecure, final
String endpointPath, Map<String, String> customHeaders) {
String protocol;
if (useSecure) {
protocol = "https";
@@ -143,7 +150,11 @@
}
try {
- apiUrl = new URL(protocol, domain, endpointPath);
+ if (useSecure && port != DEFAULT_HTTPS_PORT || !useSecure && port
!= DEFAULT_HTTP_PORT) {
+ apiUrl = new URL(protocol, domain, port, endpointPath);
+ } else {
+ apiUrl = new URL(protocol, domain, endpointPath);
+ }
} catch (MalformedURLException e) {
// This never actually is supposed to happen, since it is thrown
only
// when an unknown protocol is given. 'http' or 'https' are
guaranteed to be present,
--
To view, visit https://gerrit.wikimedia.org/r/274042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffe3cf1a0ebc75da22362706cc743b69ba8b9755
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
