Merge branch 'stable-2.14'
* stable-2.14:
Adjust plugin to LFS definitions
Update bazlets to latest head of stable-2.14
Change-Id: I5a101b749ed39ff924784006aa02688147af0d9b
diff --git a/WORKSPACE b/WORKSPACE
index d424cf9..7c12869 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "8e0bb37977452a66141833370430f307e959acfb",
+ commit = "74b31c8fae3a92c6c3e46a046b57cf1d8a6549d4",
# local_path = "/home/<user>/projects/bazlets",
)
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);
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 1cb92e4..787ddf5 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 static com.google.gerrit.server.permissions.ProjectPermission.READ;
import com.google.common.base.Strings;
@@ -46,10 +47,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";
