From cfe23b57ff5cde4f40afb0f032c9108ca5cc90d7 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Sat, 6 Dec 2014 00:48:39 +0000 Subject: [PATCH] Forced hostname to end with / --- .../src/uk/ac/ic/wlgitbridge/application/Config.java | 6 +++++- .../writelatex/api/request/base/SnapshotAPIRequest.java | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java index b29a6f3e6d..fa41ed057a 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java @@ -39,7 +39,11 @@ public class Config implements JSONSource { apiKey = getElement(configObject, "apiKey").getAsString(); username = getOptionalString(configObject, "username"); password = getOptionalString(configObject, "password"); - hostname = getElement(configObject, "hostname").getAsString(); + String hostname = getElement(configObject, "hostname").getAsString(); + if (!hostname.endsWith("/")) { + hostname += "/"; + } + this.hostname = hostname; serviceName = getElement(configObject, "serviceName").getAsString(); } diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java index c217cfab27..4943b64681 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java @@ -10,10 +10,11 @@ public abstract class SnapshotAPIRequest extends Request { private static String USERNAME; private static String PASSWORD; + /* Must end with / */ private static String BASE_URL; public SnapshotAPIRequest(String projectName, String apiCall) { - super(BASE_URL + "/" + projectName + apiCall); + super(BASE_URL + projectName + apiCall); } protected Realm buildRequestRealm() { @@ -31,9 +32,6 @@ public abstract class SnapshotAPIRequest extends Request { } public static void setBaseURL(String baseURL) { - if (!(baseURL.endsWith("/"))) { - baseURL += "/"; - } BASE_URL = baseURL; }