From d59c3da400f29470da67e47bc4e9201b25412e84 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Thu, 6 Nov 2014 11:43:11 +0000 Subject: [PATCH] Included slf4j jars and implemented Snapshot Fetch API. --- .../.idea/libraries/slf4j_api_1_7_7.xml | 11 + .../.idea/libraries/slf4j_nop_1_7_7.xml | 11 + services/git-bridge/.idea/workspace.xml | 601 +++++++++++------- .../libs/slf4j-api-1.7.7-javadoc.jar | Bin 0 -> 195678 bytes services/git-bridge/libs/slf4j-api-1.7.7.jar | Bin 0 -> 29257 bytes .../libs/slf4j-nop-1.7.7-javadoc.jar | Bin 0 -> 32643 bytes services/git-bridge/libs/slf4j-nop-1.7.7.jar | Bin 0 -> 4090 bytes .../wlgitbridge/bridge/WLBridgedProject.java | 6 +- .../ac/ic/wlgitbridge/git/WLGitServlet.java | 1 - .../git/handler/WLReceivePackFactory.java | 1 - .../writelatex/api/DummySnapshotAPI.java | 2 +- .../writelatex/api/DummySnapshotDBAPI.java | 2 +- .../writelatex/api/SnapshotAPI.java | 2 +- .../writelatex/api/SnapshotDBAPI.java | 2 +- .../writelatex/api/request/Request.java | 41 ++ .../api/request/SnapshotAPIRequest.java | 29 + .../api/request/SnapshotGetDocRequest.java | 16 + .../request/SnapshotGetForVersionRequest.java | 14 + .../request/SnapshotGetSavedVersRequest.java | 14 + .../{JSONSource.java => model/JSONModel.java} | 4 +- .../writelatex/{ => model}/Snapshot.java | 4 +- .../writelatex/{ => model}/WLDataModel.java | 6 +- .../writelatex/{ => model}/WLProject.java | 4 +- .../test/writelatex/api/RequestTests.java | 41 ++ .../api/SnapshotAPIRequestTests.java | 15 + .../api/SnapshotGetDocRequestTests.java | 15 + .../SnapshotGetForVersionRequestTests.java | 15 + .../api/SnapshotGetSavedVersRequestTests.java | 15 + .../writelatex/{ => model}/SnapshotTests.java | 2 +- .../writelatex/model/WLDataModelTests.java | 15 + .../test/writelatex/model/WLProjectTests.java | 15 + services/git-bridge/writelatex-git-bridge.iml | 2 + 32 files changed, 649 insertions(+), 257 deletions(-) create mode 100644 services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml create mode 100644 services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml create mode 100644 services/git-bridge/libs/slf4j-api-1.7.7-javadoc.jar create mode 100644 services/git-bridge/libs/slf4j-api-1.7.7.jar create mode 100644 services/git-bridge/libs/slf4j-nop-1.7.7-javadoc.jar create mode 100644 services/git-bridge/libs/slf4j-nop-1.7.7.jar create mode 100644 services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/Request.java create mode 100644 services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotAPIRequest.java create mode 100644 services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetDocRequest.java create mode 100644 services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetForVersionRequest.java create mode 100644 services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/SnapshotGetSavedVersRequest.java rename services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/{JSONSource.java => model/JSONModel.java} (63%) rename services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/{ => model}/Snapshot.java (70%) rename services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/{ => model}/WLDataModel.java (66%) rename services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/{ => model}/WLProject.java (83%) create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/RequestTests.java create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotAPIRequestTests.java create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotGetDocRequestTests.java create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotGetForVersionRequestTests.java create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/SnapshotGetSavedVersRequestTests.java rename services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/{ => model}/SnapshotTests.java (74%) create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/model/WLDataModelTests.java create mode 100644 services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/model/WLProjectTests.java diff --git a/services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml b/services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml new file mode 100644 index 0000000000..c8746170de --- /dev/null +++ b/services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml b/services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml new file mode 100644 index 0000000000..a8b1b785d4 --- /dev/null +++ b/services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/workspace.xml b/services/git-bridge/.idea/workspace.xml index f267f5ea90..83b5ff2043 100644 --- a/services/git-bridge/.idea/workspace.xml +++ b/services/git-bridge/.idea/workspace.xml @@ -7,8 +7,18 @@ - - + + + + + + + + + + + + @@ -33,101 +43,101 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + @@ -146,24 +156,6 @@ @@ -231,6 +241,8 @@ + + @@ -293,6 +305,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -824,7 +942,7 @@ - + @@ -842,15 +960,31 @@ - - - + + + - + + + - - - + + + - + + + + + + + localhost 5050 @@ -1069,19 +1209,19 @@ - + - + - + @@ -1130,93 +1270,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1249,19 +1302,18 @@ - - - - + + + @@ -1274,7 +1326,6 @@ - @@ -1282,7 +1333,6 @@ - @@ -1304,7 +1354,6 @@ - @@ -1312,7 +1361,6 @@ - @@ -1320,11 +1368,10 @@ - - + @@ -1336,7 +1383,6 @@ - @@ -1344,7 +1390,6 @@ - @@ -1352,7 +1397,6 @@ - @@ -1360,7 +1404,6 @@ - @@ -1368,7 +1411,6 @@ - @@ -1376,7 +1418,6 @@ - @@ -1384,7 +1425,6 @@ - @@ -1392,7 +1432,6 @@ - @@ -1400,7 +1439,6 @@ - @@ -1408,7 +1446,6 @@ - @@ -1432,15 +1469,6 @@ - - - - - - - - - @@ -1456,7 +1484,6 @@ - @@ -1468,15 +1495,7 @@ - - - - - - - - - + @@ -1484,7 +1503,7 @@ - + @@ -1492,14 +1511,6 @@ - - - - - - - - @@ -1510,16 +1521,136 @@ - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1603,7 +1734,7 @@ - async-http-client-1.8.14 + slf4j-nop-1.7.7