diff --git a/services/git-bridge/.idea/workspace.xml b/services/git-bridge/.idea/workspace.xml
index b5f1e6ca6f..458f4d3dd4 100644
--- a/services/git-bridge/.idea/workspace.xml
+++ b/services/git-bridge/.idea/workspace.xml
@@ -7,15 +7,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -39,76 +43,87 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -129,16 +144,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -152,9 +157,6 @@
@@ -238,7 +243,6 @@
-
@@ -353,6 +357,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -919,6 +987,7 @@
+
@@ -964,7 +1033,7 @@
-
+
@@ -1025,6 +1094,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1075,6 +1166,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1102,19 +1206,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1207,18 +1298,20 @@
-
+
+
-
-
-
-
+
+
+
+
+
@@ -1252,20 +1345,20 @@
+
-
-
+
+
-
-
+
@@ -1314,6 +1407,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1350,14 +1475,14 @@
+
+
+
-
-
-
@@ -1489,7 +1614,6 @@
-
@@ -1497,7 +1621,6 @@
-
@@ -1512,7 +1635,6 @@
-
@@ -1527,7 +1649,6 @@
-
@@ -1535,15 +1656,6 @@
-
-
-
-
-
-
-
-
-
@@ -1551,71 +1663,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1627,14 +1674,6 @@
-
-
-
-
-
-
-
-
@@ -1683,7 +1722,40 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1691,10 +1763,26 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1778,7 +1866,7 @@
- slf4j-nop-1.7.7
+ slf4j-api-1.7.7
diff --git a/services/git-bridge/build.xml b/services/git-bridge/build.xml
index b29d07c474..ec2664995d 100644
--- a/services/git-bridge/build.xml
+++ b/services/git-bridge/build.xml
@@ -87,6 +87,14 @@
+
+
+
+
+
+
+
+
@@ -116,6 +124,8 @@
+
+
@@ -129,6 +139,8 @@
+
+
@@ -142,6 +154,8 @@
+
+
@@ -156,6 +170,8 @@
+
+
@@ -259,6 +275,8 @@
+
+
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/Request.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/Request.java
deleted file mode 100644
index cc33a73293..0000000000
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/Request.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package uk.ac.ic.wlgitbridge.writelatex.api.request;
-
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.Realm;
-import com.ning.http.client.Response;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-/**
- * Created by Winston on 06/11/14.
- */
-public abstract class Request {
-
- private final String url;
-
- private Future response;
- private IOException exception;
-
- public Request(String url) {
- this.url = url;
- }
-
- protected abstract Realm buildRequestRealm();
-
- public void request() {
- AsyncHttpClient client = new AsyncHttpClient();
- try {
- response = client.prepareGet(url).setRealm(buildRequestRealm()).execute();
- } catch (IOException e) {
- exception = e;
- }
- }
-
- public String getResponse() throws IOException, ExecutionException, InterruptedException {
- if (exception != null) {
- throw exception;
- }
- return response.get().getResponseBody();
- }
-
-}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetDocRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetDocRequest.java
deleted file mode 100644
index e74aed56e4..0000000000
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetDocRequest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package uk.ac.ic.wlgitbridge.writelatex.api.request;
-
-/**
- * Created by Winston on 06/11/14.
- */
-public class SnapshotGetDocRequest extends SnapshotAPIRequest {
-
- public static final String API_CALL = "";
-
- public SnapshotGetDocRequest(String projectName) {
- super(projectName, API_CALL);
- }
-
-}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetForVersionRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetForVersionRequest.java
deleted file mode 100644
index 2aa4d290a6..0000000000
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetForVersionRequest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package uk.ac.ic.wlgitbridge.writelatex.api.request;
-
-/**
- * Created by Winston on 06/11/14.
- */
-public class SnapshotGetForVersionRequest extends SnapshotAPIRequest {
-
- public static final String API_CALL = "/snapshots";
-
- public SnapshotGetForVersionRequest(String projectName, int versionID) {
- super(projectName, API_CALL + "/" + versionID);
- }
-
-}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetSavedVersRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetSavedVersRequest.java
deleted file mode 100644
index 74b5dcf0a6..0000000000
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetSavedVersRequest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package uk.ac.ic.wlgitbridge.writelatex.api.request;
-
-/**
- * Created by Winston on 06/11/14.
- */
-public class SnapshotGetSavedVersRequest extends SnapshotAPIRequest {
-
- public static final String API_CALL = "/saved_vers";
-
- public SnapshotGetSavedVersRequest(String projectName) {
- super(projectName, API_CALL);
- }
-
-}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java
new file mode 100644
index 0000000000..9236c5e5ea
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java
@@ -0,0 +1,12 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.base;
+
+import com.google.gson.JsonElement;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public interface JSONSource {
+
+ public abstract void fromJSON(JsonElement json);
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java
new file mode 100644
index 0000000000..3ab034a0ac
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java
@@ -0,0 +1,61 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.base;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.ning.http.client.AsyncCompletionHandler;
+import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.Realm;
+import com.ning.http.client.Response;
+
+import java.io.IOException;
+import java.util.concurrent.Future;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public abstract class Request {
+
+ private final String url;
+
+ private Future future;
+ private Throwable throwable;
+
+ private boolean finished;
+
+ public Request(String url) {
+ this.url = url;
+ finished = false;
+ }
+
+ protected abstract Realm buildRequestRealm();
+ protected abstract T parseResponse(JsonElement json);
+
+ public void request() {
+ AsyncHttpClient client = new AsyncHttpClient();
+ try {
+ future = client.prepareGet(url).setRealm(buildRequestRealm()).execute(new AsyncCompletionHandler() {
+
+ @Override
+ public T onCompleted(Response response) throws Exception {
+ return parseResponse(new Gson().fromJson(response.getResponseBody(), JsonElement.class));
+ }
+
+ @Override
+ public void onThrowable(Throwable t) {
+ throwable = t;
+ }
+
+ });
+ } catch (IOException e) {
+ throwable = e;
+ }
+ }
+
+ public T getResult() throws Throwable {
+ if (throwable != null) {
+ throw throwable;
+ }
+ return future.get();
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java
new file mode 100644
index 0000000000..0226e373b3
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java
@@ -0,0 +1,28 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.base;
+
+import com.google.gson.JsonElement;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public abstract class Result implements JSONSource {
+
+ private JsonElement json;
+ private final Request request;
+
+ public Result(Request request, JsonElement json) {
+ this.request = request;
+ this.json = json;
+ fromJSON(json);
+ }
+
+ public Request getRequest() {
+ return request;
+ }
+
+ @Override
+ public String toString() {
+ return json.toString();
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotAPIRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java
similarity index 83%
rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotAPIRequest.java
rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java
index 66649232ba..c31e2ebb75 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotAPIRequest.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java
@@ -1,11 +1,11 @@
-package uk.ac.ic.wlgitbridge.writelatex.api.request;
+package uk.ac.ic.wlgitbridge.writelatex.api.request.base;
import com.ning.http.client.Realm;
/**
* Created by Winston on 06/11/14.
*/
-public abstract class SnapshotAPIRequest extends Request {
+public abstract class SnapshotAPIRequest extends Request {
private static final String USERNAME = "staging";
private static final String PASSWORD = "6kUfbv0R";
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java
new file mode 100644
index 0000000000..8b742399c1
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java
@@ -0,0 +1,22 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.SnapshotAPIRequest;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetDocRequest extends SnapshotAPIRequest {
+
+ public static final String API_CALL = "";
+
+ public SnapshotGetDocRequest(String projectName) {
+ super(projectName, API_CALL);
+ }
+
+ @Override
+ protected SnapshotGetDocResult parseResponse(JsonElement json) {
+ return new SnapshotGetDocResult(this, json);
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java
new file mode 100644
index 0000000000..fab3c816b0
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java
@@ -0,0 +1,22 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Request;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Result;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetDocResult extends Result {
+
+ private int versionID;
+
+ public SnapshotGetDocResult(Request request, JsonElement json) {
+ super(request, json);
+ }
+
+ @Override
+ public void fromJSON(JsonElement json) {
+ versionID = json.getAsJsonObject().get("latestVerId").getAsInt();
+ }
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java
new file mode 100644
index 0000000000..f4af37210d
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java
@@ -0,0 +1,22 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.SnapshotAPIRequest;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetForVersionRequest extends SnapshotAPIRequest {
+
+ public static final String API_CALL = "/snapshots";
+
+ public SnapshotGetForVersionRequest(String projectName, int versionID) {
+ super(projectName, API_CALL + "/" + versionID);
+ }
+
+ @Override
+ protected SnapshotGetForVersionResult parseResponse(JsonElement json) {
+ return new SnapshotGetForVersionResult(this, json);
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java
new file mode 100644
index 0000000000..77c978b60f
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java
@@ -0,0 +1,21 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Request;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Result;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetForVersionResult extends Result {
+
+ public SnapshotGetForVersionResult(Request request, JsonElement json) {
+ super(request, json);
+ }
+
+ @Override
+ public void fromJSON(JsonElement json) {
+
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java
new file mode 100644
index 0000000000..f5df493493
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java
@@ -0,0 +1,22 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.SnapshotAPIRequest;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetSavedVersRequest extends SnapshotAPIRequest {
+
+ public static final String API_CALL = "/saved_vers";
+
+ public SnapshotGetSavedVersRequest(String projectName) {
+ super(projectName, API_CALL);
+ }
+
+ @Override
+ protected SnapshotGetSavedVersResult parseResponse(JsonElement json) {
+ return new SnapshotGetSavedVersResult(this, json);
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java
new file mode 100644
index 0000000000..7347c517c9
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java
@@ -0,0 +1,31 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Request;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Result;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetSavedVersResult extends Result {
+
+ private List savedVers;
+
+ public SnapshotGetSavedVersResult(Request request, JsonElement json) {
+ super(request, json);
+ }
+
+ @Override
+ public void fromJSON(JsonElement json) {
+ savedVers = new Gson().fromJson(json, LinkedList.class);
+ }
+
+ public List getSavedVers() {
+ return savedVers;
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java
new file mode 100644
index 0000000000..281620593c
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java
@@ -0,0 +1,21 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.JSONSource;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotInfo implements JSONSource {
+
+ private int versionId;
+ private String comment;
+ private WLUser user;
+ private String createdAt;
+
+ @Override
+ public void fromJSON(JsonElement json) {
+
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java
new file mode 100644
index 0000000000..fceb5a52e2
--- /dev/null
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java
@@ -0,0 +1,19 @@
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers;
+
+import com.google.gson.JsonElement;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.JSONSource;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class WLUser implements JSONSource {
+
+ private String name;
+ private String email;
+
+ @Override
+ public void fromJSON(JsonElement json) {
+
+ }
+
+}
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java
index ad7d8f198c..1113cdd1d6 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java
@@ -1,13 +1,10 @@
package uk.ac.ic.wlgitbridge.writelatex.model;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.Request;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetDocRequest;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetForVersionRequest;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetSavedVersRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Request;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.SnapshotGetDocRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.SnapshotGetForVersionRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.SnapshotGetSavedVersRequest;
import java.io.IOException;
import java.util.*;
@@ -51,9 +48,9 @@ public class WLProject implements JSONModel {
boolean result = false;
- ids.add(getLatestVersionID(getDoc.getResponse()));
+// ids.add(getLatestVersionID(getDoc.getResult()));
- ids.addAll(getLatestVersionIDs(getSavedVers.getResponse()));
+// ids.addAll(getLatestVersionIDs(getSavedVers.getResult()));
List idsToUpdate = new LinkedList();
@@ -81,24 +78,4 @@ public class WLProject implements JSONModel {
}
- private int getLatestVersionID(String response) {
- Gson gson = new Gson();
- JsonObject responseObject = gson.fromJson(response, JsonObject.class);
- return responseObject.get("latestVerId").getAsInt();
- }
-
- private Collection extends Integer> getLatestVersionIDs(String response) {
- List ids = new LinkedList();
- Gson gson = new Gson();
- JsonArray responseArray = gson.fromJson(response, JsonArray.class);
- for (JsonElement elem : responseArray) {
- ids.add(getVersionID(elem.getAsJsonObject()));
- }
- return ids;
- }
-
- private Integer getVersionID(JsonObject object) {
- return object.get("versionId").getAsInt();
- }
-
}
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/RequestTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/RequestTests.java
deleted file mode 100644
index e16e21acf5..0000000000
--- a/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/RequestTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api;
-
-import org.junit.Test;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.Request;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetDocRequest;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetForVersionRequest;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetSavedVersRequest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-/**
- * Created by Winston on 06/11/14.
- */
-public class RequestTests {
-
- @Test
- public void nothingToTest() {
- String projectName = "1826rqgsdb";
- Request getDoc = new SnapshotGetDocRequest(projectName);
- Request getSavedVers = new SnapshotGetSavedVersRequest(projectName);
- Request getForVersion = new SnapshotGetForVersionRequest(projectName, 76);
-
- getDoc.request();
- getSavedVers.request();
- getForVersion.request();
-
- try {
- System.out.println(getDoc.getResponse());
- System.out.println(getSavedVers.getResponse());
- System.out.println(getForVersion.getResponse());
- } catch (IOException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotGetSavedVersRequestTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotGetSavedVersRequestTests.java
deleted file mode 100644
index c2d1d8b4ed..0000000000
--- a/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotGetSavedVersRequestTests.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api;
-
-import org.junit.Test;
-
-/**
- * Created by Winston on 06/11/14.
- */
-public class SnapshotGetSavedVersRequestTests {
-
- @Test
- public void nothingToTest() {
-
- }
-
-}
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/base/RequestTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/base/RequestTests.java
new file mode 100644
index 0000000000..d08f8677c5
--- /dev/null
+++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/base/RequestTests.java
@@ -0,0 +1,37 @@
+package uk.ac.ic.wlgitbridge.test.writelatex.api.request.base;
+
+import org.junit.Test;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Request;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.SnapshotGetDocRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.SnapshotGetForVersionRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.SnapshotGetSavedVersRequest;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class RequestTests {
+
+ @Test
+ public void nothingToTest() {
+ String projectName = "1826rqgsdb";
+ Request getDoc = new SnapshotGetDocRequest(projectName);
+ Request getSavedVers = new SnapshotGetSavedVersRequest(projectName);
+ Request getForVersion = new SnapshotGetForVersionRequest(projectName, 76);
+
+ getDoc.request();
+ getSavedVers.request();
+ getForVersion.request();
+
+ try {
+ System.out.println(getDoc.getResult());
+ System.out.println(getSavedVers.getResult());
+ System.out.println(getForVersion.getResult());
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTests.java
new file mode 100644
index 0000000000..54a4e6fd5a
--- /dev/null
+++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTests.java
@@ -0,0 +1,22 @@
+package uk.ac.ic.wlgitbridge.test.writelatex.api.request.getsavedvers;
+
+import org.junit.Test;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.SnapshotGetSavedVersRequest;
+
+/**
+ * Created by Winston on 06/11/14.
+ */
+public class SnapshotGetSavedVersRequestTests {
+
+ @Test
+ public void nothingToTest() {
+ SnapshotGetSavedVersRequest request = new SnapshotGetSavedVersRequest("1826rqgsdb");
+ request.request();
+ try {
+ System.out.println(request.getResult());
+ } catch (Throwable throwable) {
+ throwable.printStackTrace();
+ }
+ }
+
+}