From 0d0c5458ddae3c6e20ffad01d261918ec87f4bed Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 7 Jan 2019 11:54:44 +0000 Subject: [PATCH] Handle when v1 is deprecated, print a message instead of an error --- .../snapshot/base/MissingRepositoryException.java | 7 +++++++ .../java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java index 320e3d192e..c3717b0afc 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java @@ -18,6 +18,13 @@ public class MissingRepositoryException extends SnapshotAPIException { "see https://www.overleaf.com/help/342 for more information." ); + public static final List OVERLEAF_V1_DEPRECATED_REASON = Arrays.asList( + "Overleaf v1 is deprecated, and you need to migrate this project to v2.", + "", + "If this is unexpected, please contact us at support@overleaf.com, or", + "see https://www.overleaf.com/help/342 for more information." + ); + static List buildExportedToV2Message(String remoteUrl) { if (remoteUrl == null) { return Arrays.asList( diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java index a7f994cce3..e9ef50114c 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java @@ -90,6 +90,10 @@ public abstract class Request { throw new MissingRepositoryException( MissingRepositoryException.buildExportedToV2Message(newRemote) ); + } else if ("Overleaf v1 is Deprecated".equals(message)) { + throw new MissingRepositoryException( + MissingRepositoryException.OVERLEAF_V1_DEPRECATED_REASON + ); } } catch (IllegalStateException | ClassCastException