From f7fc14f5167e849fe391ef5bc8cf531d6581dab1 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 22 Feb 2017 10:47:35 +0900 Subject: [PATCH] Format Java files with google-java-format Change-Id: I167622fbc0a83278edcf593a4db9e5a0ebe6e667 --- .../com/google/gerrit/acceptance/api/change/ChangeIT.java | 2 +- .../java/com/google/gerrit/httpd/GitOverHttpModule.java | 3 +-- .../com/google/gerrit/httpd/plugins/LfsPluginServlet.java | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index 1428709a87..0559cb0f36 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -518,7 +518,7 @@ public class ChangeIT extends AbstractDaemonTest { try { PushOneCommit.Result changeResult = - pushFactory.create(db, user.getIdent(), testRepo).to("refs/for/master"); + pushFactory.create(db, user.getIdent(), testRepo).to("refs/for/master"); String changeId = changeResult.getChangeId(); Change.Id id = changeResult.getChange().getId(); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java index bdee776086..4f97783f59 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java @@ -26,8 +26,7 @@ import javax.servlet.Filter; /** Configures Git access over HTTP with authentication. */ public class GitOverHttpModule extends ServletModule { - private static final String LFS_URL_REGEX = - "^(?:(?!/a/))" + LFS_REST; + private static final String LFS_URL_REGEX = "^(?:(?!/a/))" + LFS_REST; private final AuthConfig authConfig; private final DownloadConfig downloadConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java index 9020c6b4d1..0d3a7d55c0 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java @@ -53,10 +53,8 @@ public class LfsPluginServlet extends HttpServlet private static final long serialVersionUID = 1L; private static final Logger log = LoggerFactory.getLogger(LfsPluginServlet.class); - public static final String LFS_REST = - "(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$"; - public static final String URL_REGEX = - "^(?:/a)?" + LFS_REST; + public static final String LFS_REST = "(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$"; + public static final String URL_REGEX = "^(?:/a)?" + LFS_REST; private static final String CONTENTTYPE_VND_GIT_LFS_JSON = "application/vnd.git-lfs+json; charset=utf-8";