From c1dc30b39ebf0565714f0e64320d528aa85497f7 Mon Sep 17 00:00:00 2001 From: Andrew Wheat Date: Tue, 20 Nov 2018 11:54:49 +0000 Subject: [PATCH 1/2] hacky fix to allow the endpoint URL to be changed. --- src/main/java/com/bitmovin/api/BitmovinApi.java | 1 + src/main/java/com/bitmovin/api/constants/ApiUrls.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bitmovin/api/BitmovinApi.java b/src/main/java/com/bitmovin/api/BitmovinApi.java index 73f01c3..310eb42 100644 --- a/src/main/java/com/bitmovin/api/BitmovinApi.java +++ b/src/main/java/com/bitmovin/api/BitmovinApi.java @@ -149,6 +149,7 @@ public BitmovinApi(String apiKey, String apiUrl, String tenantID, boolean useHtt this.tenantID = tenantID; this.apiKey = apiKey; this.apiUrl = apiUrl == null ? ApiUrls.API_ENDPOINT_WITH_PROTOCOL + "/v1/" : String.format("%s://%s/", useHttps ? "https" : "http", apiUrl); + ApiUrls.API_ENDPOINT_WITH_PROTOCOL = this.apiUrl; this.setDefaultHeaders(); this.initContainers(); diff --git a/src/main/java/com/bitmovin/api/constants/ApiUrls.java b/src/main/java/com/bitmovin/api/constants/ApiUrls.java index dd2094f..3ff9499 100644 --- a/src/main/java/com/bitmovin/api/constants/ApiUrls.java +++ b/src/main/java/com/bitmovin/api/constants/ApiUrls.java @@ -7,8 +7,8 @@ */ public class ApiUrls { - public static final String API_ENDPOINT = "api.bitmovin.com/v1"; - public static final String API_ENDPOINT_WITH_PROTOCOL = "https://" + API_ENDPOINT; + public static String API_ENDPOINT = "api.bitmovin.com/v1"; + public static String API_ENDPOINT_WITH_PROTOCOL = "https://" + API_ENDPOINT; public static final String analyticsQuery = "analytics/queries"; public static final String analyticsLicenses = "analytics/licenses"; From 5e64af3e7fb1eaa55a0d9c502cad976eb12782be Mon Sep 17 00:00:00 2001 From: xuq01 Date: Wed, 21 Nov 2018 10:33:30 +0000 Subject: [PATCH 2/2] remove duplicated slash --- src/main/java/com/bitmovin/api/BitmovinApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bitmovin/api/BitmovinApi.java b/src/main/java/com/bitmovin/api/BitmovinApi.java index 310eb42..203caf0 100644 --- a/src/main/java/com/bitmovin/api/BitmovinApi.java +++ b/src/main/java/com/bitmovin/api/BitmovinApi.java @@ -148,7 +148,7 @@ public BitmovinApi(String apiKey, String apiUrl, String tenantID, boolean useHtt this.tenantID = tenantID; this.apiKey = apiKey; - this.apiUrl = apiUrl == null ? ApiUrls.API_ENDPOINT_WITH_PROTOCOL + "/v1/" : String.format("%s://%s/", useHttps ? "https" : "http", apiUrl); + this.apiUrl = apiUrl == null ? ApiUrls.API_ENDPOINT_WITH_PROTOCOL + "/v1/" : String.format("%s://%s", useHttps ? "https" : "http", apiUrl); ApiUrls.API_ENDPOINT_WITH_PROTOCOL = this.apiUrl; this.setDefaultHeaders();