opendev/gerrit
Code Issues Proposed changes

Format Java files with google-java-format

Browse Source 
Change-Id: I167622fbc0a83278edcf593a4db9e5a0ebe6e667
This commit is contained in:
David Pursehouse 2017-02-22 10:47:35 +09:00
parent c31fdeb346
commit f7fc14f516
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@ -518,7 +518,7 @@ public class ChangeIT extends AbstractDaemonTest {
try { try {
PushOneCommit.Result changeResult = 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(); String changeId = changeResult.getChangeId();
Change.Id id = changeResult.getChange().getId(); Change.Id id = changeResult.getChange().getId();

3
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java
View File

@ -26,8 +26,7 @@ import javax.servlet.Filter;
/** Configures Git access over HTTP with authentication. */ /** Configures Git access over HTTP with authentication. */
public class GitOverHttpModule extends ServletModule { public class GitOverHttpModule extends ServletModule {
private static final String LFS_URL_REGEX = private static final String LFS_URL_REGEX = "^(?:(?!/a/))" + LFS_REST;
"^(?:(?!/a/))" + LFS_REST;
private final AuthConfig authConfig; private final AuthConfig authConfig;
private final DownloadConfig downloadConfig; private final DownloadConfig downloadConfig;

6
gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java
View File

@ -53,10 +53,8 @@ public class LfsPluginServlet extends HttpServlet
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(LfsPluginServlet.class); private static final Logger log = LoggerFactory.getLogger(LfsPluginServlet.class);
public static final String LFS_REST = public static final String LFS_REST = "(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$";
"(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$"; public static final String URL_REGEX = "^(?:/a)?" + LFS_REST;
public static final String URL_REGEX =
"^(?:/a)?" + LFS_REST;
private static final String CONTENTTYPE_VND_GIT_LFS_JSON = private static final String CONTENTTYPE_VND_GIT_LFS_JSON =
"application/vnd.git-lfs+json; charset=utf-8"; "application/vnd.git-lfs+json; charset=utf-8";