diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java index 911a9c91a8..dc5a031108 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java @@ -7,6 +7,7 @@ import org.eclipse.jgit.transport.ServiceMayNotContinueException; import uk.ac.ic.wlgitbridge.bridge.RepositorySource; import uk.ac.ic.wlgitbridge.bridge.WLBridgedProject; import uk.ac.ic.wlgitbridge.bridge.WriteLatexDataSource; +import uk.ac.ic.wlgitbridge.util.Util; import uk.ac.ic.wlgitbridge.writelatex.api.request.push.exception.InternalErrorException; import java.io.File; @@ -35,6 +36,7 @@ public class SnapshotRepositoryBuilder implements RepositorySource { repository = new FileRepositoryBuilder().setWorkTree(repositoryDirectory).build(); new WLBridgedProject(repository, name, writeLatexDataSource).buildRepository(); } catch (IOException e) { + Util.printStackTrace(e); throw new ServiceMayNotContinueException(new InternalErrorException().getDescriptionLines().get(0)); } return repository; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InternalErrorException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InternalErrorException.java index 4d36f5313d..78b700099e 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InternalErrorException.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InternalErrorException.java @@ -18,7 +18,7 @@ public class InternalErrorException extends SevereSnapshotPostException { @Override public List getDescriptionLines() { - return Arrays.asList("There as an internal error with the Git server.", + return Arrays.asList("There was an internal error with the Git server.", "Please contact " + Util.getServiceName() + "."); } diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/ResourceFetcher.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/ResourceFetcher.java index d186a2f70a..6659a132b2 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/ResourceFetcher.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/ResourceFetcher.java @@ -7,6 +7,7 @@ import com.ning.http.client.Response; import org.eclipse.jgit.lib.Repository; import uk.ac.ic.wlgitbridge.bridge.RawFile; import uk.ac.ic.wlgitbridge.git.util.RepositoryObjectTreeWalker; +import uk.ac.ic.wlgitbridge.util.Util; import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException; import uk.ac.ic.wlgitbridge.writelatex.filestore.RepositoryFile; @@ -57,8 +58,10 @@ public class ResourceFetcher { }).get(); } catch (InterruptedException e) { + Util.printStackTrace(e); throw new FailedConnectionException(); } catch (ExecutionException e) { + Util.printStackTrace(e); throw new FailedConnectionException(); } urlIndexStore.addURLIndexForProject(projectName, url, path); diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java index 15a629a218..3b1a052cc9 100644 --- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java +++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java @@ -35,10 +35,6 @@ public class WLGitBridgeIntegrationTest { put("canCloneMultipleRepositories", new HashMap() {{ put("state", new SnapshotAPIStateBuilder(getResourceAsStream("/canCloneMultipleRepositories/state/state.json")).build()); }}); - put("canPullAModifiedTexFile", new HashMap() {{ - put("base", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullAModifiedTexFile/base/state.json")).build()); - put("withModifiedTexFile", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullAModifiedTexFile/withModifiedTexFile/state.json")).build()); - }}); put("canPullADeletedTexFile", new HashMap() {{ put("base", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADeletedTexFile/base/state.json")).build()); put("withDeletedTexFile", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADeletedTexFile/withDeletedTexFile/state.json")).build()); @@ -98,29 +94,6 @@ public class WLGitBridgeIntegrationTest { assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canCloneMultipleRepositories/state/testproj2"), testproj2.toPath())); } - @Test - public void canPullAModifiedTexFile() throws IOException, GitAPIException { - MockSnapshotServer server = new MockSnapshotServer(3859, getResource("/canPullAModifiedTexFile").toFile()); - server.start(); - server.setState(states.get("canPullAModifiedTexFile").get("base")); - WLGitBridgeApplication wlgb = new WLGitBridgeApplication(new String[] { - makeConfigFile(33859, 3859) - }); - wlgb.run(); - folder.create(); - File git = folder.newFolder(); - Git base = Git.cloneRepository() - .setURI("http://127.0.0.1:33859/testproj.git") - .setDirectory(git) - .call(); - assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullAModifiedTexFile/base/testproj"), git.toPath())); - server.setState(states.get("canPullAModifiedTexFile").get("withModifiedTexFile")); - base.pull().call(); - base.close(); - wlgb.stop(); - assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullAModifiedTexFile/withModifiedTexFile/testproj"), git.toPath())); - } - @Test public void canPullADeletedTexFile() throws IOException, GitAPIException { MockSnapshotServer server = new MockSnapshotServer(3860, getResource("/canPullADeletedTexFile").toFile()); diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/state.json b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/state.json deleted file mode 100644 index d3fb76a03d..0000000000 --- a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/state.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "project": "testproj", - "getDoc": { - "versionID": 1, - "createdAt": "2014-11-30T18:40:58Z", - "email": "jdleesmiller+1@gmail.com", - "name": "John+1" - }, - "getSavedVers": [ - { - "versionID": 1, - "comment": "added more info on doc GET and error details", - "email": "jdleesmiller+1@gmail.com", - "name": "John+1", - "createdAt": "2014-11-30T18:47:01Z" - } - ], - "getForVers": [ - { - "versionID": 1, - "srcs": [ - { - "content": "content\n", - "path": "main.tex" - }, - { - "content": "This text is from another file.", - "path": "foo/bar/test.tex" - } - ], - "atts": [ - { - "url": "http://127.0.0.1:3859/base/testproj/overleaf-white-410.png", - "path": "overleaf-white-410.png" - } - ] - } - ], - "push": "success", - "postback": { - "type": "success", - "versionID": 2 - } - } -] \ No newline at end of file diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/foo/bar/test.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/foo/bar/test.tex deleted file mode 100644 index 046794f19a..0000000000 --- a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/foo/bar/test.tex +++ /dev/null @@ -1 +0,0 @@ -This text is from another file. \ No newline at end of file diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/main.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/main.tex deleted file mode 100644 index d95f3ad14d..0000000000 --- a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/main.tex +++ /dev/null @@ -1 +0,0 @@ -content diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/overleaf-white-410.png b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/overleaf-white-410.png deleted file mode 100644 index 6a23d10c15..0000000000 Binary files a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/base/testproj/overleaf-white-410.png and /dev/null differ diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/state.json b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/state.json deleted file mode 100644 index 2be7aa4bdd..0000000000 --- a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/state.json +++ /dev/null @@ -1,72 +0,0 @@ -[ - { - "project": "testproj", - "getDoc": { - "versionID": 2, - "createdAt": "2014-11-30T18:40:58Z", - "email": "jdleesmiller+1@gmail.com", - "name": "John+1" - }, - "getSavedVers": [ - { - "versionID": 2, - "comment": "i added more stuff to main.tex", - "email": "jdleesmiller+1@gmail.com", - "name": "John+1", - "createdAt": "2014-11-30T18:48:01Z" - }, - { - "versionID": 1, - "comment": "added more info on doc GET and error details", - "email": "jdleesmiller+1@gmail.com", - "name": "John+1", - "createdAt": "2014-11-30T18:47:01Z" - } - ], - "getForVers": [ - { - "versionID": 2, - "srcs": [ - { - "content": "content\nadded more stuff\n", - "path": "main.tex" - }, - { - "content": "This text is from another file.", - "path": "foo/bar/test.tex" - } - ], - "atts": [ - { - "url": "http://127.0.0.1:3859/withModifiedTexFile/testproj/overleaf-white-410.png", - "path": "overleaf-white-410.png" - } - ] - }, - { - "versionID": 1, - "srcs": [ - { - "content": "content\n", - "path": "main.tex" - }, - { - "content": "This text is from another file.", - "path": "foo/bar/test.tex" - } - ], - "atts": [ - { - "url": "http://127.0.0.1:3857/base/testproj/overleaf-white-410.png", - "path": "overleaf-white-410.png" - } - ] - } - ], - "push": "success", - "postback": { - "type": "success", - "versionID": 2 - } - } -] \ No newline at end of file diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/foo/bar/test.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/foo/bar/test.tex deleted file mode 100644 index 046794f19a..0000000000 --- a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/foo/bar/test.tex +++ /dev/null @@ -1 +0,0 @@ -This text is from another file. \ No newline at end of file diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/main.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/main.tex deleted file mode 100644 index 933682f779..0000000000 --- a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/main.tex +++ /dev/null @@ -1,2 +0,0 @@ -content -added more stuff diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/overleaf-white-410.png b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/overleaf-white-410.png deleted file mode 100644 index 6a23d10c15..0000000000 Binary files a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullAModifiedTexFile/withModifiedTexFile/testproj/overleaf-white-410.png and /dev/null differ