commit 80c5fd3648088291f5c8fb832b10b35ca022ec2d
author Jacek Centkowski <jcentkowski@collab.net> Thu Jun 01 08:35:37 2017 +0200
committer Jacek Centkowski <jcentkowski@collab.net> Thu Jun 01 08:45:11 2017 +0200
tree f3b980e6c995042bd89a81af89673e0081757225
parent 151e64821c83bdcec8077be7a68243bceea11d13

Adjust plugin to LFS definitions

This is necessary step to adjust to changes in [1]. It allows for
merging [1] without providing Git LFS lock implementation in
plugin. Git LFS client recognizes that lock API is not available
and sets lfs.locksverify to false in repo config.

[1] https://gerrit-review.googlesource.com/#/c/104571/
Change-Id: I2828505fa382d5730d656803259546340c6eb4cf
Signed-off-by: Jacek Centkowski <jcentkowski@collab.net>

src/main/java/com/googlesource/gerrit/plugins/lfs/HttpModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/HttpModule.java
index ee789f8..eb5132f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/HttpModule.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.lfs;
 
-import static com.google.gerrit.httpd.plugins.LfsPluginServlet.URL_REGEX;
+import static com.googlesource.gerrit.plugins.lfs.LfsApiServlet.LFS_OBJECTS_REGEX_REST;
 
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.webui.JavaScriptPlugin;
@@ -53,7 +53,7 @@
 
   @Override
   protected void configureServlets() {
-    serveRegex(URL_REGEX).with(LfsApiServlet.class);
+    serveRegex(LFS_OBJECTS_REGEX_REST).with(LfsApiServlet.class);
     populateRepository(defaultBackend);
     for (LfsBackend backend : backends.values()) {
       populateRepository(backend);

src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java
index d6b168c..4e20dd4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java
@@ -14,9 +14,10 @@
 
 package com.googlesource.gerrit.plugins.lfs;
 
+import static com.google.gerrit.extensions.api.lfs.LfsDefinitions.LFS_OBJECTS_PATH;
+import static com.google.gerrit.extensions.api.lfs.LfsDefinitions.LFS_URL_REGEX_TEMPLATE;
 import static com.google.gerrit.extensions.client.ProjectState.HIDDEN;
 import static com.google.gerrit.extensions.client.ProjectState.READ_ONLY;
-import static com.google.gerrit.httpd.plugins.LfsPluginServlet.URL_REGEX;
 
 import com.google.common.base.Strings;
 import com.google.gerrit.common.ProjectUtil;
@@ -44,10 +45,12 @@
 
 @Singleton
 public class LfsApiServlet extends LfsProtocolServlet {
-  private static final Logger log = LoggerFactory.getLogger(LfsApiServlet.class);
+  public static final String LFS_OBJECTS_REGEX_REST =
+      String.format(LFS_URL_REGEX_TEMPLATE, LFS_OBJECTS_PATH);
 
+  private static final Logger log = LoggerFactory.getLogger(LfsApiServlet.class);
   private static final long serialVersionUID = 1L;
-  private static final Pattern URL_PATTERN = Pattern.compile(URL_REGEX);
+  private static final Pattern URL_PATTERN = Pattern.compile(LFS_OBJECTS_REGEX_REST);
   private static final String DOWNLOAD = "download";
   private static final String UPLOAD = "upload";