Merge changes from topic 'notes-migration-state'
* changes:
RebuildNoteDb: Remove special handling of All-Users repo
Add enum type representing the order of NoteDb migration
Improve NotesMigration class Javadoc
diff --git a/WORKSPACE b/WORKSPACE
index 4c89dc7..8cb061e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1107,13 +1107,6 @@
version = "1.0.0",
)
-bower_archive(
- name = "polymer-resin",
- package = "polymer/polymer-resin",
- sha1 = "4a60925f44d004b593e93aca828918b15b29526b",
- version = "1.2.1-beta",
-)
-
# bower test stuff
bower_archive(
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index 33c8e6e..f8f515c 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -177,7 +177,7 @@
private final TestRule testRunner =
new TestRule() {
@Override
- public Statement apply(final Statement base, final Description description) {
+ public Statement apply(Statement base, Description description) {
return new Statement() {
@Override
public void evaluate() throws Throwable {
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
index b6547ef..987cb97 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
@@ -191,7 +191,7 @@
static final Scope REQUEST =
new Scope() {
@Override
- public <T> Provider<T> scope(final Key<T> key, final Provider<T> creator) {
+ public <T> Provider<T> scope(Key<T> key, Provider<T> creator) {
return new Provider<T>() {
@Override
public T get() {
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java
index f25ca83..72e7058 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java
@@ -58,8 +58,7 @@
}
}
- public EventRecorder(
- DynamicSet<UserScopedEventListener> eventListeners, final IdentifiedUser user) {
+ public EventRecorder(DynamicSet<UserScopedEventListener> eventListeners, IdentifiedUser user) {
recordedEvents = LinkedListMultimap.create();
eventListenerRegistration =
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java
index 7e27e67..c9a474f 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java
@@ -56,7 +56,7 @@
private static final AtomicInteger testRepoCount = new AtomicInteger();
private static final int TEST_REPO_WINDOW_DAYS = 2;
- public static void initSsh(final TestAccount a) {
+ public static void initSsh(TestAccount a) {
final Properties config = new Properties();
config.put("StrictHostKeyChecking", "no");
JSch.setConfig(config);
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java
index 0977e24..1219b0a 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java
@@ -16,7 +16,6 @@
import com.google.common.collect.Lists;
import com.google.gerrit.acceptance.InProcessProtocol.Context;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.Capable;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.reviewdb.client.Account;
@@ -32,12 +31,9 @@
import com.google.gerrit.server.git.AsyncReceiveCommits;
import com.google.gerrit.server.git.ReceiveCommits;
import com.google.gerrit.server.git.ReceivePackInitializer;
-import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.git.validators.UploadValidators;
-import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.util.RequestContext;
@@ -95,7 +91,7 @@
private static final Scope REQUEST =
new Scope() {
@Override
- public <T> Provider<T> scope(final Key<T> key, final Provider<T> creator) {
+ public <T> Provider<T> scope(Key<T> key, Provider<T> creator) {
return new Provider<T>() {
@Override
public T get() {
@@ -206,12 +202,9 @@
}
private static class Upload implements UploadPackFactory<Context> {
- private final Provider<ReviewDb> dbProvider;
private final Provider<CurrentUser> userProvider;
- private final TagCache tagCache;
- @Nullable private final SearchingChangeCacheImpl changeCache;
private final ProjectControl.GenericFactory projectControlFactory;
- private final ChangeNotes.Factory changeNotesFactory;
+ private final VisibleRefFilter.Factory refFilterFactory;
private final TransferConfig transferConfig;
private final DynamicSet<PreUploadHook> preUploadHooks;
private final UploadValidators.Factory uploadValidatorsFactory;
@@ -219,22 +212,16 @@
@Inject
Upload(
- Provider<ReviewDb> dbProvider,
Provider<CurrentUser> userProvider,
- TagCache tagCache,
- @Nullable SearchingChangeCacheImpl changeCache,
ProjectControl.GenericFactory projectControlFactory,
- ChangeNotes.Factory changeNotesFactory,
+ VisibleRefFilter.Factory refFilterFactory,
TransferConfig transferConfig,
DynamicSet<PreUploadHook> preUploadHooks,
UploadValidators.Factory uploadValidatorsFactory,
ThreadLocalRequestContext threadContext) {
- this.dbProvider = dbProvider;
this.userProvider = userProvider;
- this.tagCache = tagCache;
- this.changeCache = changeCache;
this.projectControlFactory = projectControlFactory;
- this.changeNotesFactory = changeNotesFactory;
+ this.refFilterFactory = refFilterFactory;
this.transferConfig = transferConfig;
this.preUploadHooks = preUploadHooks;
this.uploadValidatorsFactory = uploadValidatorsFactory;
@@ -242,8 +229,7 @@
}
@Override
- public UploadPack create(Context req, final Repository repo)
- throws ServiceNotAuthorizedException {
+ public UploadPack create(Context req, Repository repo) throws ServiceNotAuthorizedException {
// Set the request context, but don't bother unsetting, since we don't
// have an easy way to run code when this instance is done being used.
// Each operation is run in its own thread, so we don't need to recover
@@ -259,9 +245,7 @@
UploadPack up = new UploadPack(repo);
up.setPackConfig(transferConfig.getPackConfig());
up.setTimeout(transferConfig.getTimeout());
- up.setAdvertiseRefsHook(
- new VisibleRefFilter(
- tagCache, changeNotesFactory, changeCache, repo, ctl, dbProvider.get(), true));
+ up.setAdvertiseRefsHook(refFilterFactory.create(ctl.getProjectState(), repo));
List<PreUploadHook> hooks = Lists.newArrayList(preUploadHooks);
hooks.add(uploadValidatorsFactory.create(ctl.getProject(), repo, "localhost-test"));
up.setPreUploadHook(PreUploadHookChain.newChain(hooks));
@@ -300,8 +284,7 @@
}
@Override
- public ReceivePack create(final Context req, Repository db)
- throws ServiceNotAuthorizedException {
+ public ReceivePack create(Context req, Repository db) throws ServiceNotAuthorizedException {
// Set the request context, but don't bother unsetting, since we don't
// have an easy way to run code when this instance is done being used.
// Each operation is run in its own thread, so we don't need to recover
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
index fe1d0b7..7ab6868 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
@@ -360,7 +360,7 @@
return new Result(ref, pushHead(testRepo, ref, tag != null, force, pushOptions), c, subject);
}
- public void setTag(final Tag tag) {
+ public void setTag(Tag tag) {
this.tag = tag;
}
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 bf506ab..ae1b0cb 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
@@ -158,6 +158,16 @@
}
@Test
+ public void reflog() throws Exception {
+ // Tests are using DfsRepository which does not implement getReflogReader,
+ // so this will always fail.
+ // TODO: change this if/when DfsRepository#getReflogReader is implemented.
+ exception.expect(MethodNotAllowedException.class);
+ exception.expectMessage("reflog not supported");
+ gApi.projects().name(project.get()).branch("master").reflog();
+ }
+
+ @Test
public void get() throws Exception {
PushOneCommit.Result r = createChange();
String triplet = project.get() + "~master~" + r.getChangeId();
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
index 0ae78f6..48030eb 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
@@ -887,17 +887,28 @@
assertThat(changedFiles.get(renamedFilePath)).linesDeleted().isEqualTo(1);
}
+ /*
+ * change PS B
+ * |
+ * change PS A commit4
+ * | |
+ * commit2 commit3
+ * | /
+ * commit1 --------
+ */
@Test
- public void rebaseHunksWhenRebasingOnAnotherChangeAreIdentified() throws Exception {
+ public void rebaseHunksWhenRebasingOnAnotherChangeOrPatchSetAreIdentified() throws Exception {
ObjectId commit2 =
addCommit(commit1, FILE_NAME, FILE_CONTENT.replace("Line 5\n", "Line five\n"));
rebaseChangeOn(changeId, commit2);
String previousPatchSetId = gApi.changes().id(changeId).get().currentRevision;
- ObjectId commit3 =
- addCommit(commit1, FILE_NAME, FILE_CONTENT.replace("Line 35\n", "Line thirty five\n"));
+ String commit3FileContent = FILE_CONTENT.replace("Line 35\n", "Line thirty five\n");
+ ObjectId commit3 = addCommit(commit1, FILE_NAME, commit3FileContent);
+ ObjectId commit4 =
+ addCommit(commit3, FILE_NAME, commit3FileContent.replace("Line 60\n", "Line sixty\n"));
- rebaseChangeOn(changeId, commit3);
+ rebaseChangeOn(changeId, commit4);
Function<String, String> contentModification =
fileContent -> fileContent.replace("Line 20\n", "Line twenty\n");
addModifiedPatchSet(changeId, FILE_NAME, contentModification);
@@ -916,7 +927,11 @@
assertThat(diffInfo).content().element(5).linesOfA().containsExactly("Line 35");
assertThat(diffInfo).content().element(5).linesOfB().containsExactly("Line thirty five");
assertThat(diffInfo).content().element(5).isDueToRebase();
- assertThat(diffInfo).content().element(6).commonLines().hasSize(65);
+ assertThat(diffInfo).content().element(6).commonLines().hasSize(24);
+ assertThat(diffInfo).content().element(7).linesOfA().containsExactly("Line 60");
+ assertThat(diffInfo).content().element(7).linesOfB().containsExactly("Line sixty");
+ assertThat(diffInfo).content().element(7).isDueToRebase();
+ assertThat(diffInfo).content().element(8).commonLines().hasSize(40);
Map<String, FileInfo> changedFiles =
gApi.changes().id(changeId).current().files(previousPatchSetId);
@@ -924,6 +939,37 @@
assertThat(changedFiles.get(FILE_NAME)).linesDeleted().isEqualTo(1);
}
+ /*
+ * change PS B
+ * |
+ * change PS A commit4
+ * | |
+ * commit2 commit3
+ * | /
+ * commit1 --------
+ */
+ @Test
+ public void unrelatedFileWhenRebasingOnAnotherChangeOrPatchSetIsIgnored() throws Exception {
+ ObjectId commit2 =
+ addCommit(commit1, FILE_NAME, FILE_CONTENT.replace("Line 5\n", "Line five\n"));
+ rebaseChangeOn(changeId, commit2);
+ String previousPatchSetId = gApi.changes().id(changeId).get().currentRevision;
+
+ ObjectId commit3 =
+ addCommit(commit1, FILE_NAME2, FILE_CONTENT2.replace("2nd line\n", "Second line\n"));
+ ObjectId commit4 =
+ addCommit(commit3, FILE_NAME, FILE_CONTENT.replace("Line 60\n", "Line sixty\n"));
+
+ rebaseChangeOn(changeId, commit4);
+ Function<String, String> contentModification =
+ fileContent -> fileContent.replace("Line 20\n", "Line twenty\n");
+ addModifiedPatchSet(changeId, FILE_NAME, contentModification);
+
+ Map<String, FileInfo> changedFiles =
+ gApi.changes().id(changeId).current().files(previousPatchSetId);
+ assertThat(changedFiles.keySet()).containsExactly(COMMIT_MSG, FILE_NAME);
+ }
+
@Test
public void rebaseHunksWhenReversingPatchSetOrderAreIdentified() throws Exception {
ObjectId commit2 =
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
index f327f63..02a19c6 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
@@ -24,7 +24,6 @@
import com.google.gerrit.acceptance.AcceptanceTestRequestScope;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.common.data.Permission;
@@ -34,23 +33,16 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.git.ReceiveCommitsAdvertiseRefsHook;
-import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.notedb.ChangeNoteUtil;
import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
-import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.project.Util;
import com.google.gerrit.server.query.change.ChangeData;
-import com.google.gerrit.testutil.DisabledReviewDb;
import com.google.gerrit.testutil.TestChanges;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -68,16 +60,8 @@
@NoHttpd
public class RefAdvertisementIT extends AbstractDaemonTest {
- @Inject private ProjectControl.GenericFactory projectControlFactory;
-
- @Inject @Nullable private SearchingChangeCacheImpl changeCache;
-
- @Inject private TagCache tagCache;
-
- @Inject private Provider<CurrentUser> userProvider;
-
+ @Inject private VisibleRefFilter.Factory refFilterFactory;
@Inject private ChangeNoteUtil noteUtil;
-
@Inject @AnonymousCowardName private String anonymousCowardName;
private AccountGroup.UUID admins;
@@ -386,7 +370,7 @@
try (Repository repo = repoManager.openRepository(project)) {
assertRefs(
repo,
- new VisibleRefFilter(tagCache, notesFactory, null, repo, projectControl(), db, true),
+ refFilterFactory.create(projectCache.get(project), repo),
// Can't use stored values from the index so DB must be enabled.
false,
"HEAD",
@@ -410,12 +394,12 @@
assume().that(notesMigration.readChangeSequence()).isTrue();
try (Repository repo = repoManager.openRepository(allProjects)) {
setApiUser(user);
- assertRefs(repo, newFilter(db, repo, allProjects), true);
+ assertRefs(repo, newFilter(repo, allProjects), true);
allowGlobalCapabilities(REGISTERED_USERS, GlobalCapability.ACCESS_DATABASE);
try {
setApiUser(user);
- assertRefs(repo, newFilter(db, repo, allProjects), true, "refs/sequences/changes");
+ assertRefs(repo, newFilter(repo, allProjects), true, "refs/sequences/changes");
} finally {
removeGlobalCapabilities(REGISTERED_USERS, GlobalCapability.ACCESS_DATABASE);
}
@@ -556,17 +540,7 @@
private void assertUploadPackRefs(String... expectedWithMeta) throws Exception {
try (Repository repo = repoManager.openRepository(project)) {
assertRefs(
- repo,
- new VisibleRefFilter(
- tagCache,
- notesFactory,
- changeCache,
- repo,
- projectControl(),
- new DisabledReviewDb(),
- true),
- true,
- expectedWithMeta);
+ repo, refFilterFactory.create(projectCache.get(project), repo), true, expectedWithMeta);
}
}
@@ -602,20 +576,8 @@
}
}
- private ProjectControl projectControl() throws Exception {
- return projectControlFactory.controlFor(project, userProvider.get());
- }
-
- private VisibleRefFilter newFilter(ReviewDb db, Repository repo, Project.NameKey project)
- throws Exception {
- return new VisibleRefFilter(
- tagCache,
- notesFactory,
- null,
- repo,
- projectControlFactory.controlFor(project, userProvider.get()),
- db,
- true);
+ private VisibleRefFilter newFilter(Repository repo, Project.NameKey project) {
+ return refFilterFactory.create(projectCache.get(project), repo);
}
private static ObjectId obj(ChangeData cd, int psNum) throws Exception {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
index 6c5dabd..74412ab 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
@@ -154,7 +154,7 @@
@Test
public void submitOnPushNotAllowed_Error() throws Exception {
PushOneCommit.Result r = pushTo("refs/for/master%submit");
- r.assertErrorStatus("submit not allowed");
+ r.assertErrorStatus("update by submit not permitted");
}
@Test
@@ -166,7 +166,7 @@
push(
"refs/for/master%submit",
PushOneCommit.SUBJECT, "a.txt", "other content", r.getChangeId());
- r.assertErrorStatus("submit not allowed");
+ r.assertErrorStatus("update by submit not permitted");
}
@Test
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
index 578949a..afd20bb 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
@@ -42,9 +42,9 @@
import com.google.gerrit.extensions.common.CommitInfo;
import com.google.gerrit.extensions.common.MergeInput;
import com.google.gerrit.extensions.common.RevisionInfo;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
+import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.reviewdb.client.Branch;
@@ -192,7 +192,7 @@
ChangeInput in = newChangeInput(ChangeStatus.NEW);
in.branch = "invisible-branch";
- assertCreateFails(in, AuthException.class, "cannot upload review");
+ assertCreateFails(in, ResourceNotFoundException.class, "");
}
@Test
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
index e957c88..5f2ee6f 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
@@ -575,7 +575,7 @@
return result;
}
- private void clearGroups(final PatchSet.Id psId) throws Exception {
+ private void clearGroups(PatchSet.Id psId) throws Exception {
try (BatchUpdate bu = batchUpdateFactory.create(db, project, user(user), TimeUtil.nowTs())) {
bu.addOp(
psId.getParentKey(),
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
index 05acd5b..3964253 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
@@ -234,7 +234,7 @@
}
private PatchListKey getKey(ObjectId revisionIdA, ObjectId revisionIdB) {
- return new PatchListKey(revisionIdA, revisionIdB, Whitespace.IGNORE_NONE);
+ return PatchListKey.againstCommit(revisionIdA, revisionIdB, Whitespace.IGNORE_NONE);
}
private ObjectId getCurrentRevisionId(String changeId) throws Exception {
diff --git a/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java b/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java
index 80cffbb..9495d19 100644
--- a/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java
+++ b/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java
@@ -22,11 +22,11 @@
public class QueryParseException extends Exception {
private static final long serialVersionUID = 1L;
- public QueryParseException(final String message) {
+ public QueryParseException(String message) {
super(message);
}
- public QueryParseException(final String msg, final Throwable why) {
+ public QueryParseException(String msg, Throwable why) {
super(msg, why);
}
}
diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
index 474fa36..1283452 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
@@ -115,7 +115,7 @@
@Override
public void start() {
if (executor != null) {
- for (final H2CacheImpl<?, ?> cache : caches) {
+ for (H2CacheImpl<?, ?> cache : caches) {
executor.execute(cache::start);
@SuppressWarnings("unused")
Future<?> possiblyIgnoredError =
diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
index 8bdc410..eaa9af9 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
@@ -150,7 +150,7 @@
}
@Override
- public void put(final K key, V val) {
+ public void put(K key, V val) {
final ValueHolder<V> h = new ValueHolder<>(val);
h.created = TimeUtil.nowMs();
mem.put(key, h);
@@ -159,7 +159,7 @@
@SuppressWarnings("unchecked")
@Override
- public void invalidate(final Object key) {
+ public void invalidate(Object key) {
if (keyType.getRawType().isInstance(key) && store.mightContain((K) key)) {
executor.execute(() -> store.invalidate((K) key));
}
@@ -201,7 +201,7 @@
store.close();
}
- void prune(final ScheduledExecutorService service) {
+ void prune(ScheduledExecutorService service) {
store.prune(mem);
Calendar cal = Calendar.getInstance();
@@ -239,7 +239,7 @@
}
@Override
- public ValueHolder<V> load(final K key) throws Exception {
+ public ValueHolder<V> load(K key) throws Exception {
if (store.mightContain(key)) {
ValueHolder<V> h = store.getIfPresent(key);
if (h != null) {
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/Die.java b/gerrit-common/src/main/java/com/google/gerrit/common/Die.java
index 6a1f304..5ad5ae8 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/Die.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/Die.java
@@ -17,11 +17,11 @@
public class Die extends RuntimeException {
private static final long serialVersionUID = 1L;
- public Die(final String why) {
+ public Die(String why) {
super(why);
}
- public Die(final String why, final Throwable cause) {
+ public Die(String why, Throwable cause) {
super(why, cause);
}
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
index 4c5583f..24e3808 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
@@ -39,18 +39,18 @@
return !Arrays.equals(curVers, newVers);
}
- public static void mkdir(final File path) {
+ public static void mkdir(File path) {
if (!path.isDirectory() && !path.mkdir()) {
throw new Die("Cannot make directory " + path);
}
}
- public static void chmod(final int mode, final Path path) {
+ public static void chmod(int mode, Path path) {
// TODO(dborowitz): Is there a portable way to do this with NIO?
chmod(mode, path.toFile());
}
- public static void chmod(final int mode, final File path) {
+ public static void chmod(int mode, File path) {
path.setReadable(false, false /* all */);
path.setWritable(false, false /* all */);
path.setExecutable(false, false /* all */);
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java
index 624bcea..526e88b 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java
@@ -32,7 +32,7 @@
@GwtIncompatible("Unemulated methods in Class and OutputStream")
public final class IoUtil {
- public static void copyWithThread(final InputStream src, final OutputStream dst) {
+ public static void copyWithThread(InputStream src, OutputStream dst) {
new Thread("IoUtil-Copy") {
@Override
public void run() {
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
index 692285f..6e59284 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
@@ -55,7 +55,7 @@
return "/c/" + c + ",edit/";
}
- public static String toChange(final Change.Id c) {
+ public static String toChange(Change.Id c) {
return "/c/" + c + "/";
}
@@ -72,15 +72,15 @@
return u;
}
- public static String toChange(final PatchSet.Id ps) {
+ public static String toChange(PatchSet.Id ps) {
return "/c/" + ps.getParentKey() + "/" + ps.getId();
}
- public static String toProject(final Project.NameKey p) {
+ public static String toProject(Project.NameKey p) {
return ADMIN_PROJECTS + p.get();
}
- public static String toProjectAcceess(final Project.NameKey p) {
+ public static String toProjectAcceess(Project.NameKey p) {
return "/admin/projects/" + p.get() + ",access";
}
@@ -100,7 +100,7 @@
return toChangeQuery(op("assignee", fullname));
}
- public static String toCustomDashboard(final String params) {
+ public static String toCustomDashboard(String params) {
return "/dashboard/?" + params;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java
index 5be0878..0369bfe 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java
@@ -26,7 +26,7 @@
public class ProjectAccessUtil {
public static List<AccessSection> mergeSections(List<AccessSection> src) {
Map<String, AccessSection> map = new LinkedHashMap<>();
- for (final AccessSection section : src) {
+ for (AccessSection section : src) {
if (section.getPermissions().isEmpty()) {
continue;
}
@@ -44,21 +44,21 @@
public static List<AccessSection> removeEmptyPermissionsAndSections(
final List<AccessSection> src) {
final Set<AccessSection> sectionsToRemove = new HashSet<>();
- for (final AccessSection section : src) {
+ for (AccessSection section : src) {
final Set<Permission> permissionsToRemove = new HashSet<>();
- for (final Permission permission : section.getPermissions()) {
+ for (Permission permission : section.getPermissions()) {
if (permission.getRules().isEmpty()) {
permissionsToRemove.add(permission);
}
}
- for (final Permission permissionToRemove : permissionsToRemove) {
+ for (Permission permissionToRemove : permissionsToRemove) {
section.remove(permissionToRemove);
}
if (section.getPermissions().isEmpty()) {
sectionsToRemove.add(section);
}
}
- for (final AccessSection sectionToRemove : sectionsToRemove) {
+ for (AccessSection sectionToRemove : sectionsToRemove) {
src.remove(sectionToRemove);
}
return src;
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java
index 961f43a..f59d4a9 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java
@@ -30,7 +30,7 @@
return create(content.getBytes(UTF_8));
}
- public static RawInput create(final byte[] bytes, final String contentType) {
+ public static RawInput create(byte[] bytes, String contentType) {
Preconditions.checkNotNull(bytes);
Preconditions.checkArgument(bytes.length > 0);
return new RawInput() {
@@ -51,11 +51,11 @@
};
}
- public static RawInput create(final byte[] bytes) {
+ public static RawInput create(byte[] bytes) {
return create(bytes, "application/octet-stream");
}
- public static RawInput create(final HttpServletRequest req) {
+ public static RawInput create(HttpServletRequest req) {
return new RawInput() {
@Override
public String getContentType() {
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
index 4e14514..cfecd78 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
@@ -121,7 +121,7 @@
}
@Override
- public boolean equals(final Object obj) {
+ public boolean equals(Object obj) {
if (!super.equals(obj) || !(obj instanceof AccessSection)) {
return false;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java
index d6ddddb..788a26d 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java
@@ -31,7 +31,7 @@
* <p>This constructor should only be a last-ditch effort, when the usual account lookup has
* failed and a stale account id has been discovered in the data store.
*/
- public AccountInfo(final Account.Id id) {
+ public AccountInfo(Account.Id id) {
this.id = id;
}
@@ -40,7 +40,7 @@
*
* @param a the data store record holding the specific account details.
*/
- public AccountInfo(final Account a) {
+ public AccountInfo(Account a) {
id = a.getId();
fullName = a.getFullName();
preferredEmail = a.getPreferredEmail();
@@ -66,7 +66,7 @@
return preferredEmail;
}
- public void setPreferredEmail(final String email) {
+ public void setPreferredEmail(String email) {
preferredEmail = email;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java
index 9c34c97..e0a6569 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java
@@ -29,7 +29,7 @@
private FilenameComparator() {}
@Override
- public int compare(final String path1, final String path2) {
+ public int compare(String path1, String path2) {
if (Patch.COMMIT_MSG.equals(path1) && Patch.COMMIT_MSG.equals(path2)) {
return 0;
} else if (Patch.COMMIT_MSG.equals(path1)) {
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java
index b8e498f..0c06868 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java
@@ -29,7 +29,7 @@
return null;
}
- public static GroupDescription.Internal forAccountGroup(final AccountGroup group) {
+ public static GroupDescription.Internal forAccountGroup(AccountGroup group) {
return new GroupDescription.Internal() {
@Override
public AccountGroup.UUID getGroupUUID() {
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java
index 1f746c4..5de0aad 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java
@@ -31,7 +31,7 @@
* <p>This constructor should only be a last-ditch effort, when the usual group lookup has failed
* and a stale group id has been discovered in the data store.
*/
- public GroupInfo(final AccountGroup.UUID uuid) {
+ public GroupInfo(AccountGroup.UUID uuid) {
this.uuid = uuid;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
index 6d427e7..c90e1fd 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
@@ -274,7 +274,7 @@
return byValue.get(value);
}
- public LabelValue getValue(final PatchSetApproval ca) {
+ public LabelValue getValue(PatchSetApproval ca) {
initByValue();
return byValue.get(ca.getValue());
}
@@ -282,7 +282,7 @@
private void initByValue() {
if (byValue == null) {
byValue = new HashMap<>();
- for (final LabelValue v : values) {
+ for (LabelValue v : values) {
byValue.put(v.getValue(), v);
}
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java
index e76db30..d5891d1 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java
@@ -29,7 +29,7 @@
protected LabelTypes() {}
- public LabelTypes(final List<? extends LabelType> approvals) {
+ public LabelTypes(List<? extends LabelType> approvals) {
labelTypes = Collections.unmodifiableList(new ArrayList<>(approvals));
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java
index 93b7f90..28e47ee 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java
@@ -24,7 +24,7 @@
/** Performs replacements on strings such as <code>Hello ${user}</code>. */
public class ParameterizedString {
/** Obtain a string which has no parameters and always produces the value. */
- public static ParameterizedString asis(final String constant) {
+ public static ParameterizedString asis(String constant) {
return new ParameterizedString(new Constant(constant));
}
@@ -37,14 +37,14 @@
this(new Constant(""));
}
- private ParameterizedString(final Constant c) {
+ private ParameterizedString(Constant c) {
pattern = c.text;
rawPattern = c.text;
patternOps = Collections.<Format>singletonList(c);
parameters = Collections.emptyList();
}
- public ParameterizedString(final String pattern) {
+ public ParameterizedString(String pattern) {
final StringBuilder raw = new StringBuilder();
final List<Parameter> prs = new ArrayList<>(4);
final List<Format> ops = new ArrayList<>(4);
@@ -103,7 +103,7 @@
}
/** Convert a map of parameters into a value array for binding. */
- public String[] bind(final Map<String, String> params) {
+ public String[] bind(Map<String, String> params) {
final String[] r = new String[parameters.size()];
for (int i = 0; i < r.length; i++) {
final StringBuilder b = new StringBuilder();
@@ -114,15 +114,15 @@
}
/** Format this string by performing the variable replacements. */
- public String replace(final Map<String, String> params) {
+ public String replace(Map<String, String> params) {
final StringBuilder r = new StringBuilder();
- for (final Format f : patternOps) {
+ for (Format f : patternOps) {
f.format(r, params);
}
return r.toString();
}
- public Builder replace(final String name, final String value) {
+ public Builder replace(String name, String value) {
return new Builder().replace(name, value);
}
@@ -134,7 +134,7 @@
public final class Builder {
private final Map<String, String> params = new HashMap<>();
- public Builder replace(final String name, final String value) {
+ public Builder replace(String name, String value) {
params.put(name, value);
return this;
}
@@ -152,7 +152,7 @@
private static class Constant extends Format {
private final String text;
- Constant(final String text) {
+ Constant(String text) {
this.text = text;
}
@@ -166,7 +166,7 @@
private final String name;
private final List<Function> functions;
- Parameter(final String parameter) {
+ Parameter(String parameter) {
// "parameter[.functions...]" -> (parameter, functions...)
final List<String> names = Arrays.asList(parameter.split("\\."));
final List<Function> functs = new ArrayList<>(names.size());
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
index 6222c1b..81646fe 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
@@ -262,7 +262,7 @@
}
@Override
- public boolean equals(final Object obj) {
+ public boolean equals(Object obj) {
if (!(obj instanceof Permission)) {
return false;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java
index 9265830..27d43af 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java
@@ -278,7 +278,7 @@
}
@Override
- public boolean equals(final Object obj) {
+ public boolean equals(Object obj) {
if (!(obj instanceof PermissionRule)) {
return false;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java
index f8aa6a0..663379a 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java
@@ -46,7 +46,7 @@
}
@Override
- public boolean equals(final Object obj) {
+ public boolean equals(Object obj) {
if (!(obj instanceof RefConfigSection)) {
return false;
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java
index bac9294..05f1611 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java
@@ -22,7 +22,7 @@
protected SshHostKey() {}
- public SshHostKey(final String hi, final String hk, final String fp) {
+ public SshHostKey(String hi, String hk, String fp) {
hostIdent = hi;
hostKey = hk;
fingerprint = fp;
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java
index 8b740c3..6e3db9e 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java
@@ -22,23 +22,23 @@
public static final String MESSAGE = "Group Not Found: ";
- public NoSuchGroupException(final AccountGroup.Id key) {
+ public NoSuchGroupException(AccountGroup.Id key) {
this(key, null);
}
- public NoSuchGroupException(final AccountGroup.UUID key) {
+ public NoSuchGroupException(AccountGroup.UUID key) {
this(key, null);
}
- public NoSuchGroupException(final AccountGroup.Id key, final Throwable why) {
+ public NoSuchGroupException(AccountGroup.Id key, Throwable why) {
super(MESSAGE + key.toString(), why);
}
- public NoSuchGroupException(final AccountGroup.UUID key, final Throwable why) {
+ public NoSuchGroupException(AccountGroup.UUID key, Throwable why) {
super(MESSAGE + key.toString(), why);
}
- public NoSuchGroupException(final AccountGroup.NameKey k, final Throwable why) {
+ public NoSuchGroupException(AccountGroup.NameKey k, Throwable why) {
super(MESSAGE + k.toString(), why);
}
@@ -46,7 +46,7 @@
this(who, null);
}
- public NoSuchGroupException(String who, final Throwable why) {
+ public NoSuchGroupException(String who, Throwable why) {
super(MESSAGE + who, why);
}
}
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java
index ec8a811..16d5240 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java
@@ -20,7 +20,7 @@
public static final String MESSAGE = "Update Parent Project Failed: ";
- public UpdateParentFailedException(final String message, final Throwable why) {
+ public UpdateParentFailedException(String message, Throwable why) {
super(MESSAGE + ": " + message, why);
}
}
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java
index bf939f1..42d47cb 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java
@@ -17,6 +17,7 @@
import com.google.gerrit.extensions.restapi.BinaryResult;
import com.google.gerrit.extensions.restapi.NotImplementedException;
import com.google.gerrit.extensions.restapi.RestApiException;
+import java.util.List;
public interface BranchApi {
BranchApi create(BranchInput in) throws RestApiException;
@@ -28,6 +29,8 @@
/** Returns the content of a file from the HEAD revision. */
BinaryResult file(String path) throws RestApiException;
+ List<ReflogEntryInfo> reflog() throws RestApiException;
+
/**
* A default implementation which allows source compatibility when adding new methods to the
* interface.
@@ -52,5 +55,10 @@
public BinaryResult file(String path) {
throw new NotImplementedException();
}
+
+ @Override
+ public List<ReflogEntryInfo> reflog() {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java
new file mode 100644
index 0000000..a0984ec
--- /dev/null
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java
@@ -0,0 +1,31 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.extensions.api.projects;
+
+import com.google.gerrit.extensions.common.GitPerson;
+
+public class ReflogEntryInfo {
+ public String oldId;
+ public String newId;
+ public GitPerson who;
+ public String comment;
+
+ public ReflogEntryInfo(String oldId, String newId, GitPerson who, String comment) {
+ this.oldId = oldId;
+ this.newId = newId;
+ this.who = who;
+ this.comment = comment;
+ }
+}
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java
index 793a372..1630ff8 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java
@@ -39,7 +39,7 @@
*
* @param factory interface which specifies the bean factory method.
*/
- protected void factory(final Class<?> factory) {
+ protected void factory(Class<?> factory) {
install(new FactoryModuleBuilder().build(factory));
}
}
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java
index 926818e..5cdf267 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java
@@ -186,7 +186,7 @@
* @param item item to check whether or not it is contained.
* @return {@code true} if this set contains the given item.
*/
- public boolean contains(final T item) {
+ public boolean contains(T item) {
Iterator<T> iterator = iterator();
while (iterator.hasNext()) {
T candidate = iterator.next();
@@ -203,7 +203,7 @@
* @param item the item to add to the collection. Must not be null.
* @return handle to remove the item at a later point in time.
*/
- public RegistrationHandle add(final T item) {
+ public RegistrationHandle add(T item) {
return add(Providers.of(item));
}
@@ -213,7 +213,7 @@
* @param item the item to add to the collection. Must not be null.
* @return handle to remove the item at a later point in time.
*/
- public RegistrationHandle add(final Provider<T> item) {
+ public RegistrationHandle add(Provider<T> item) {
final AtomicReference<Provider<T>> ref = new AtomicReference<>(item);
items.add(ref);
return new RegistrationHandle() {
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java
index 5057529..50aed7d 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java
@@ -30,7 +30,7 @@
* @param item the item to add to the collection. Must not be null.
* @return handle to remove the item at a later point in time.
*/
- public RegistrationHandle put(String pluginName, String exportName, final Provider<T> item) {
+ public RegistrationHandle put(String pluginName, String exportName, Provider<T> item) {
final NamePair key = new NamePair(pluginName, exportName);
items.put(key, item);
return new RegistrationHandle() {
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
index 2d0f833..7b70c6a 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
@@ -62,7 +62,7 @@
return flashEnabled;
}
- public static void setFlashEnabled(final boolean on) {
+ public static void setFlashEnabled(boolean on) {
flashEnabled = on;
}
@@ -87,7 +87,7 @@
*
* @param str initial content
*/
- public CopyableLabel(final String str) {
+ public CopyableLabel(String str) {
this(str, true);
}
@@ -98,7 +98,7 @@
* @param showLabel if true, the content is shown, if false it is hidden from view and only the
* copy icon is displayed.
*/
- public CopyableLabel(final String str, final boolean showLabel) {
+ public CopyableLabel(String str, boolean showLabel) {
content = new FlowPanel();
initWidget(content);
@@ -111,7 +111,7 @@
textLabel.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
showTextBox();
}
});
@@ -160,7 +160,7 @@
* @param text the new preview text, should be shorter than the original text which would be
* copied to the clipboard.
*/
- public void setPreviewText(final String text) {
+ public void setPreviewText(String text) {
if (textLabel != null) {
textLabel.setText(text);
}
@@ -206,7 +206,7 @@
}
@Override
- public void setText(final String newText) {
+ public void setText(String newText) {
text = newText;
visibleLen = newText.length();
@@ -229,7 +229,7 @@
textBox.addKeyPressHandler(
new KeyPressHandler() {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
if (event.isControlKeyDown() || event.isMetaKeyDown()) {
switch (event.getCharCode()) {
case 'c':
@@ -237,7 +237,7 @@
textBox.addKeyUpHandler(
new KeyUpHandler() {
@Override
- public void onKeyUp(final KeyUpEvent event) {
+ public void onKeyUp(KeyUpEvent event) {
Scheduler.get()
.scheduleDeferred(
new Command() {
@@ -256,7 +256,7 @@
textBox.addBlurHandler(
new BlurHandler() {
@Override
- public void onBlur(final BlurEvent event) {
+ public void onBlur(BlurEvent event) {
hideTextBox();
}
});
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java
index 1066dd4..6ef5d7b 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java
@@ -38,19 +38,18 @@
}
@Override
- public ArtifactSet link(
- final TreeLogger logger, final LinkerContext context, final ArtifactSet artifacts)
+ public ArtifactSet link(final TreeLogger logger, LinkerContext context, ArtifactSet artifacts)
throws UnableToCompleteException {
final ArtifactSet returnTo = new ArtifactSet();
int index = 0;
final HashMap<String, PublicResource> css = new HashMap<>();
- for (final StandardStylesheetReference ssr :
+ for (StandardStylesheetReference ssr :
artifacts.<StandardStylesheetReference>find(StandardStylesheetReference.class)) {
css.put(ssr.getSrc(), null);
}
- for (final PublicResource pr : artifacts.<PublicResource>find(PublicResource.class)) {
+ for (PublicResource pr : artifacts.<PublicResource>find(PublicResource.class)) {
if (css.containsKey(pr.getPartialPath())) {
css.put(pr.getPartialPath(), new CssPubRsrc(name(logger, pr), pr));
}
@@ -74,8 +73,7 @@
return returnTo;
}
- private String name(final TreeLogger logger, final PublicResource r)
- throws UnableToCompleteException {
+ private String name(TreeLogger logger, PublicResource r) throws UnableToCompleteException {
byte[] out;
try (ByteArrayOutputStream tmp = new ByteArrayOutputStream();
InputStream in = r.getContents(logger)) {
@@ -105,13 +103,13 @@
private static final long serialVersionUID = 1L;
private final PublicResource src;
- CssPubRsrc(final String partialPath, final PublicResource r) {
+ CssPubRsrc(String partialPath, PublicResource r) {
super(StandardLinkerContext.class, partialPath);
src = r;
}
@Override
- public InputStream getContents(final TreeLogger logger) throws UnableToCompleteException {
+ public InputStream getContents(TreeLogger logger) throws UnableToCompleteException {
return src.getContents(logger);
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java
index 304d56e..5a4f6aa 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java
@@ -34,7 +34,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
GlobalKey.temporaryWithTimeout(set);
}
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java
index 3961313..3eac789 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java
@@ -30,7 +30,7 @@
public static final KeyPressHandler STOP_PROPAGATION =
new KeyPressHandler() {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
event.stopPropagation();
}
};
@@ -50,7 +50,7 @@
.addKeyPressHandler(
new KeyPressHandler() {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
final KeyCommandSet s = active.live;
if (s != active.all) {
active.live = active.all;
@@ -78,19 +78,19 @@
restoreGlobal =
new CloseHandler<PopupPanel>() {
@Override
- public void onClose(final CloseEvent<PopupPanel> event) {
+ public void onClose(CloseEvent<PopupPanel> event) {
active = global;
}
};
}
}
- static void temporaryWithTimeout(final KeyCommandSet s) {
+ static void temporaryWithTimeout(KeyCommandSet s) {
active.live = s;
restoreTimer.schedule(250);
}
- public static void dialog(final PopupPanel panel) {
+ public static void dialog(PopupPanel panel) {
initEvents();
initDialog();
assert panel.isShowing();
@@ -110,7 +110,7 @@
KeyDownEvent.getType());
}
- public static HandlerRegistration addApplication(final Widget widget, final KeyCommand appKey) {
+ public static HandlerRegistration addApplication(Widget widget, KeyCommand appKey) {
initEvents();
final State state = stateFor(widget);
state.add(appKey);
@@ -122,7 +122,7 @@
};
}
- public static HandlerRegistration add(final Widget widget, final KeyCommandSet cmdSet) {
+ public static HandlerRegistration add(Widget widget, KeyCommandSet cmdSet) {
initEvents();
final State state = stateFor(widget);
state.add(cmdSet);
@@ -144,7 +144,7 @@
return global;
}
- public static void filter(final KeyCommandFilter filter) {
+ public static void filter(KeyCommandFilter filter) {
active.filter(filter);
if (active != global) {
global.filter(filter);
@@ -159,7 +159,7 @@
final KeyCommandSet all;
KeyCommandSet live;
- State(final Widget r) {
+ State(Widget r) {
root = r;
app = new KeyCommandSet(KeyConstants.I.applicationSection());
@@ -171,25 +171,25 @@
live = all;
}
- void add(final KeyCommand k) {
+ void add(KeyCommand k) {
app.add(k);
all.add(k);
}
- void remove(final KeyCommand k) {
+ void remove(KeyCommand k) {
app.remove(k);
all.remove(k);
}
- void add(final KeyCommandSet s) {
+ void add(KeyCommandSet s) {
all.add(s);
}
- void remove(final KeyCommandSet s) {
+ void remove(KeyCommandSet s) {
all.remove(s);
}
- void filter(final KeyCommandFilter f) {
+ void filter(KeyCommandFilter f) {
all.filter(f);
}
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java
index 0274b9d..8222f8b 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java
@@ -27,7 +27,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
panel.hide();
}
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java
index 2e9b652..f1c92e0 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java
@@ -25,7 +25,7 @@
public static final int M_META = 4 << 16;
public static final int M_SHIFT = 8 << 16;
- public static boolean same(final KeyCommand a, final KeyCommand b) {
+ public static boolean same(KeyCommand a, KeyCommand b) {
return a.getClass() == b.getClass() && a.helpText.equals(b.helpText) && a.sibling == b.sibling;
}
@@ -33,11 +33,11 @@
private final String helpText;
KeyCommand sibling;
- public KeyCommand(final int mask, final int key, final String help) {
+ public KeyCommand(int mask, int key, String help) {
this(mask, (char) key, help);
}
- public KeyCommand(final int mask, final char key, final String help) {
+ public KeyCommand(int mask, char key, String help) {
assert help != null;
keyMask = mask | key;
helpText = help;
@@ -88,12 +88,12 @@
return b;
}
- private void modifier(final SafeHtmlBuilder b, final String name) {
+ private void modifier(SafeHtmlBuilder b, String name) {
namedKey(b, name);
b.append(" + ");
}
- private void namedKey(final SafeHtmlBuilder b, final String name) {
+ private void namedKey(SafeHtmlBuilder b, String name) {
b.append('<');
b.openSpan();
b.setStyleName(KeyResources.I.css().helpKey());
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
index 734dd4e..90aa419 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
@@ -33,7 +33,7 @@
this("");
}
- public KeyCommandSet(final String setName) {
+ public KeyCommandSet(String setName) {
map = new HashMap<>();
name = setName;
}
@@ -42,7 +42,7 @@
return name;
}
- public void setName(final String setName) {
+ public void setName(String setName) {
assert setName != null;
name = setName;
}
@@ -62,7 +62,7 @@
b.sibling = a;
}
- public void add(final KeyCommand k) {
+ public void add(KeyCommand k) {
assert !map.containsKey(k.keyMask)
: "Key " + k.describeKeyStroke().asString() + " already registered";
if (!map.containsKey(k.keyMask)) {
@@ -70,38 +70,38 @@
}
}
- public void remove(final KeyCommand k) {
+ public void remove(KeyCommand k) {
assert map.get(k.keyMask) == k;
map.remove(k.keyMask);
}
- public void add(final KeyCommandSet set) {
+ public void add(KeyCommandSet set) {
if (sets == null) {
sets = new ArrayList<>();
}
assert !sets.contains(set);
sets.add(set);
- for (final KeyCommand k : set.map.values()) {
+ for (KeyCommand k : set.map.values()) {
add(k);
}
}
- public void remove(final KeyCommandSet set) {
+ public void remove(KeyCommandSet set) {
assert sets != null;
assert sets.contains(set);
sets.remove(set);
- for (final KeyCommand k : set.map.values()) {
+ for (KeyCommand k : set.map.values()) {
remove(k);
}
}
- public void filter(final KeyCommandFilter filter) {
+ public void filter(KeyCommandFilter filter) {
if (sets != null) {
- for (final KeyCommandSet s : sets) {
+ for (KeyCommandSet s : sets) {
s.filter(filter);
}
}
- for (final Iterator<KeyCommand> i = map.values().iterator(); i.hasNext(); ) {
+ for (Iterator<KeyCommand> i = map.values().iterator(); i.hasNext(); ) {
final KeyCommand kc = i.next();
if (!filter.include(kc)) {
i.remove();
@@ -120,7 +120,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
final KeyCommand k = map.get(toMask(event));
if (k != null) {
event.preventDefault();
@@ -129,7 +129,7 @@
}
}
- static int toMask(final KeyPressEvent event) {
+ static int toMask(KeyPressEvent event) {
int mask = event.getUnicodeCharCode();
if (mask == 0) {
mask = event.getNativeEvent().getKeyCode();
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java
index 0ec9d10..1318125 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java
@@ -51,7 +51,7 @@
closer.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
hide();
}
});
@@ -84,7 +84,7 @@
}
@Override
- public void setVisible(final boolean show) {
+ public void setVisible(boolean show) {
super.setVisible(show);
if (show) {
focus.setFocus(true);
@@ -92,7 +92,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
if (KeyCommandSet.toMask(event) == ShowHelpCommand.INSTANCE.keyMask) {
// Block the '?' key from triggering us to show right after
// we just hide ourselves.
@@ -104,16 +104,16 @@
}
@Override
- public void onKeyDown(final KeyDownEvent event) {
+ public void onKeyDown(KeyDownEvent event) {
if (event.getNativeKeyCode() == KeyCodes.KEY_ESCAPE) {
hide();
}
}
- private void populate(final Grid lists) {
+ private void populate(Grid lists) {
int[] end = new int[5];
int column = 0;
- for (final KeyCommandSet set : combinedSetsByName()) {
+ for (KeyCommandSet set : combinedSetsByName()) {
int row = end[column];
row = formatGroup(lists, row, column, set);
end[column] = row;
@@ -131,7 +131,7 @@
*/
private static Collection<KeyCommandSet> combinedSetsByName() {
LinkedHashMap<String, KeyCommandSet> byName = new LinkedHashMap<>();
- for (final KeyCommandSet set : GlobalKey.active.all.getSets()) {
+ for (KeyCommandSet set : GlobalKey.active.all.getSets()) {
KeyCommandSet v = byName.get(set.getName());
if (v == null) {
v = new KeyCommandSet(set.getName());
@@ -142,7 +142,7 @@
return byName.values();
}
- private int formatGroup(final Grid lists, int row, final int col, final KeyCommandSet set) {
+ private int formatGroup(Grid lists, int row, int col, KeyCommandSet set) {
if (set.isEmpty()) {
return row;
}
@@ -157,8 +157,7 @@
return formatKeys(lists, row, col, set, null);
}
- private int formatKeys(
- final Grid lists, int row, final int col, final KeyCommandSet set, final SafeHtml prefix) {
+ private int formatKeys(final Grid lists, int row, int col, KeyCommandSet set, SafeHtml prefix) {
final CellFormatter fmt = lists.getCellFormatter();
final List<KeyCommand> keys = sort(set);
if (lists.getRowCount() < row + keys.size()) {
@@ -228,7 +227,7 @@
return row;
}
- private List<KeyCommand> sort(final KeyCommandSet set) {
+ private List<KeyCommand> sort(KeyCommandSet set) {
final List<KeyCommand> keys = new ArrayList<>(set.getKeys());
Collections.sort(
keys,
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java
index 86402e1..1392675 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java
@@ -22,7 +22,7 @@
addKeyPressHandler(GlobalKey.STOP_PROPAGATION);
}
- public NpTextBox(final Element element) {
+ public NpTextBox(Element element) {
super(element);
addKeyPressHandler(GlobalKey.STOP_PROPAGATION);
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java
index c2272c5..08217f4 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java
@@ -40,7 +40,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
if (current != null) {
// Already open? Close the dialog.
//
@@ -52,7 +52,7 @@
help.addCloseHandler(
new CloseHandler<PopupPanel>() {
@Override
- public void onClose(final CloseEvent<PopupPanel> event) {
+ public void onClose(CloseEvent<PopupPanel> event) {
current = null;
BUS.fireEvent(new FocusEvent() {});
}
@@ -61,7 +61,7 @@
help.setPopupPositionAndShow(
new PositionCallback() {
@Override
- public void setPosition(final int pWidth, final int pHeight) {
+ public void setPosition(int pWidth, int pHeight) {
final int left = (Window.getClientWidth() - pWidth) >> 1;
final int wLeft = Window.getScrollLeft();
final int wTop = Window.getScrollTop();
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java
index bc18323..f133e4d 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java
@@ -41,7 +41,7 @@
}
/** Create a bar displaying the specified message. */
- public ProgressBar(final String text) {
+ public ProgressBar(String text) {
if (text == null || text.length() == 0) {
callerText = "";
} else {
@@ -68,7 +68,7 @@
}
/** Update the bar's percent completion. */
- public void setValue(final int pComplete) {
+ public void setValue(int pComplete) {
assert 0 <= pComplete && pComplete <= 100;
value = pComplete;
bar.setWidth(2 * pComplete + "px");
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java
index eb141f15..c93a78b 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java
@@ -38,7 +38,7 @@
private Tag tag = ANY;
private int live;
- void reset(final String tagName) {
+ void reset(String tagName) {
tag = TAGS.get(tagName.toLowerCase());
if (tag == null) {
tag = ANY;
@@ -46,7 +46,7 @@
live = 0;
}
- void onto(final Buffer raw, final SafeHtmlBuilder esc) {
+ void onto(Buffer raw, SafeHtmlBuilder esc) {
for (int i = 0; i < live; i++) {
final String v = values.get(i);
if (v.length() > 0) {
@@ -70,7 +70,7 @@
return "";
}
- void set(String name, final String value) {
+ void set(String name, String value) {
name = name.toLowerCase();
tag.assertSafe(name, value);
@@ -91,7 +91,7 @@
}
}
- private static void assertNotJavascriptUrl(final String value) {
+ private static void assertNotJavascriptUrl(String value) {
if (value.startsWith("#")) {
// common in GWT, and safe, so bypass further checks
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java
index 83abd5d..c6e1d30 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java
@@ -22,37 +22,37 @@
}
@Override
- public void append(final boolean v) {
+ public void append(boolean v) {
strbuf.append(v);
}
@Override
- public void append(final char v) {
+ public void append(char v) {
strbuf.append(v);
}
@Override
- public void append(final int v) {
+ public void append(int v) {
strbuf.append(v);
}
@Override
- public void append(final long v) {
+ public void append(long v) {
strbuf.append(v);
}
@Override
- public void append(final float v) {
+ public void append(float v) {
strbuf.append(v);
}
@Override
- public void append(final double v) {
+ public void append(double v) {
strbuf.append(v);
}
@Override
- public void append(final String v) {
+ public void append(String v) {
strbuf.append(v);
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java
index e3aed55..bdd9801 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java
@@ -17,42 +17,42 @@
final class BufferSealElement implements Buffer {
private final SafeHtmlBuilder shb;
- BufferSealElement(final SafeHtmlBuilder safeHtmlBuilder) {
+ BufferSealElement(SafeHtmlBuilder safeHtmlBuilder) {
shb = safeHtmlBuilder;
}
@Override
- public void append(final boolean v) {
+ public void append(boolean v) {
shb.sealElement().append(v);
}
@Override
- public void append(final char v) {
+ public void append(char v) {
shb.sealElement().append(v);
}
@Override
- public void append(final double v) {
+ public void append(double v) {
shb.sealElement().append(v);
}
@Override
- public void append(final float v) {
+ public void append(float v) {
shb.sealElement().append(v);
}
@Override
- public void append(final int v) {
+ public void append(int v) {
shb.sealElement().append(v);
}
@Override
- public void append(final long v) {
+ public void append(long v) {
shb.sealElement().append(v);
}
@Override
- public void append(final String v) {
+ public void append(String v) {
shb.sealElement().append(v);
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
index 25cad1d..ef80cdb 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
@@ -45,11 +45,11 @@
request,
new Callback() {
@Override
- public void onSuggestionsReady(final Request request, final Response response) {
+ public void onSuggestionsReady(Request request, Response response) {
final String qpat = getQueryPattern(request.getQuery());
final boolean html = isHTML();
final ArrayList<Suggestion> r = new ArrayList<>();
- for (final Suggestion s : response.getSuggestions()) {
+ for (Suggestion s : response.getSuggestions()) {
r.add(new BoldSuggestion(qpat, s, html));
}
cb.onSuggestionsReady(request, new Response(r));
@@ -57,7 +57,7 @@
});
}
- protected String getQueryPattern(final String query) {
+ protected String getQueryPattern(String query) {
return query;
}
@@ -77,7 +77,7 @@
private final Suggestion suggestion;
private final String displayString;
- BoldSuggestion(final String qstr, final Suggestion s, final boolean html) {
+ BoldSuggestion(String qstr, Suggestion s, boolean html) {
suggestion = s;
String ds = s.getDisplayString();
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
index 9161652a..2a1ddc0 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
@@ -79,17 +79,17 @@
}
/** @return the existing HTML property of a widget. */
- public static SafeHtml get(final HasHTML t) {
+ public static SafeHtml get(HasHTML t) {
return new SafeHtmlString(t.getHTML());
}
/** @return the existing HTML text, wrapped in a safe buffer. */
- public static SafeHtml asis(final String htmlText) {
+ public static SafeHtml asis(String htmlText) {
return new SafeHtmlString(htmlText);
}
/** Set the HTML property of a widget. */
- public static <T extends HasHTML> T set(final T e, final SafeHtml str) {
+ public static <T extends HasHTML> T set(T e, SafeHtml str) {
e.setHTML(str.asString());
return e;
}
@@ -106,13 +106,12 @@
}
/** @return the existing inner HTML of a table cell. */
- public static SafeHtml get(final HTMLTable t, final int row, final int col) {
+ public static SafeHtml get(HTMLTable t, int row, int col) {
return new SafeHtmlString(t.getHTML(row, col));
}
/** Set the inner HTML of a table cell. */
- public static <T extends HTMLTable> T set(
- final T t, final int row, final int col, final SafeHtml str) {
+ public static <T extends HTMLTable> T set(final T t, int row, int col, SafeHtml str) {
t.setHTML(row, col, str.asString());
return t;
}
@@ -140,13 +139,13 @@
*/
public SafeHtml wikify() {
final SafeHtmlBuilder r = new SafeHtmlBuilder();
- for (final String p : linkify().asString().split("\n\n")) {
+ for (String p : linkify().asString().split("\n\n")) {
if (isQuote(p)) {
wikifyQuote(r, p);
} else if (isPreFormat(p)) {
r.openElement("p");
- for (final String line : p.split("\n")) {
+ for (String line : p.split("\n")) {
r.openSpan();
r.setStyleName(RESOURCES.css().wikiPreFormat());
r.append(asis(line));
@@ -167,7 +166,7 @@
return r.toSafeHtml();
}
- private void wikifyList(final SafeHtmlBuilder r, final String p) {
+ private void wikifyList(SafeHtmlBuilder r, String p) {
boolean in_ul = false;
boolean in_p = false;
for (String line : p.split("\n")) {
@@ -232,11 +231,11 @@
return p.startsWith("> ") || p.startsWith(" > ");
}
- private static boolean isPreFormat(final String p) {
+ private static boolean isPreFormat(String p) {
return p.contains("\n ") || p.contains("\n\t") || p.startsWith(" ") || p.startsWith("\t");
}
- private static boolean isList(final String p) {
+ private static boolean isList(String p) {
return p.contains("\n- ") || p.contains("\n* ") || p.startsWith("- ") || p.startsWith("* ");
}
@@ -252,7 +251,7 @@
* {@code $<i>n</i>}.
* @return a new string, after the replacement has been made.
*/
- public SafeHtml replaceFirst(final String regex, final String repl) {
+ public SafeHtml replaceFirst(String regex, String repl) {
return new SafeHtmlString(asString().replaceFirst(regex, repl));
}
@@ -268,7 +267,7 @@
* {@code $<i>n</i>}.
* @return a new string, after the replacements have been made.
*/
- public SafeHtml replaceAll(final String regex, final String repl) {
+ public SafeHtml replaceAll(String regex, String repl) {
return new SafeHtmlString(asString().replaceAll(regex, repl));
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java
index f54149b..a926906 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java
@@ -49,12 +49,12 @@
return !isEmpty();
}
- public SafeHtmlBuilder append(final boolean in) {
+ public SafeHtmlBuilder append(boolean in) {
cb.append(in);
return this;
}
- public SafeHtmlBuilder append(final char in) {
+ public SafeHtmlBuilder append(char in) {
switch (in) {
case '&':
cb.append("&");
@@ -83,22 +83,22 @@
return this;
}
- public SafeHtmlBuilder append(final int in) {
+ public SafeHtmlBuilder append(int in) {
cb.append(in);
return this;
}
- public SafeHtmlBuilder append(final long in) {
+ public SafeHtmlBuilder append(long in) {
cb.append(in);
return this;
}
- public SafeHtmlBuilder append(final float in) {
+ public SafeHtmlBuilder append(float in) {
cb.append(in);
return this;
}
- public SafeHtmlBuilder append(final double in) {
+ public SafeHtmlBuilder append(double in) {
cb.append(in);
return this;
}
@@ -112,7 +112,7 @@
}
/** Append already safe HTML as-is, avoiding double escaping. */
- public SafeHtmlBuilder append(final SafeHtml in) {
+ public SafeHtmlBuilder append(SafeHtml in) {
if (in != null) {
cb.append(in.asString());
}
@@ -120,7 +120,7 @@
}
/** Append the string, escaping unsafe characters. */
- public SafeHtmlBuilder append(final String in) {
+ public SafeHtmlBuilder append(String in) {
if (in != null) {
impl.escapeStr(this, in);
}
@@ -128,7 +128,7 @@
}
/** Append the string, escaping unsafe characters. */
- public SafeHtmlBuilder append(final StringBuilder in) {
+ public SafeHtmlBuilder append(StringBuilder in) {
if (in != null) {
append(in.toString());
}
@@ -136,7 +136,7 @@
}
/** Append the string, escaping unsafe characters. */
- public SafeHtmlBuilder append(final StringBuffer in) {
+ public SafeHtmlBuilder append(StringBuffer in) {
if (in != null) {
append(in.toString());
}
@@ -144,7 +144,7 @@
}
/** Append the result of toString(), escaping unsafe characters. */
- public SafeHtmlBuilder append(final Object in) {
+ public SafeHtmlBuilder append(Object in) {
if (in != null) {
append(in.toString());
}
@@ -152,7 +152,7 @@
}
/** Append the string, escaping unsafe characters. */
- public SafeHtmlBuilder append(final CharSequence in) {
+ public SafeHtmlBuilder append(CharSequence in) {
if (in != null) {
escapeCS(this, in);
}
@@ -167,7 +167,7 @@
*
* @param tagName name of the HTML element to open.
*/
- public SafeHtmlBuilder openElement(final String tagName) {
+ public SafeHtmlBuilder openElement(String tagName) {
assert isElementName(tagName);
cb.append("<");
cb.append(tagName);
@@ -187,7 +187,7 @@
* @return the attribute value, as a string. The empty string if the attribute has not been
* assigned a value. The returned string is the raw (unescaped) value.
*/
- public String getAttribute(final String name) {
+ public String getAttribute(String name) {
assert isAttributeName(name);
assert cb == sBuf;
return att.get(name);
@@ -200,7 +200,7 @@
* @param value value to assign; any existing value is replaced. The value is escaped (if
* necessary) during the assignment.
*/
- public SafeHtmlBuilder setAttribute(final String name, final String value) {
+ public SafeHtmlBuilder setAttribute(String name, String value) {
assert isAttributeName(name);
assert cb == sBuf;
att.set(name, value != null ? value : "");
@@ -213,7 +213,7 @@
* @param name name of the attribute to set.
* @param value value to assign, any existing value is replaced.
*/
- public SafeHtmlBuilder setAttribute(final String name, final int value) {
+ public SafeHtmlBuilder setAttribute(String name, int value) {
return setAttribute(name, String.valueOf(value));
}
@@ -227,7 +227,7 @@
* @param name name of the attribute to append onto.
* @param value additional value to append.
*/
- public SafeHtmlBuilder appendAttribute(final String name, String value) {
+ public SafeHtmlBuilder appendAttribute(String name, String value) {
if (value != null && value.length() > 0) {
final String e = getAttribute(name);
return setAttribute(name, e.length() > 0 ? e + " " + value : value);
@@ -236,17 +236,17 @@
}
/** Set the height attribute of the current element. */
- public SafeHtmlBuilder setHeight(final int height) {
+ public SafeHtmlBuilder setHeight(int height) {
return setAttribute("height", height);
}
/** Set the width attribute of the current element. */
- public SafeHtmlBuilder setWidth(final int width) {
+ public SafeHtmlBuilder setWidth(int width) {
return setAttribute("width", width);
}
/** Set the CSS class name for this element. */
- public SafeHtmlBuilder setStyleName(final String style) {
+ public SafeHtmlBuilder setStyleName(String style) {
assert isCssName(style);
return setAttribute("class", style);
}
@@ -256,7 +256,7 @@
*
* <p>If no CSS class name has been specified yet, this method initializes it to the single name.
*/
- public SafeHtmlBuilder addStyleName(final String style) {
+ public SafeHtmlBuilder addStyleName(String style) {
assert isCssName(style);
return appendAttribute("class", style);
}
@@ -281,7 +281,7 @@
}
/** Append a closing tag for the named element. */
- public SafeHtmlBuilder closeElement(final String name) {
+ public SafeHtmlBuilder closeElement(String name) {
assert isElementName(name);
cb.append("</");
cb.append(name);
@@ -362,7 +362,7 @@
}
/** Append "<param name=... value=... />". */
- public SafeHtmlBuilder paramElement(final String name, final String value) {
+ public SafeHtmlBuilder paramElement(String name, String value) {
openElement("param");
setAttribute("name", name);
setAttribute("value", value);
@@ -379,21 +379,21 @@
return cb.toString();
}
- private static void escapeCS(final SafeHtmlBuilder b, final CharSequence in) {
+ private static void escapeCS(SafeHtmlBuilder b, CharSequence in) {
for (int i = 0; i < in.length(); i++) {
b.append(in.charAt(i));
}
}
- private static boolean isElementName(final String name) {
+ private static boolean isElementName(String name) {
return name.matches("^[a-zA-Z][a-zA-Z0-9_-]*$");
}
- private static boolean isAttributeName(final String name) {
+ private static boolean isAttributeName(String name) {
return isElementName(name);
}
- private static boolean isCssName(final String name) {
+ private static boolean isCssName(String name) {
return isElementName(name);
}
@@ -403,14 +403,14 @@
private static class ServerImpl extends Impl {
@Override
- void escapeStr(final SafeHtmlBuilder b, final String in) {
+ void escapeStr(SafeHtmlBuilder b, String in) {
SafeHtmlBuilder.escapeCS(b, in);
}
}
private static class ClientImpl extends Impl {
@Override
- void escapeStr(final SafeHtmlBuilder b, final String in) {
+ void escapeStr(SafeHtmlBuilder b, String in) {
b.cb.append(escape(in));
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java
index 57392bf..889509a 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java
@@ -18,7 +18,7 @@
class SafeHtmlString extends SafeHtml {
private final String html;
- SafeHtmlString(final String h) {
+ SafeHtmlString(String h) {
html = h;
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java
index 4e39c1f..571f72d 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java
@@ -48,14 +48,13 @@
*/
public class CacheControlFilter implements Filter {
@Override
- public void init(final FilterConfig config) {}
+ public void init(FilterConfig config) {}
@Override
public void destroy() {}
@Override
- public void doFilter(
- final ServletRequest sreq, final ServletResponse srsp, final FilterChain chain)
+ public void doFilter(final ServletRequest sreq, ServletResponse srsp, FilterChain chain)
throws IOException, ServletException {
final HttpServletRequest req = (HttpServletRequest) sreq;
final HttpServletResponse rsp = (HttpServletResponse) srsp;
@@ -70,7 +69,7 @@
chain.doFilter(req, rsp);
}
- private static boolean cacheForever(final String pathInfo, final HttpServletRequest req) {
+ private static boolean cacheForever(String pathInfo, HttpServletRequest req) {
if (pathInfo.endsWith(".cache.html")
|| pathInfo.endsWith(".cache.gif")
|| pathInfo.endsWith(".cache.png")
@@ -87,14 +86,14 @@
return false;
}
- private static boolean nocache(final String pathInfo) {
+ private static boolean nocache(String pathInfo) {
if (pathInfo.endsWith(".nocache.js")) {
return true;
}
return false;
}
- private static String pathInfo(final HttpServletRequest req) {
+ private static String pathInfo(HttpServletRequest req) {
final String uri = req.getRequestURI();
final String ctx = req.getContextPath();
return uri.startsWith(ctx) ? uri.substring(ctx.length()) : uri;
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java
index 7c165e5..fdaf861 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java
@@ -28,11 +28,11 @@
this(false);
}
- public AutoCenterDialogBox(final boolean autoHide) {
+ public AutoCenterDialogBox(boolean autoHide) {
this(autoHide, true);
}
- public AutoCenterDialogBox(final boolean autoHide, final boolean modal) {
+ public AutoCenterDialogBox(boolean autoHide, boolean modal) {
super(autoHide, modal);
}
@@ -43,7 +43,7 @@
Window.addResizeHandler(
new ResizeHandler() {
@Override
- public void onResize(final ResizeEvent event) {
+ public void onResize(ResizeEvent event) {
final int w = event.getWidth();
final int h = event.getHeight();
AutoCenterDialogBox.this.onResize(w, h);
@@ -71,7 +71,7 @@
* @param width new browser window width
* @param height new browser window height
*/
- protected void onResize(final int width, final int height) {
+ protected void onResize(int width, int height) {
if (isAttached()) {
center();
}
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/ViewSite.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/ViewSite.java
index ca712c3..4614546 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/ViewSite.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/ViewSite.java
@@ -51,7 +51,7 @@
*
* @param view the next view to display.
*/
- public void setView(final V view) {
+ public void setView(V view) {
if (next != null) {
main.remove(next);
}
@@ -67,10 +67,10 @@
*
* @param view the view being displayed.
*/
- protected void onShowView(final V view) {}
+ protected void onShowView(V view) {}
@SuppressWarnings("unchecked")
- final void swap(final View v) {
+ final void swap(View v) {
if (next != null && next.getWidget() == v) {
if (current != null) {
main.remove(current);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
index 17b0a4d..9a2dbe3 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
@@ -280,11 +280,11 @@
new SafeHtmlBuilder().openElement("form").setAttribute("action", href);
}
- private static String escape(final char c) {
+ private static String escape(char c) {
return new SafeHtmlBuilder().append(c).asString();
}
- private static String escape(final String c) {
+ private static String escape(String c) {
return new SafeHtmlBuilder().append(c).asString();
}
}
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java
index 32f79d7..4df2f5f 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java
@@ -90,7 +90,7 @@
}
/** Format a date using the locale's medium length format. */
- public String mediumFormat(final Date dt) {
+ public String mediumFormat(Date dt) {
if (dt == null) {
return "";
}
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java
index 43ff60c..4b17068 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java
@@ -40,7 +40,7 @@
/** Loop through the result map and set asProperty on the children. */
public static <T extends JavaScriptObject, M extends NativeMap<T>>
- AsyncCallback<M> copyKeysIntoChildren(final String asProperty, AsyncCallback<M> callback) {
+ AsyncCallback<M> copyKeysIntoChildren(String asProperty, AsyncCallback<M> callback) {
return new TransformCallback<M, M>(callback) {
@Override
protected M transform(M result) {
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java
index a4b90c3..e0bca0e 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java
@@ -38,7 +38,7 @@
public native String asString() /*-{ return this.s; }-*/;
- public static AsyncCallback<NativeString> unwrap(final AsyncCallback<String> cb) {
+ public static AsyncCallback<NativeString> unwrap(AsyncCallback<String> cb) {
return new AsyncCallback<NativeString>() {
@Override
public void onSuccess(NativeString result) {
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java
index ebaa63b..1421386 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java
@@ -35,7 +35,7 @@
return Collections.emptySet();
}
- public static List<String> asList(final JsArrayString arr) {
+ public static List<String> asList(JsArrayString arr) {
if (arr == null) {
return null;
}
@@ -59,7 +59,7 @@
};
}
- public static <T extends JavaScriptObject> List<T> asList(final JsArray<T> arr) {
+ public static <T extends JavaScriptObject> List<T> asList(JsArray<T> arr) {
if (arr == null) {
return null;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java
index 58865fa..438df34 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java
@@ -29,7 +29,7 @@
private Button okButton;
public ConfirmationDialog(
- final String dialogTitle, final SafeHtml message, final ConfirmationCallback callback) {
+ final String dialogTitle, SafeHtml message, ConfirmationCallback callback) {
super(/* auto hide */ false, /* modal */ true);
setGlassEnabled(true);
setText(dialogTitle);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
index e4dc40d..0081783 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
@@ -170,7 +170,7 @@
return p.toString();
}
- public static String toGroup(final AccountGroup.Id id) {
+ public static String toGroup(AccountGroup.Id id) {
return ADMIN_GROUPS + id.toString();
}
@@ -293,7 +293,7 @@
return r;
}
- private static void dashboard(final String token) {
+ private static void dashboard(String token) {
String rest = skip(token);
if (rest.matches("[0-9]+")) {
Gerrit.display(token, new AccountDashboardScreen(Account.Id.parse(rest)));
@@ -319,7 +319,7 @@
Gerrit.display(token, new NotFoundScreen());
}
- private static void projects(final String token) {
+ private static void projects(String token) {
String rest = skip(token);
int c = rest.indexOf(DASHBOARDS);
if (0 <= c) {
@@ -366,7 +366,7 @@
Gerrit.display(token, new NotFoundScreen());
}
- private static void change(final String token) {
+ private static void change(String token) {
String rest = skip(token);
int c = rest.lastIndexOf(',');
String panel = null;
@@ -456,7 +456,7 @@
return new PatchSet.Id(id, psIdStr.equals("edit") ? 0 : Integer.parseInt(psIdStr));
}
- private static void extension(final String token) {
+ private static void extension(String token) {
ExtensionScreen view = new ExtensionScreen(skip(token));
if (view.isFound()) {
Gerrit.display(token, view);
@@ -533,7 +533,7 @@
});
}
- private static void codemirrorForEdit(final String token, final Patch.Key id, final int line) {
+ private static void codemirrorForEdit(String token, Patch.Key id, int line) {
GWT.runAsync(
new AsyncSplit(token) {
@Override
@@ -839,7 +839,7 @@
}
}
- private static void docSearch(final String token) {
+ private static void docSearch(String token) {
GWT.runAsync(
new AsyncSplit(token) {
@Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java
index e880712..d793082 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java
@@ -86,19 +86,19 @@
}
/** Create a dialog box to show a single message string. */
- public ErrorDialog(final String message) {
+ public ErrorDialog(String message) {
this();
body.add(new Label(message));
}
/** Create a dialog box to show a single message string. */
- public ErrorDialog(final SafeHtml message) {
+ public ErrorDialog(SafeHtml message) {
this();
body.add(message.toBlockWidget());
}
/** Create a dialog box to nicely format an exception. */
- public ErrorDialog(final Throwable what) {
+ public ErrorDialog(Throwable what) {
this();
String hdr;
@@ -151,7 +151,7 @@
}
}
- public ErrorDialog setText(final String t) {
+ public ErrorDialog setText(String t) {
text.setText(t);
return this;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index 751302e..e02c4e0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -170,7 +170,7 @@
*
* @param token location to parse, load, and render.
*/
- public static void display(final String token) {
+ public static void display(String token) {
if (body.getView() == null || !body.getView().displayToken(token)) {
dispatcher.display(token);
updateUiLink(token);
@@ -191,7 +191,7 @@
* @param token location that refers to {@code view}.
* @param view the view to load.
*/
- public static void display(final String token, final Screen view) {
+ public static void display(String token, Screen view) {
if (view.isRequiresSignIn() && !isSignedIn()) {
doSignIn(token);
} else {
@@ -217,7 +217,7 @@
*
* @param token new location that is already visible.
*/
- public static void updateImpl(final String token) {
+ public static void updateImpl(String token) {
History.newItem(token, false);
dispatchHistoryHooks(token);
}
@@ -226,7 +226,7 @@
searchPanel.setText(query);
}
- public static void setWindowTitle(final Screen screen, final String text) {
+ public static void setWindowTitle(Screen screen, String text) {
if (screen == body.getView()) {
if (text == null || text.length() == 0) {
Window.setTitle(M.windowTitle1(myHost));
@@ -428,7 +428,7 @@
}
@Override
- public String decode(final String e) {
+ public String decode(String e) {
return URL.decodeQueryString(e);
}
@@ -476,7 +476,7 @@
cbg.addFinal(
new GerritCallback<HostPageData>() {
@Override
- public void onSuccess(final HostPageData result) {
+ public void onSuccess(HostPageData result) {
Document.get().getElementById("gerrit_hostpagedata").removeFromParent();
myTheme = result.theme;
isNoteDbEnabled = result.isNoteDbEnabled;
@@ -957,7 +957,7 @@
return docSearch;
}
- private static void getDocIndex(final AsyncCallback<DocInfo> cb) {
+ private static void getDocIndex(AsyncCallback<DocInfo> cb) {
RequestBuilder req = new RequestBuilder(RequestBuilder.HEAD, GWT.getHostPageBaseURL() + INDEX);
req.setCallback(
new RequestCallback() {
@@ -1031,22 +1031,21 @@
menuRight.add(fp);
}
- private static Anchor anchor(final String text, final String to) {
+ private static Anchor anchor(String text, String to) {
final Anchor a = new Anchor(text, to);
a.setStyleName(RESOURCES.css().menuItem());
Roles.getMenuitemRole().set(a.getElement());
return a;
}
- private static LinkMenuItem addLink(
- final LinkMenuBar m, final String text, final String historyToken) {
+ private static LinkMenuItem addLink(final LinkMenuBar m, String text, String historyToken) {
LinkMenuItem i = new LinkMenuItem(text, historyToken);
m.addItem(i);
return i;
}
private static void insertLink(
- final LinkMenuBar m, final String text, final String historyToken, final int beforeIndex) {
+ final LinkMenuBar m, String text, String historyToken, int beforeIndex) {
m.insertItem(new LinkMenuItem(text, historyToken), beforeIndex);
}
@@ -1090,7 +1089,7 @@
return i;
}
- private static void addDocLink(final LinkMenuBar m, final String text, final String href) {
+ private static void addDocLink(LinkMenuBar m, String text, String href) {
final Anchor atag = anchor(text, docUrl + href);
atag.setTarget("_blank");
m.add(atag);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java
index b8195805..cc05e12 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java
@@ -37,27 +37,27 @@
}
}
- static void register(final Widget body) {
+ static void register(Widget body) {
final KeyCommandSet jumps = new KeyCommandSet();
jumps.add(
new KeyCommand(0, 'o', Gerrit.C.jumpAllOpen()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("status:open"));
}
});
jumps.add(
new KeyCommand(0, 'm', Gerrit.C.jumpAllMerged()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("status:merged"));
}
});
jumps.add(
new KeyCommand(0, 'a', Gerrit.C.jumpAllAbandoned()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("status:abandoned"));
}
});
@@ -66,35 +66,35 @@
jumps.add(
new KeyCommand(0, 'i', Gerrit.C.jumpMine()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.MINE);
}
});
jumps.add(
new KeyCommand(0, 'd', Gerrit.C.jumpMineDrafts()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("owner:self is:draft"));
}
});
jumps.add(
new KeyCommand(0, 'c', Gerrit.C.jumpMineDraftComments()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("has:draft"));
}
});
jumps.add(
new KeyCommand(0, 'w', Gerrit.C.jumpMineWatched()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("is:watched status:open"));
}
});
jumps.add(
new KeyCommand(0, 's', Gerrit.C.jumpMineStarred()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("is:starred"));
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java
index cd715c6..4153439 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java
@@ -28,7 +28,7 @@
private static int hideDepth;
/** Execute code, hiding the RPCs they execute from being shown visually. */
- public static void hide(final Runnable run) {
+ public static void hide(Runnable run) {
try {
hideDepth++;
run.run();
@@ -49,7 +49,7 @@
}
@Override
- public void onRpcStart(final RpcStartEvent event) {
+ public void onRpcStart(RpcStartEvent event) {
onRpcStart();
}
@@ -62,7 +62,7 @@
}
@Override
- public void onRpcComplete(final RpcCompleteEvent event) {
+ public void onRpcComplete(RpcCompleteEvent event) {
onRpcComplete();
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java
index 37c6a0b..dc3c043 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java
@@ -48,7 +48,7 @@
searchBox.addKeyPressHandler(
new KeyPressHandler() {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
if (!suggestionDisplay.isSuggestionSelected) {
doSearch();
@@ -92,7 +92,7 @@
body.add(searchButton);
}
- void setText(final String query) {
+ void setText(String query) {
searchBox.setText(query);
}
@@ -105,7 +105,7 @@
this,
new KeyCommand(0, '/', Gerrit.C.keySearch()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
event.preventDefault();
searchBox.setFocus(true);
searchBox.selectAll();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java
index cb947fe..7a1a450 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java
@@ -44,13 +44,12 @@
"cc:"),
new AccountSuggestOracle() {
@Override
- public void onRequestSuggestions(final Request request, final Callback done) {
+ public void onRequestSuggestions(Request request, Callback done) {
super.onRequestSuggestions(
request,
new Callback() {
@Override
- public void onSuggestionsReady(
- final Request request, final Response response) {
+ public void onSuggestionsReady(final Request request, Response response) {
if ("self".startsWith(request.getQuery())) {
final ArrayList<SuggestOracle.Suggestion> r =
new ArrayList<>(response.getSuggestions().size() + 1);
@@ -192,7 +191,7 @@
return;
}
- for (final ParamSuggester ps : paramSuggester) {
+ for (ParamSuggester ps : paramSuggester) {
if (ps.applicable(lastWord)) {
ps.suggest(lastWord, request, done);
return;
@@ -211,7 +210,7 @@
done.onSuggestionsReady(request, new Response(r));
}
- private String getLastWord(final String query) {
+ private String getLastWord(String query) {
final int lastSpace = query.lastIndexOf(' ');
if (lastSpace == query.length() - 1) {
return null;
@@ -223,7 +222,7 @@
}
@Override
- protected String getQueryPattern(final String query) {
+ protected String getQueryPattern(String query) {
return super.getQueryPattern(getLastWord(query));
}
@@ -258,18 +257,18 @@
private final List<String> operators;
private final SuggestOracle parameterSuggestionOracle;
- ParamSuggester(final List<String> operators, final SuggestOracle parameterSuggestionOracle) {
+ ParamSuggester(List<String> operators, SuggestOracle parameterSuggestionOracle) {
this.operators = operators;
this.parameterSuggestionOracle = parameterSuggestionOracle;
}
- boolean applicable(final String query) {
+ boolean applicable(String query) {
final String operator = getApplicableOperator(query, operators);
return operator != null && query.length() > operator.length();
}
- private String getApplicableOperator(final String lastWord, final List<String> operators) {
- for (final String operator : operators) {
+ private String getApplicableOperator(String lastWord, List<String> operators) {
+ for (String operator : operators) {
if (lastWord.startsWith(operator)) {
return operator;
}
@@ -277,17 +276,17 @@
return null;
}
- void suggest(final String lastWord, final Request request, final Callback done) {
+ void suggest(String lastWord, Request request, Callback done) {
final String operator = getApplicableOperator(lastWord, operators);
parameterSuggestionOracle.requestSuggestions(
new Request(lastWord.substring(operator.length()), request.getLimit()),
new Callback() {
@Override
- public void onSuggestionsReady(final Request req, final Response response) {
+ public void onSuggestionsReady(Request req, Response response) {
final String query = request.getQuery();
final List<SearchSuggestOracle.Suggestion> r =
new ArrayList<>(response.getSuggestions().size());
- for (final SearchSuggestOracle.Suggestion s : response.getSuggestions()) {
+ for (SearchSuggestOracle.Suggestion s : response.getSuggestions()) {
r.add(
new SearchSuggestion(
s.getDisplayString(),
@@ -298,7 +297,7 @@
done.onSuggestionsReady(request, new Response(r));
}
- private String quoteIfNeeded(final String s) {
+ private String quoteIfNeeded(String s) {
if (!s.matches("^\\S*$")) {
return "\"" + s + "\"";
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java
index 1a1f7bd..f771fee 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java
@@ -189,7 +189,7 @@
return v;
}
- private void populate(final int row, List<String> values) {
+ private void populate(int row, List<String> values) {
FlexCellFormatter fmt = table.getFlexCellFormatter();
fmt.addStyleName(row, 0, Gerrit.RESOURCES.css().iconCell());
fmt.addStyleName(row, 0, Gerrit.RESOURCES.css().leftMostCell());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java
index 39a52e3..a0060d5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java
@@ -31,7 +31,7 @@
api.get(NativeMap.copyKeysIntoChildren(callback));
}
- public static void get(final Project.NameKey project, final AsyncCallback<ProjectAccessInfo> cb) {
+ public static void get(Project.NameKey project, AsyncCallback<ProjectAccessInfo> cb) {
get(
Collections.singleton(project),
new AsyncCallback<AccessMap>() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
index da0357f..cbd7635 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
@@ -91,7 +91,7 @@
registerNewEmail.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doRegisterNewEmail();
}
});
@@ -148,7 +148,7 @@
save.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doSave();
}
});
@@ -156,7 +156,7 @@
emailPick.addChangeHandler(
new ChangeHandler() {
@Override
- public void onChange(final ChangeEvent event) {
+ public void onChange(ChangeEvent event) {
final int idx = emailPick.getSelectedIndex();
final String v = 0 <= idx ? emailPick.getValue(idx) : null;
if (Util.C.buttonOpenRegisterNewEmail().equals(v)) {
@@ -249,7 +249,7 @@
void display() {}
- protected void row(final Grid info, final int row, final String name, final Widget field) {
+ protected void row(Grid info, int row, String name, Widget field) {
info.setText(row, labelIdx, name);
info.setWidget(row, fieldIdx, field);
info.getCellFormatter().addStyleName(row, 0, Gerrit.RESOURCES.css().header());
@@ -279,7 +279,7 @@
form.addSubmitHandler(
new FormPanel.SubmitHandler() {
@Override
- public void onSubmit(final SubmitEvent event) {
+ public void onSubmit(SubmitEvent event) {
event.cancel();
final String addr = inEmail.getText().trim();
if (!addr.contains("@")) {
@@ -310,7 +310,7 @@
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
inEmail.setEnabled(true);
register.setEnabled(true);
if (caught.getMessage().startsWith(EmailException.MESSAGE)) {
@@ -331,7 +331,7 @@
register.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
form.submit();
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java
index dfbd5c7..5c6d40f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java
@@ -49,7 +49,7 @@
deleteIdentity.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
identites.deleteChecked();
}
});
@@ -60,7 +60,7 @@
linkIdentity.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
Location.assign(Gerrit.loginRedirect(History.getToken()) + "?link");
}
});
@@ -167,7 +167,7 @@
deleteIdentity.setEnabled(on);
}
- void display(final JsArray<ExternalIdInfo> results) {
+ void display(JsArray<ExternalIdInfo> results) {
List<ExternalIdInfo> idList = Natives.asList(results);
Collections.sort(idList);
@@ -175,13 +175,13 @@
table.removeRow(table.getRowCount() - 1);
}
- for (final ExternalIdInfo k : idList) {
+ for (ExternalIdInfo k : idList) {
addOneId(k);
}
updateDeleteButton();
}
- void addOneId(final ExternalIdInfo k) {
+ void addOneId(ExternalIdInfo k) {
if (k.isUsername()) {
// Don't display the username as an identity here.
return;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java
index 5836763..173dba6 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java
@@ -111,7 +111,7 @@
});
}
- private void display(final GeneralPreferences prefs) {
+ private void display(GeneralPreferences prefs) {
AccountApi.self()
.view("oauthtoken")
.get(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
index 03e72c7..3852387 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
@@ -104,7 +104,7 @@
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
if (RestApi.isNotFound(caught)) {
Gerrit.getUserAccount().username(null);
display();
@@ -121,7 +121,7 @@
enableUI(true);
}
- private void row(final Grid info, final int row, final String name, final Widget field) {
+ private void row(Grid info, int row, String name, Widget field) {
final CellFormatter fmt = info.getCellFormatter();
if (LocaleInfo.getCurrentLocale().isRTL()) {
info.setText(row, 1, name);
@@ -146,7 +146,7 @@
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
enableUI(true);
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
index 9be15ff..f349065 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
@@ -74,7 +74,7 @@
showSiteHeader = new CheckBox(Util.C.showSiteHeader());
useFlashClipboard = new CheckBox(Util.C.useFlashClipboard());
maximumPageSize = new ListBox();
- for (final int v : PAGESIZE_CHOICES) {
+ for (int v : PAGESIZE_CHOICES) {
maximumPageSize.addItem(Util.M.rowsPerPage(v), String.valueOf(v));
}
@@ -241,7 +241,7 @@
save.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doSave();
}
});
@@ -290,7 +290,7 @@
});
}
- private void enable(final boolean on) {
+ private void enable(boolean on) {
showSiteHeader.setEnabled(on);
useFlashClipboard.setEnabled(on);
maximumPageSize.setEnabled(on);
@@ -351,19 +351,18 @@
myMenus.display(values);
}
- private void setListBox(final ListBox f, final int defaultValue, final int currentValue) {
+ private void setListBox(ListBox f, int defaultValue, int currentValue) {
setListBox(f, String.valueOf(defaultValue), String.valueOf(currentValue));
}
- private <T extends Enum<?>> void setListBox(
- final ListBox f, final T defaultValue, final T currentValue) {
+ private <T extends Enum<?>> void setListBox(final ListBox f, T defaultValue, T currentValue) {
setListBox(
f,
defaultValue != null ? defaultValue.name() : "",
currentValue != null ? currentValue.name() : "");
}
- private void setListBox(final ListBox f, final String defaultValue, final String currentValue) {
+ private void setListBox(ListBox f, String defaultValue, String currentValue) {
final int n = f.getItemCount();
for (int i = 0; i < n; i++) {
if (f.getValue(i).equals(currentValue)) {
@@ -376,7 +375,7 @@
}
}
- private int getListBox(final ListBox f, final int defaultValue) {
+ private int getListBox(ListBox f, int defaultValue) {
final int idx = f.getSelectedIndex();
if (0 <= idx) {
return Short.parseShort(f.getValue(idx));
@@ -384,7 +383,7 @@
return defaultValue;
}
- private <T extends Enum<?>> T getListBox(final ListBox f, final T defaultValue, T[] all) {
+ private <T extends Enum<?>> T getListBox(ListBox f, T defaultValue, T[] all) {
final int idx = f.getSelectedIndex();
if (0 <= idx) {
String v = f.getValue(idx);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java
index 9d67663..177fc09 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java
@@ -91,7 +91,7 @@
display();
}
- private void infoRow(final int row, final String name) {
+ private void infoRow(int row, String name) {
info.setText(row, labelIdx, name);
info.getCellFormatter().addStyleName(row, 0, Gerrit.RESOURCES.css().header());
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java
index d3ac463..c99cd1a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java
@@ -129,7 +129,7 @@
addNew.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doAddNew();
}
});
@@ -138,7 +138,7 @@
browse.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
int top = grid.getAbsoluteTop() - 50; // under page header
// Try to place it to the right of everything else, but not
// right justified
@@ -158,7 +158,7 @@
delSel.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
watchesTab.deleteChecked();
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java
index 5e45b68..0a61b2d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java
@@ -97,7 +97,7 @@
return infos;
}
- public void insertWatch(final ProjectWatchInfo k) {
+ public void insertWatch(ProjectWatchInfo k) {
final String newName = k.project();
int row = 1;
for (; row < table.getRowCount(); row++) {
@@ -112,7 +112,7 @@
populate(row, k);
}
- public void display(final JsArray<ProjectWatchInfo> result) {
+ public void display(JsArray<ProjectWatchInfo> result) {
while (2 < table.getRowCount()) {
table.removeRow(table.getRowCount() - 1);
}
@@ -125,7 +125,7 @@
}
}
- protected void populate(final int row, final ProjectWatchInfo info) {
+ protected void populate(int row, ProjectWatchInfo info) {
final FlowPanel fp = new FlowPanel();
fp.add(new ProjectLink(info.project(), new Project.NameKey(info.project())));
if (info.filter() != null) {
@@ -156,13 +156,13 @@
}
protected void addNotifyButton(
- final ProjectWatchInfo.Type type, final ProjectWatchInfo info, final int row, final int col) {
+ final ProjectWatchInfo.Type type, ProjectWatchInfo info, int row, int col) {
final CheckBox cbox = new CheckBox();
cbox.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
final Boolean oldVal = info.notify(type);
info.notify(type, cbox.getValue());
cbox.setEnabled(false);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
index afba2e2..7c90884 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
@@ -66,7 +66,7 @@
this(null);
}
- public NewAgreementScreen(final String token) {
+ public NewAgreementScreen(String token) {
nextToken = token != null ? token : PageLinks.SETTINGS_AGREEMENTS;
}
@@ -122,7 +122,7 @@
submit.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doSign();
}
});
@@ -156,7 +156,7 @@
}
radios.add(hdr);
- for (final AgreementInfo cla : available) {
+ for (AgreementInfo cla : available) {
final RadioButton r = new RadioButton("cla_id", cla.name());
r.addStyleName(Gerrit.RESOURCES.css().contributorAgreementButton());
radios.add(r);
@@ -170,7 +170,7 @@
r.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
showCLA(cla);
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java
index d3d217c..29de14a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java
@@ -31,7 +31,7 @@
public class RegisterScreen extends AccountScreen {
private final String nextToken;
- public RegisterScreen(final String next) {
+ public RegisterScreen(String next) {
nextToken = next;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java
index 70e3911..2dfc2ed 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java
@@ -24,7 +24,7 @@
import com.google.gwtexpui.clippy.client.CopyableLabel;
class SshHostKeyPanel extends Composite {
- SshHostKeyPanel(final SshHostKey info) {
+ SshHostKeyPanel(SshHostKey info) {
final FlowPanel body = new FlowPanel();
body.setStyleName(Gerrit.RESOURCES.css().sshHostKeyPanel());
body.add(new SmallHeading(Util.C.sshHostKeyTitle()));
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java
index 0cf30de..6a8b44d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java
@@ -68,7 +68,7 @@
showAddKeyBlock.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
showAddKeyBlock(true);
}
});
@@ -82,7 +82,7 @@
deleteKey.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
keys.deleteChecked();
}
});
@@ -114,7 +114,7 @@
clearNew.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
addTxt.setText("");
addTxt.setFocus(true);
}
@@ -125,7 +125,7 @@
addNew.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doAddNew();
}
});
@@ -135,7 +135,7 @@
closeAddKeyBlock.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
showAddKeyBlock(false);
}
});
@@ -151,7 +151,7 @@
initWidget(body);
}
- void setKeyTableVisible(final boolean on) {
+ void setKeyTableVisible(boolean on) {
keys.setVisible(on);
deleteKey.setVisible(on);
closeAddKeyBlock.setVisible(on);
@@ -166,7 +166,7 @@
txt,
new GerritCallback<SshKeyInfo>() {
@Override
- public void onSuccess(final SshKeyInfo k) {
+ public void onSuccess(SshKeyInfo k) {
addNew.setEnabled(true);
addTxt.setText("");
keys.addOneKey(k);
@@ -178,7 +178,7 @@
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
addNew.setEnabled(true);
if (isInvalidSshKey(caught)) {
@@ -189,7 +189,7 @@
}
}
- private boolean isInvalidSshKey(final Throwable caught) {
+ private boolean isInvalidSshKey(Throwable caught) {
if (caught instanceof InvalidSshKeyException) {
return true;
}
@@ -207,9 +207,9 @@
Gerrit.SYSTEM_SVC.daemonHostKeys(
new GerritCallback<List<SshHostKey>>() {
@Override
- public void onSuccess(final List<SshHostKey> result) {
+ public void onSuccess(List<SshHostKey> result) {
serverKeys.clear();
- for (final SshHostKey keyInfo : result) {
+ for (SshHostKey keyInfo : result) {
serverKeys.add(new SshHostKeyPanel(keyInfo));
}
if (++loadCount == 2) {
@@ -238,7 +238,7 @@
void display() {}
- private void showAddKeyBlock(final boolean show) {
+ private void showAddKeyBlock(boolean show) {
showAddKeyBlock.setVisible(!show);
addKeyBlock.setVisible(show);
}
@@ -312,7 +312,7 @@
}
}
- void display(final List<SshKeyInfo> result) {
+ void display(List<SshKeyInfo> result) {
if (result.isEmpty()) {
setKeyTableVisible(false);
showAddKeyBlock(true);
@@ -320,7 +320,7 @@
while (1 < table.getRowCount()) {
table.removeRow(table.getRowCount() - 1);
}
- for (final SshKeyInfo k : result) {
+ for (SshKeyInfo k : result) {
addOneKey(k);
}
setKeyTableVisible(true);
@@ -328,7 +328,7 @@
}
}
- void addOneKey(final SshKeyInfo k) {
+ void addOneKey(SshKeyInfo k) {
final FlexCellFormatter fmt = table.getFlexCellFormatter();
final int row = table.getRowCount();
table.insertRow(row);
@@ -378,7 +378,7 @@
}
}
- static String elide(final String s, final int len) {
+ static String elide(String s, int len) {
if (s == null || s.length() < len || len <= 10) {
return s;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java
index 839a3e6..a893c5a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java
@@ -75,7 +75,7 @@
setUserName.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
confirmSetUserName();
}
});
@@ -143,14 +143,14 @@
});
}
- private void enableUI(final boolean on) {
+ private void enableUI(boolean on) {
userNameTxt.setEnabled(on);
setUserName.setEnabled(on);
}
private static final class UserNameValidator implements KeyPressHandler {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
final char code = event.getCharCode();
final int nativeCode = event.getNativeEvent().getKeyCode();
switch (nativeCode) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java
index 990798c..b66f108 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java
@@ -24,7 +24,7 @@
public class ValidateEmailScreen extends AccountScreen {
private final String magicToken;
- public ValidateEmailScreen(final String magicToken) {
+ public ValidateEmailScreen(String magicToken) {
this.magicToken = magicToken;
}
@@ -41,7 +41,7 @@
magicToken,
new ScreenLoadCallback<VoidResult>(this) {
@Override
- protected void preDisplay(final VoidResult result) {}
+ protected void preDisplay(VoidResult result) {}
@Override
protected void postDisplay() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java
index 37813af..e518d26 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java
@@ -204,7 +204,7 @@
}
}
- void setEditing(final boolean editing) {
+ void setEditing(boolean editing) {
this.editing = editing;
}
@@ -236,7 +236,7 @@
}
}
- private void addPermission(final String permissionName, final List<String> permissionList) {
+ private void addPermission(String permissionName, List<String> permissionList) {
if (value.getPermission(permissionName) != null) {
return;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java
index 4d1ad22..34a1ac9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java
@@ -48,7 +48,7 @@
private CheckBox visibleToAllCheckBox;
private Button saveGroupOptions;
- public AccountGroupInfoScreen(final GroupInfo toShow, final String token) {
+ public AccountGroupInfoScreen(GroupInfo toShow, String token) {
super(toShow, token);
}
@@ -62,7 +62,7 @@
initGroupOptions();
}
- private void enableForm(final boolean canModify) {
+ private void enableForm(boolean canModify) {
groupNameTxt.setEnabled(canModify);
ownerTxt.setEnabled(canModify);
descTxt.setEnabled(canModify);
@@ -91,14 +91,14 @@
saveName.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
final String newName = groupNameTxt.getText().trim();
GroupApi.renameGroup(
getGroupUUID(),
newName,
new GerritCallback<com.google.gerrit.client.VoidResult>() {
@Override
- public void onSuccess(final com.google.gerrit.client.VoidResult result) {
+ public void onSuccess(com.google.gerrit.client.VoidResult result) {
saveName.setEnabled(false);
setPageTitle(AdminMessages.I.group(newName));
groupNameTxt.setText(newName);
@@ -129,7 +129,7 @@
saveOwner.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
final String newOwner = ownerTxt.getText().trim();
if (newOwner.length() > 0) {
AccountGroup.UUID ownerUuid = accountGroupOracle.getUUID(newOwner);
@@ -139,7 +139,7 @@
ownerId,
new GerritCallback<GroupInfo>() {
@Override
- public void onSuccess(final GroupInfo result) {
+ public void onSuccess(GroupInfo result) {
updateOwnerGroup(result);
saveOwner.setEnabled(false);
}
@@ -166,14 +166,14 @@
saveDesc.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
final String txt = descTxt.getText().trim();
GroupApi.setGroupDescription(
getGroupUUID(),
txt,
new GerritCallback<VoidResult>() {
@Override
- public void onSuccess(final VoidResult result) {
+ public void onSuccess(VoidResult result) {
saveDesc.setEnabled(false);
}
});
@@ -199,13 +199,13 @@
saveGroupOptions.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
GroupApi.setGroupOptions(
getGroupUUID(),
visibleToAllCheckBox.getValue(),
new GerritCallback<VoidResult>() {
@Override
- public void onSuccess(final VoidResult result) {
+ public void onSuccess(VoidResult result) {
saveGroupOptions.setEnabled(false);
}
});
@@ -220,7 +220,7 @@
}
@Override
- protected void display(final GroupInfo group, final boolean canModify) {
+ protected void display(GroupInfo group, boolean canModify) {
groupUUIDLabel.setText(group.getGroupUUID().get());
groupNameTxt.setText(group.name());
ownerTxt.setText(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java
index 51b4979..2614224 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java
@@ -59,7 +59,7 @@
private FlowPanel noMembersInfo;
private AccountGroupSuggestOracle accountGroupSuggestOracle;
- public AccountGroupMembersScreen(final GroupInfo toShow, final String token) {
+ public AccountGroupMembersScreen(GroupInfo toShow, String token) {
super(toShow, token);
}
@@ -71,7 +71,7 @@
initNoMembersInfo();
}
- private void enableForm(final boolean canModify) {
+ private void enableForm(boolean canModify) {
addMemberBox.setEnabled(canModify);
members.setEnabled(canModify);
addIncludeBox.setEnabled(canModify);
@@ -88,7 +88,7 @@
addMemberBox.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doAddNewMember();
}
});
@@ -100,7 +100,7 @@
delMember.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
members.deleteChecked();
}
});
@@ -124,7 +124,7 @@
addIncludeBox.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doAddNewInclude();
}
});
@@ -136,7 +136,7 @@
delInclude.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
includes.deleteChecked();
}
});
@@ -157,7 +157,7 @@
}
@Override
- protected void display(final GroupInfo group, final boolean canModify) {
+ protected void display(GroupInfo group, boolean canModify) {
if (AccountGroup.isInternalGroup(group.getGroupUUID())) {
members.display(Natives.asList(group.members()));
includes.display(Natives.asList(group.includes()));
@@ -184,14 +184,14 @@
nameEmail,
new GerritCallback<AccountInfo>() {
@Override
- public void onSuccess(final AccountInfo memberInfo) {
+ public void onSuccess(AccountInfo memberInfo) {
addMemberBox.setEnabled(true);
addMemberBox.setText("");
members.insert(memberInfo);
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
addMemberBox.setEnabled(true);
super.onFailure(caught);
}
@@ -215,14 +215,14 @@
uuid.get(),
new GerritCallback<GroupInfo>() {
@Override
- public void onSuccess(final GroupInfo result) {
+ public void onSuccess(GroupInfo result) {
addIncludeBox.setEnabled(true);
addIncludeBox.setText("");
includes.insert(result);
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
addIncludeBox.setEnabled(true);
super.onFailure(caught);
}
@@ -242,7 +242,7 @@
fmt.addStyleName(0, 3, Gerrit.RESOURCES.css().dataHeader());
}
- void setEnabled(final boolean enabled) {
+ void setEnabled(boolean enabled) {
this.enabled = enabled;
for (int row = 1; row < table.getRowCount(); row++) {
final AccountInfo i = getRowItem(row);
@@ -266,7 +266,7 @@
ids,
new GerritCallback<VoidResult>() {
@Override
- public void onSuccess(final VoidResult result) {
+ public void onSuccess(VoidResult result) {
for (int row = 1; row < table.getRowCount(); ) {
final AccountInfo i = getRowItem(row);
if (i != null && ids.contains(i._accountId())) {
@@ -280,12 +280,12 @@
}
}
- void display(final List<AccountInfo> result) {
+ void display(List<AccountInfo> result) {
while (1 < table.getRowCount()) {
table.removeRow(table.getRowCount() - 1);
}
- for (final AccountInfo i : result) {
+ for (AccountInfo i : result) {
final int row = table.getRowCount();
table.insertRow(row);
applyDataRowStyle(row);
@@ -323,7 +323,7 @@
}
}
- void populate(final int row, final AccountInfo i) {
+ void populate(int row, AccountInfo i) {
CheckBox checkBox = new CheckBox();
table.setWidget(row, 1, checkBox);
checkBox.setEnabled(enabled);
@@ -352,7 +352,7 @@
fmt.addStyleName(0, 3, Gerrit.RESOURCES.css().dataHeader());
}
- void setEnabled(final boolean enabled) {
+ void setEnabled(boolean enabled) {
this.enabled = enabled;
for (int row = 1; row < table.getRowCount(); row++) {
final GroupInfo i = getRowItem(row);
@@ -376,7 +376,7 @@
ids,
new GerritCallback<VoidResult>() {
@Override
- public void onSuccess(final VoidResult result) {
+ public void onSuccess(VoidResult result) {
for (int row = 1; row < table.getRowCount(); ) {
final GroupInfo i = getRowItem(row);
if (i != null && ids.contains(i.getGroupUUID())) {
@@ -395,7 +395,7 @@
table.removeRow(table.getRowCount() - 1);
}
- for (final GroupInfo i : list) {
+ for (GroupInfo i : list) {
final int row = table.getRowCount();
table.insertRow(row);
applyDataRowStyle(row);
@@ -427,7 +427,7 @@
}
}
- void populate(final int row, final GroupInfo i) {
+ void populate(int row, GroupInfo i) {
final FlexCellFormatter fmt = table.getFlexCellFormatter();
AccountGroup.UUID uuid = i.getGroupUUID();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
index 29b7677..b67213b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
@@ -32,7 +32,7 @@
private final String membersTabToken;
private final String auditLogTabToken;
- public AccountGroupScreen(final GroupInfo toShow, final String token) {
+ public AccountGroupScreen(GroupInfo toShow, String token) {
setRequiresSignIn(true);
this.group = toShow;
@@ -47,7 +47,7 @@
AccountGroup.isInternalGroup(group.getGroupUUID()));
}
- private String getTabToken(final String token, final String tab) {
+ private String getTabToken(String token, String tab) {
if (token.startsWith("/admin/groups/uuid-")) {
return toGroup(group.getGroupUUID(), tab);
}
@@ -91,7 +91,7 @@
return group.getOwnerUUID();
}
- protected void setMembersTabVisible(final boolean visible) {
+ protected void setMembersTabVisible(boolean visible) {
setLinkVisible(membersTabToken, visible);
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
index 1aecd08..36119d0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
@@ -181,6 +181,8 @@
String initialRevision();
+ String revision();
+
String buttonAddBranch();
String buttonDeleteBranch();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
index 4c7153e..ba3175b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
@@ -86,6 +86,7 @@
columnTagName = Tag Name
columnTagRevision = Revision
initialRevision = Initial Revision
+revision = Revision
buttonAddBranch = Create Branch
buttonAddTag = Create Tag
buttonDeleteBranch = Delete
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java
index 2e5bbb5..eeacd97 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java
@@ -26,7 +26,7 @@
import com.google.gwt.user.client.ui.PopupPanel;
class CreateChangeAction {
- static void call(final Button b, final String project) {
+ static void call(Button b, String project) {
// TODO Replace CreateChangeDialog with a nicer looking display.
b.setEnabled(false);
new CreateChangeDialog(new Project.NameKey(project)) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java
index 93a1b4b..6914ee9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java
@@ -125,7 +125,7 @@
addNew.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doCreateGroup();
}
});
@@ -146,7 +146,7 @@
newName,
new GerritCallback<GroupInfo>() {
@Override
- public void onSuccess(final GroupInfo result) {
+ public void onSuccess(GroupInfo result) {
History.newItem(Dispatcher.toGroup(result.getGroupId(), AccountGroupScreen.MEMBERS));
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java
index b785d19..a73d78e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java
@@ -181,7 +181,7 @@
create.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doCreateProject();
}
});
@@ -190,7 +190,7 @@
browse.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
int top = grid.getAbsoluteTop() - 50; // under page header
// Try to place it to the right of everything else, but not
// right justified
@@ -219,7 +219,7 @@
}
@Override
- protected void populate(final int row, final ProjectInfo k) {
+ protected void populate(int row, ProjectInfo k) {
populateState(row, k);
final Anchor projectLink = new Anchor(k.name());
projectLink.addClickHandler(
@@ -252,7 +252,7 @@
});
}
- private void addGrid(final VerticalPanel fp) {
+ private void addGrid(VerticalPanel fp) {
grid = new Grid(2, 3);
grid.setStyleName(Gerrit.RESOURCES.css().infoBlock());
grid.setText(0, 0, AdminConstants.I.columnProjectName() + ":");
@@ -295,7 +295,7 @@
});
}
- private void enableForm(final boolean enabled) {
+ private void enableForm(boolean enabled) {
project.setEnabled(enabled);
create.setEnabled(enabled);
parent.setEnabled(enabled);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java
index d28e9bb..47842f5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java
@@ -24,7 +24,7 @@
import com.google.gwt.user.client.ui.Button;
public class EditConfigAction {
- static void call(final Button b, final String project) {
+ static void call(Button b, String project) {
b.setEnabled(false);
ChangeApi.createChange(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java
index 0f5bf22..259847e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java
@@ -43,7 +43,7 @@
this(null);
}
- public GroupTable(final String pointerId) {
+ public GroupTable(String pointerId) {
super(AdminConstants.I.groupItemHelp());
setSavePointerId(pointerId);
@@ -70,12 +70,12 @@
}
@Override
- protected Object getRowItemKey(final GroupInfo item) {
+ protected Object getRowItemKey(GroupInfo item) {
return item.getGroupId();
}
@Override
- protected void onOpenRow(final int row) {
+ protected void onOpenRow(int row) {
GroupInfo groupInfo = getRowItem(row);
if (isInteralGroup(groupInfo)) {
History.newItem(Dispatcher.toGroup(groupInfo.getGroupId()));
@@ -121,7 +121,7 @@
}
}
- void populate(final int row, final GroupInfo k, final String toHighlight) {
+ void populate(int row, GroupInfo k, String toHighlight) {
if (k.url() != null) {
if (isInteralGroup(k)) {
table.setWidget(
@@ -152,7 +152,7 @@
setRowItem(row, k);
}
- private boolean isInteralGroup(final GroupInfo groupInfo) {
+ private boolean isInteralGroup(GroupInfo groupInfo) {
return groupInfo != null && groupInfo.url().startsWith("#" + PageLinks.ADMIN_GROUPS);
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java
index d254c7d..79a4cef 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java
@@ -205,7 +205,7 @@
addStage2.getStyle().setDisplay(Display.NONE);
}
- private void addGroup(final GroupReference ref) {
+ private void addGroup(GroupReference ref) {
if (ref.getUUID() != null) {
if (value.getRule(ref) == null) {
PermissionRule newRule = value.getRule(ref, true);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java
index 8a70f2e..381c644 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java
@@ -45,7 +45,7 @@
PluginMap.all(
new ScreenLoadCallback<PluginMap>(this) {
@Override
- protected void preDisplay(final PluginMap result) {
+ protected void preDisplay(PluginMap result) {
pluginTable.display(result);
}
});
@@ -75,12 +75,12 @@
fmt.addStyleName(0, 4, Gerrit.RESOURCES.css().dataHeader());
}
- void display(final PluginMap plugins) {
+ void display(PluginMap plugins) {
while (1 < table.getRowCount()) {
table.removeRow(table.getRowCount() - 1);
}
- for (final PluginInfo p : Natives.asList(plugins.values())) {
+ for (PluginInfo p : Natives.asList(plugins.values())) {
final int row = table.getRowCount();
table.insertRow(row);
applyDataRowStyle(row);
@@ -88,7 +88,7 @@
}
}
- void populate(final int row, final PluginInfo plugin) {
+ void populate(int row, PluginInfo plugin) {
if (plugin.disabled() || plugin.indexUrl() == null) {
table.setText(row, 1, plugin.name());
} else {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java
index 05142c4..a52ea60 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java
@@ -134,7 +134,7 @@
@Override
public void setDelegate(EditorDelegate<ProjectAccess> delegate) {}
- void setEditing(final boolean editing) {
+ void setEditing(boolean editing) {
this.editing = editing;
addSection.setVisible(editing);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java
index 0398e9d..8f83e2f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java
@@ -91,7 +91,7 @@
private NativeMap<CapabilityInfo> capabilityMap;
- public ProjectAccessScreen(final Project.NameKey toShow) {
+ public ProjectAccessScreen(Project.NameKey toShow) {
super(toShow);
}
@@ -211,7 +211,7 @@
displayReadOnly(newAccess);
} else {
error.add(new Label(Gerrit.C.projectAccessError()));
- for (final String diff : diffs) {
+ for (String diff : diffs) {
error.add(new Label(diff));
}
if (access.canUpload()) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
index 887e4b8..c6a391b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
@@ -82,7 +82,7 @@
private NpTextBox filterTxt;
private Query query;
- public ProjectBranchesScreen(final Project.NameKey toShow) {
+ public ProjectBranchesScreen(Project.NameKey toShow) {
super(toShow);
}
@@ -165,7 +165,7 @@
addBranch.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
doAddNewBranch();
}
});
@@ -179,7 +179,7 @@
delBranch.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
branchTable.deleteChecked();
}
});
@@ -283,7 +283,7 @@
new ConfirmationCallback() {
@Override
public void onOk() {
- //do nothing
+ // do nothing
}
});
confirmationDialog.center();
@@ -384,7 +384,7 @@
confirmationDialog.center();
}
- private void deleteBranches(final Set<String> branches) {
+ private void deleteBranches(Set<String> branches) {
ProjectApi.deleteBranches(
getProjectKey(),
branches,
@@ -473,7 +473,7 @@
setRowItem(row, k);
}
- private void setHeadRevision(final int row, final int column, final String rev) {
+ private void setHeadRevision(int row, int column, String rev) {
AccessMap.get(
getProjectKey(),
new GerritCallback<ProjectAccessInfo>() {
@@ -488,7 +488,7 @@
});
}
- private Widget getHeadRevisionWidget(final String headRevision) {
+ private Widget getHeadRevisionWidget(String headRevision) {
FlowPanel p = new FlowPanel();
final InlineLabel l = new InlineLabel(headRevision);
final Image edit = new Image(Gerrit.RESOURCES.edit());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java
index 52fe3399..7b5d04d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java
@@ -25,7 +25,7 @@
private DashboardsTable dashes;
Project.NameKey project;
- public ProjectDashboardsScreen(final Project.NameKey project) {
+ public ProjectDashboardsScreen(Project.NameKey project) {
super(project);
this.project = project;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
index 2f5caf8..aea86a5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
@@ -100,7 +100,7 @@
private OnEditEnabler saveEnabler;
- public ProjectInfoScreen(final Project.NameKey toShow) {
+ public ProjectInfoScreen(Project.NameKey toShow) {
super(toShow);
}
@@ -228,7 +228,7 @@
grid.add(AdminConstants.I.headingProjectState(), state);
submitType = new ListBox();
- for (final SubmitType type : SubmitType.values()) {
+ for (SubmitType type : SubmitType.values()) {
submitType.addItem(Util.toLongString(type), type.name());
}
submitType.addChangeHandler(
@@ -320,7 +320,7 @@
grid.addHtml(AdminConstants.I.useSignedOffBy(), signedOffBy);
}
- private void setSubmitType(final SubmitType newSubmitType) {
+ private void setSubmitType(SubmitType newSubmitType) {
int index = -1;
if (submitType != null) {
for (int i = 0; i < submitType.getItemCount(); i++) {
@@ -334,7 +334,7 @@
}
}
- private void setState(final ProjectState newState) {
+ private void setState(ProjectState newState) {
if (state != null) {
for (int i = 0; i < state.getItemCount(); i++) {
if (newState.name().equals(state.getValue(i))) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
index 9166c56..2a03136 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
@@ -91,11 +91,11 @@
}
@Override
- protected void onOpenRow(final int row) {
+ protected void onOpenRow(int row) {
History.newItem(link(getRowItem(row)));
}
- private String link(final ProjectInfo item) {
+ private String link(ProjectInfo item) {
return Dispatcher.toProject(item.name_key());
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java
index 3328163..dc964b8 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java
@@ -37,7 +37,7 @@
private final Project.NameKey name;
- public ProjectScreen(final Project.NameKey toShow) {
+ public ProjectScreen(Project.NameKey toShow) {
name = toShow;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
index b89139c..57a6c3c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
@@ -150,7 +150,7 @@
}
}
});
- addGrid.setText(1, 0, AdminConstants.I.initialRevision() + ":");
+ addGrid.setText(1, 0, AdminConstants.I.revision() + ":");
addGrid.setWidget(1, 1, irevTxtBox);
addTag = new Button(AdminConstants.I.buttonAddTag());
@@ -276,7 +276,7 @@
new ConfirmationCallback() {
@Override
public void onOk() {
- //do nothing
+ // do nothing
}
});
confirmationDialog.center();
@@ -376,7 +376,7 @@
confirmationDialog.center();
}
- private void deleteTags(final Set<String> tags) {
+ private void deleteTags(Set<String> tags) {
ProjectApi.deleteTags(
getProjectKey(),
tags,
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java
index f08cdd8..2e4926d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java
@@ -30,7 +30,7 @@
AdminResources.I.css().ensureInjected();
}
- public static String toLongString(final SubmitType type) {
+ public static String toLongString(SubmitType type) {
if (type == null) {
return "";
}
@@ -52,7 +52,7 @@
}
}
- public static String toLongString(final ProjectState type) {
+ public static String toLongString(ProjectState type) {
if (type == null) {
return "";
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java
index 7e1db46..cf8de54 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java
@@ -176,7 +176,7 @@
* The same as {@link #get(RestApi, JavaScriptObject)} but without converting a {@link
* NativeString} result to String.
*/
- static final void getRaw(RestApi api, final JavaScriptObject cb) {
+ static final void getRaw(RestApi api, JavaScriptObject cb) {
api.get(wrapRaw(cb));
}
@@ -268,7 +268,7 @@
api.delete(wrapRaw(cb));
}
- private static GerritCallback<JavaScriptObject> wrap(final JavaScriptObject cb) {
+ private static GerritCallback<JavaScriptObject> wrap(JavaScriptObject cb) {
return new GerritCallback<JavaScriptObject>() {
@Override
public void onSuccess(JavaScriptObject result) {
@@ -282,7 +282,7 @@
};
}
- private static GerritCallback<JavaScriptObject> wrapRaw(final JavaScriptObject cb) {
+ private static GerritCallback<JavaScriptObject> wrapRaw(JavaScriptObject cb) {
return new GerritCallback<JavaScriptObject>() {
@Override
public void onSuccess(JavaScriptObject result) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java
index 234df60..da14412 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java
@@ -36,7 +36,7 @@
invoke(action, api, callback(PageLinks.toProject(project)));
}
- private static AsyncCallback<JavaScriptObject> callback(final String target) {
+ private static AsyncCallback<JavaScriptObject> callback(String target) {
return new GerritCallback<JavaScriptObject>() {
@Override
public void onSuccess(JavaScriptObject in) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
index c7f6fae..9050303 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
@@ -140,7 +140,7 @@
onCloseForm();
}
- private void editAssignee(final String assignee) {
+ private void editAssignee(String assignee) {
if (assignee.trim().isEmpty()) {
ChangeApi.deleteAssignee(
changeId.get(),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java
index b8fcab7..d6f67a6 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java
@@ -45,8 +45,7 @@
ChangeApi.unmarkPrivate(id.get(), cs(id, draftButtons));
}
- public static GerritCallback<JavaScriptObject> cs(
- final Change.Id id, final Button... draftButtons) {
+ public static GerritCallback<JavaScriptObject> cs(final Change.Id id, Button... draftButtons) {
setEnabled(false, draftButtons);
return new GerritCallback<JavaScriptObject>() {
@Override
@@ -67,7 +66,7 @@
};
}
- private static AsyncCallback<JavaScriptObject> mine(final Button... draftButtons) {
+ private static AsyncCallback<JavaScriptObject> mine(Button... draftButtons) {
setEnabled(false, draftButtons);
return new GerritCallback<JavaScriptObject>() {
@Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
index 6e088c4..f3a0757 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
@@ -308,7 +308,7 @@
group.addFinal(
new GerritCallback<ChangeInfo>() {
@Override
- public void onSuccess(final ChangeInfo info) {
+ public void onSuccess(ChangeInfo info) {
info.init();
initCurrentRevision(info);
final RevisionInfo rev = info.revision(revision);
@@ -586,7 +586,7 @@
downloadAction = new DownloadAction(info, revision, style, headerLine, download);
}
- private void initProjectLinks(final ChangeInfo info) {
+ private void initProjectLinks(ChangeInfo info) {
projectSettingsLink.setHref("#" + PageLinks.toProject(info.projectNameKey()));
projectSettings.addDomHandler(
new ClickHandler() {
@@ -987,7 +987,7 @@
}
}
- private void loadConfigInfo(final ChangeInfo info, DiffObject base) {
+ private void loadConfigInfo(ChangeInfo info, DiffObject base) {
final RevisionInfo rev = info.revision(revision);
if (base.isAutoMerge() && !initCurrentRevision(info).isMerge()) {
Gerrit.display(getToken(), new NotFoundScreen());
@@ -1026,7 +1026,7 @@
group.done();
}
- private void loadConfigInfo(final ChangeInfo info, RevisionInfo rev) {
+ private void loadConfigInfo(ChangeInfo info, RevisionInfo rev) {
if (loaded) {
return;
}
@@ -1207,7 +1207,7 @@
return r;
}
- private void loadCommit(final RevisionInfo rev, CallbackGroup group) {
+ private void loadCommit(RevisionInfo rev, CallbackGroup group) {
if (rev.isEdit() || rev.commit() != null) {
return;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java
index 97abddb..907691e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java
@@ -36,8 +36,7 @@
ChangeApi.rebaseEdit(id.get(), cs(id, editButtons));
}
- public static GerritCallback<JavaScriptObject> cs(
- final Change.Id id, final Button... editButtons) {
+ public static GerritCallback<JavaScriptObject> cs(final Change.Id id, Button... editButtons) {
setEnabled(false, editButtons);
return new GerritCallback<JavaScriptObject>() {
@Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
index 192be34..c0c8037 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
@@ -218,7 +218,7 @@
}
}
- private void addHashtag(final String hashtags) {
+ private void addHashtag(String hashtags) {
ChangeApi.hashtags(changeId.get())
.post(
PostInput.create(hashtags, null),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java
index 689aa2a..1d6ad3d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java
@@ -125,7 +125,7 @@
public static void saveInlineComments() {
final StorageBackend storage = new StorageBackend();
- for (final String cookie : storage.getKeys()) {
+ for (String cookie : storage.getKeys()) {
if (isInlineComment(cookie)) {
InlineComment input = getInlineComment(cookie);
if (input.commentInfo.id() == null) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java
index 3b96a12..cfed9db 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java
@@ -37,7 +37,7 @@
}
@Override
- protected void onRequestSuggestions(final Request req, final Callback cb) {
+ protected void onRequestSuggestions(Request req, Callback cb) {
RestApi api = ChangeApi.revision(changeId.get(), revision.name()).view("files");
if (req.getQuery() != null) {
api.addParameter("q", req.getQuery() == null ? "" : req.getQuery());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java
index d5d5f36..32284b0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java
@@ -198,7 +198,7 @@
getTab(Tab.SUBMITTED_TOGETHER).setShowSubmittable(true);
}
- void set(final ChangeInfo info, final String revision) {
+ void set(ChangeInfo info, String revision) {
if (info.status().isOpen()) {
setForOpenChange(info, revision);
}
@@ -246,7 +246,7 @@
}
}
- private void setForOpenChange(final ChangeInfo info, final String revision) {
+ private void setForOpenChange(ChangeInfo info, String revision) {
if (info.mergeable()) {
StringBuilder conflictsQuery = new StringBuilder();
conflictsQuery.append("status:open");
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
index 2a926b6..00a543f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
@@ -229,7 +229,7 @@
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
if (RestApi.isNotSignedIn(caught)) {
lc.setReplyComment(message.getText());
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java
index f216af8..1747352 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java
@@ -27,8 +27,7 @@
import com.google.gwt.user.client.ui.PopupPanel;
class RevertAction {
- static void call(
- final Button b, final Change.Id id, final String revision, final String commitSubject) {
+ static void call(final Button b, Change.Id id, String revision, String commitSubject) {
// TODO Replace ActionDialog with a nicer looking display.
b.setEnabled(false);
new TextAreaActionDialog(Util.C.revertChangeTitle(), Util.C.headingRevertMessage()) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java
index 8609774..1ff751e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java
@@ -34,7 +34,7 @@
private Change.Id changeId;
@Override
- protected void onRequestSuggestions(final Request req, final Callback cb) {
+ protected void onRequestSuggestions(Request req, Callback cb) {
ChangeApi.suggestReviewers(changeId.get(), req.getQuery(), req.getLimit(), false)
.get(
new GerritCallback<JsArray<SuggestReviewerInfo>>() {
@@ -56,7 +56,7 @@
}
@Override
- public void requestDefaultSuggestions(final Request req, final Callback cb) {
+ public void requestDefaultSuggestions(Request req, Callback cb) {
requestSuggestions(req, cb);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java
index cd880a3..166029d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java
@@ -151,7 +151,7 @@
suggestBox.setServeSuggestionsOnOracle(false);
}
- private void addReviewer(final String reviewer, boolean confirmed) {
+ private void addReviewer(String reviewer, boolean confirmed) {
if (reviewer.isEmpty()) {
return;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
index f8bda64..1484809 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
@@ -50,7 +50,7 @@
private ChangeTable.Section incoming;
private ChangeTable.Section closed;
- public AccountDashboardScreen(final Account.Id id) {
+ public AccountDashboardScreen(Account.Id id) {
ownerId = id;
mine = Gerrit.isSignedIn() && ownerId.equals(Gerrit.getUserAccount().getId());
}
@@ -64,7 +64,7 @@
keysNavigation.add(
new KeyCommand(0, 'R', Util.C.keyReloadSearch()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(getToken());
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
index 055044c..2d6ae15 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
@@ -114,7 +114,7 @@
table.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
final Cell cell = table.getCellForEvent(event);
if (cell == null) {
return;
@@ -133,18 +133,18 @@
}
@Override
- protected Object getRowItemKey(final ChangeInfo item) {
+ protected Object getRowItemKey(ChangeInfo item) {
return item.legacyId();
}
@Override
- protected void onOpenRow(final int row) {
+ protected void onOpenRow(int row) {
final ChangeInfo c = getRowItem(row);
final Change.Id id = c.legacyId();
Gerrit.display(PageLinks.toChange(id));
}
- private void insertNoneRow(final int row) {
+ private void insertNoneRow(int row) {
insertRow(row);
table.setText(row, 0, Util.C.changeTableNone());
final FlexCellFormatter fmt = table.getFlexCellFormatter();
@@ -152,13 +152,13 @@
fmt.setStyleName(row, 0, Gerrit.RESOURCES.css().emptySection());
}
- private void insertChangeRow(final int row) {
+ private void insertChangeRow(int row) {
insertRow(row);
applyDataRowStyle(row);
}
@Override
- protected void applyDataRowStyle(final int row) {
+ protected void applyDataRowStyle(int row) {
super.applyDataRowStyle(row);
final CellFormatter fmt = table.getCellFormatter();
fmt.addStyleName(row, C_STAR, Gerrit.RESOURCES.css().iconCell());
@@ -225,7 +225,7 @@
}
}
- private void populateChangeRow(final int row, final ChangeInfo c, boolean highlightUnreviewed) {
+ private void populateChangeRow(int row, ChangeInfo c, boolean highlightUnreviewed) {
CellFormatter fmt = table.getCellFormatter();
if (Gerrit.isSignedIn()) {
table.setWidget(row, C_STAR, StarredChanges.createIcon(c.legacyId(), c.starred()));
@@ -416,7 +416,7 @@
return hex.length() == 1 ? "0" + hex : hex;
}
- public void addSection(final Section s) {
+ public void addSection(Section s) {
assert s.parent == null;
s.parent = this;
@@ -434,8 +434,8 @@
sections.add(s);
}
- private int insertRow(final int beforeRow) {
- for (final Section s : sections) {
+ private int insertRow(int beforeRow) {
+ for (Section s : sections) {
if (beforeRow <= s.titleRow) {
s.titleRow++;
}
@@ -446,8 +446,8 @@
return table.insertRow(beforeRow);
}
- private void removeRow(final int row) {
- for (final Section s : sections) {
+ private void removeRow(int row) {
+ for (Section s : sections) {
if (row < s.titleRow) {
s.titleRow--;
}
@@ -464,7 +464,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
int row = getCurrentRow();
ChangeInfo c = getRowItem(row);
if (c != null && Gerrit.isSignedIn()) {
@@ -474,7 +474,7 @@
}
private final class TableChangeLink extends ChangeLink {
- private TableChangeLink(final String text, final ChangeInfo c) {
+ private TableChangeLink(String text, ChangeInfo c) {
super(text, c.legacyId());
}
@@ -498,7 +498,7 @@
this.highlightUnreviewed = value;
}
- public void setTitleText(final String text) {
+ public void setTitleText(String text) {
titleText = text;
titleWidget = null;
if (titleRow >= 0) {
@@ -506,7 +506,7 @@
}
}
- public void setTitleWidget(final Widget title) {
+ public void setTitleWidget(Widget title) {
titleWidget = title;
titleText = null;
if (titleRow >= 0) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java
index 3cfe63d..aba4ee0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java
@@ -34,7 +34,7 @@
private List<String> titles;
private List<String> queries;
- public DashboardTable(final Screen screen, String params) {
+ public DashboardTable(Screen screen, String params) {
titles = new ArrayList<>();
queries = new ArrayList<>();
String foreach = null;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java
index 370d942..1695eb9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java
@@ -64,7 +64,7 @@
keysNavigation.add(
new KeyCommand(0, 'R', Util.C.keyReloadSearch()) {
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(getToken());
}
});
@@ -126,7 +126,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
if (link.isVisible()) {
History.newItem(link.getTargetHistoryToken());
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java
index 12638d7..f511308 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java
@@ -25,7 +25,7 @@
private DashboardTable table;
private String params;
- public ProjectDashboardScreen(final Project.NameKey toShow, String params) {
+ public ProjectDashboardScreen(Project.NameKey toShow, String params) {
super(toShow);
this.params = params;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java
index b4499ac..b1028420 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java
@@ -73,7 +73,7 @@
}
/** Make a key command that toggles the star for a change. */
- public static KeyCommand newKeyCommand(final Icon icon) {
+ public static KeyCommand newKeyCommand(Icon icon) {
return new KeyCommand(0, 's', Util.C.changeTableStar()) {
@Override
public void onKeyPress(KeyPressEvent event) {
@@ -99,7 +99,7 @@
* Set the starred status of a change. This method broadcasts to all interested UI widgets and
* sends an RPC to the server to record the updated status.
*/
- public static void toggleStar(final Change.Id changeId, final boolean newValue) {
+ public static void toggleStar(Change.Id changeId, boolean newValue) {
pending.put(changeId, newValue);
fireChangeStarEvent(changeId, newValue);
if (!busy) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java
index b2efcdb..b62b547 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java
@@ -25,7 +25,7 @@
private static final String SUBJECT_CROP_APPENDIX = "...";
private static final int SUBJECT_CROP_RANGE = 10;
- public static String toLongString(final Change.Status status) {
+ public static String toLongString(Change.Status status) {
if (status == null) {
return "";
}
@@ -62,7 +62,7 @@
* @return the subject, cropped if needed
*/
@SuppressWarnings("deprecation")
- public static String cropSubject(final String subject) {
+ public static String cropSubject(String subject) {
if (subject.length() > SUBJECT_MAX_LENGTH) {
final int maxLength = SUBJECT_MAX_LENGTH - SUBJECT_CROP_APPENDIX.length();
for (int cropPosition = maxLength;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java
index 6215854..0e4ef4e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java
@@ -34,7 +34,7 @@
public class DashboardsTable extends NavigationTable<DashboardInfo> {
Project.NameKey project;
- public DashboardsTable(final Project.NameKey project) {
+ public DashboardsTable(Project.NameKey project) {
super(Util.C.dashboardItem());
this.project = project;
initColumnHeaders();
@@ -96,7 +96,7 @@
finishDisplay();
}
- protected void insertTitleRow(final int row, String section) {
+ protected void insertTitleRow(int row, String section) {
table.insertRow(row);
table.setText(row, 0, section);
@@ -106,7 +106,7 @@
fmt.addStyleName(row, 0, Gerrit.RESOURCES.css().sectionHeader());
}
- protected void insert(final int row, final DashboardInfo k) {
+ protected void insert(int row, DashboardInfo k) {
table.insertRow(row);
applyDataRowStyle(row);
@@ -121,7 +121,7 @@
populate(row, k);
}
- protected void populate(final int row, final DashboardInfo k) {
+ protected void populate(int row, DashboardInfo k) {
if (k.isDefault()) {
table.setWidget(row, 1, new Image(Gerrit.RESOURCES.greenCheck()));
final FlexCellFormatter fmt = table.getFlexCellFormatter();
@@ -147,12 +147,12 @@
}
@Override
- protected Object getRowItemKey(final DashboardInfo item) {
+ protected Object getRowItemKey(DashboardInfo item) {
return item.id();
}
@Override
- protected void onOpenRow(final int row) {
+ protected void onOpenRow(int row) {
if (row > 0) {
movePointerTo(row);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java
index 702383a..9ccf6ea 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java
@@ -412,7 +412,7 @@
}
}
- private BeforeSelectionChangeHandler onSelectionChange(final CodeMirror cm) {
+ private BeforeSelectionChangeHandler onSelectionChange(CodeMirror cm) {
return new BeforeSelectionChangeHandler() {
private InsertCommentBubble bubble;
@@ -871,11 +871,11 @@
abstract Runnable updateActiveLine(CodeMirror cm);
- private GutterClickHandler onGutterClick(final CodeMirror cm) {
+ private GutterClickHandler onGutterClick(CodeMirror cm) {
return new GutterClickHandler() {
@Override
public void handle(
- CodeMirror instance, final int line, final String gutterClass, NativeEvent clickEvent) {
+ CodeMirror instance, int line, String gutterClass, NativeEvent clickEvent) {
if (Element.as(clickEvent.getEventTarget()).hasClassName(getLineNumberClassName())
&& clickEvent.getButton() == NativeEvent.BUTTON_LEFT
&& !clickEvent.getMetaKey()
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java
index b04973a..f8eab91 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java
@@ -35,7 +35,7 @@
@UiField Image icon;
- InsertCommentBubble(final CommentManager commentManager, final CodeMirror cm) {
+ InsertCommentBubble(CommentManager commentManager, CodeMirror cm) {
initWidget(uiBinder.createAndBindUi(this));
addDomHandler(
new ClickHandler() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
index 822bc74..e62a283 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
@@ -147,8 +147,7 @@
}
}
- void setUpBlame(
- final CodeMirror cm, final boolean isBase, final PatchSet.Id rev, final String path) {
+ void setUpBlame(final CodeMirror cm, boolean isBase, PatchSet.Id rev, String path) {
if (!Patch.isMagic(path) && Gerrit.isSignedIn() && Gerrit.info().change().allowBlame()) {
Anchor blameIcon = createBlameIcon();
blameIcon.addClickHandler(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
index f2b5fa6..b7f5948 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
@@ -138,7 +138,7 @@
}
@Override
- void registerCmEvents(final CodeMirror cm) {
+ void registerCmEvents(CodeMirror cm) {
super.registerCmEvents(cm);
KeyMap keyMap =
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java
index cfd4226..2877794 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java
@@ -219,7 +219,7 @@
* @param line line to put the padding below.
* @param len number of lines to pad. Padding is inserted only if {@code len >= 1}.
*/
- private void addPadding(CodeMirror cm, int line, final int len) {
+ private void addPadding(CodeMirror cm, int line, int len) {
if (0 < len) {
Element pad = DOM.createDiv();
pad.setClassName(SideBySideTable.style.padding());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java
index eafb10f..c138f37 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java
@@ -62,7 +62,7 @@
private TextMarker textMarker;
private SkipBar otherBar;
- SkipBar(SkipManager manager, final CodeMirror cm) {
+ SkipBar(SkipManager manager, CodeMirror cm) {
this.manager = manager;
this.cm = cm;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java
index ea2f2cf..df9bcf9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java
@@ -30,7 +30,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
Gerrit.display(PageLinks.toChange(revision.getParentKey(), revision.getId()));
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java
index 3cf00c9..d78e592 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java
@@ -661,7 +661,7 @@
}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
close.setEnabled(true);
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java
index 74cfaf1..01c4d26 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java
@@ -44,7 +44,7 @@
}
/** Check if the current user is owner of a group */
- public static void isGroupOwner(String groupName, final AsyncCallback<Boolean> cb) {
+ public static void isGroupOwner(String groupName, AsyncCallback<Boolean> cb) {
GroupMap.myOwned(
groupName,
new AsyncCallback<GroupMap>() {
@@ -105,7 +105,7 @@
/** Add members to a group. */
public static void addMembers(
- AccountGroup.UUID group, Set<String> members, final AsyncCallback<JsArray<AccountInfo>> cb) {
+ AccountGroup.UUID group, Set<String> members, AsyncCallback<JsArray<AccountInfo>> cb) {
if (members.size() == 1) {
addMember(
group,
@@ -132,7 +132,7 @@
/** Remove members from a group. */
public static void removeMembers(
- AccountGroup.UUID group, Set<Integer> ids, final AsyncCallback<VoidResult> cb) {
+ AccountGroup.UUID group, Set<Integer> ids, AsyncCallback<VoidResult> cb) {
if (ids.size() == 1) {
members(group).id(ids.iterator().next().toString()).delete(cb);
} else {
@@ -181,7 +181,7 @@
/** Remove included groups from a group. */
public static void removeIncludedGroups(
- AccountGroup.UUID group, Set<AccountGroup.UUID> ids, final AsyncCallback<VoidResult> cb) {
+ AccountGroup.UUID group, Set<AccountGroup.UUID> ids, AsyncCallback<VoidResult> cb) {
if (ids.size() == 1) {
AccountGroup.UUID g = ids.iterator().next();
groups(group).id(g.get()).delete(cb);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java
index 7182b78..7e2f2be 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java
@@ -93,7 +93,7 @@
};
}
- private void getImpl(final String name, final AsyncCallback<Entry> cb) {
+ private void getImpl(String name, AsyncCallback<Entry> cb) {
Entry e = cache.get(name);
if (e != null) {
cb.onSuccess(e);
@@ -116,7 +116,7 @@
});
}
- private void getImpl(final Integer id, final AsyncCallback<Entry> cb) {
+ private void getImpl(Integer id, AsyncCallback<Entry> cb) {
String name = changeToProject.get(id);
if (name != null) {
getImpl(name, cb);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java
index 71fa007..a85c4c2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java
@@ -176,7 +176,7 @@
project(name).view("config").put(in, cb);
}
- public static void getParent(Project.NameKey name, final AsyncCallback<Project.NameKey> cb) {
+ public static void getParent(Project.NameKey name, AsyncCallback<Project.NameKey> cb) {
project(name)
.view("parent")
.get(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java
index 90a820f..af32d01 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java
@@ -65,7 +65,7 @@
return add(cb);
}
- public <T> Callback<T> add(final AsyncCallback<T> cb) {
+ public <T> Callback<T> add(AsyncCallback<T> cb) {
checkFinalAdded();
return handleAdd(cb);
}
@@ -75,13 +75,13 @@
return handleAdd(cb);
}
- public <T> Callback<T> addFinal(final AsyncCallback<T> cb) {
+ public <T> Callback<T> addFinal(AsyncCallback<T> cb) {
checkFinalAdded();
finalAdded = true;
return handleAdd(cb);
}
- public <T> HttpCallback<T> addFinal(final HttpCallback<T> cb) {
+ public <T> HttpCallback<T> addFinal(HttpCallback<T> cb) {
checkFinalAdded();
finalAdded = true;
return handleAdd(cb);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
index 5688a31..2d6723a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
@@ -32,7 +32,7 @@
implements com.google.gwtjsonrpc.common.AsyncCallback<T>,
com.google.gwt.user.client.rpc.AsyncCallback<T> {
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
showFailure(caught);
}
@@ -77,7 +77,7 @@
return false;
}
- protected static boolean isInvalidXSRF(final Throwable caught) {
+ protected static boolean isInvalidXSRF(Throwable caught) {
return caught instanceof InvocationException
&& caught.getMessage().equals(JsonConstants.ERROR_INVALID_XSRF);
}
@@ -94,17 +94,17 @@
&& caught.getMessage().equals(NoSuchEntityException.MESSAGE));
}
- protected static boolean isNoSuchAccount(final Throwable caught) {
+ protected static boolean isNoSuchAccount(Throwable caught) {
return caught instanceof RemoteJsonException
&& caught.getMessage().startsWith(NoSuchAccountException.MESSAGE);
}
- protected static boolean isNameAlreadyUsed(final Throwable caught) {
+ protected static boolean isNameAlreadyUsed(Throwable caught) {
return caught instanceof RemoteJsonException
&& caught.getMessage().startsWith(NameAlreadyUsedException.MESSAGE);
}
- protected static boolean isNoSuchGroup(final Throwable caught) {
+ protected static boolean isNoSuchGroup(Throwable caught) {
return caught instanceof RemoteJsonException
&& caught.getMessage().startsWith(NoSuchGroupException.MESSAGE);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java
index 250bc6e..8b0fefb 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java
@@ -116,7 +116,7 @@
}
@Override
- public void onResponseReceived(Request req, final Response res) {
+ public void onResponseReceived(Request req, Response res) {
int status = res.getStatusCode();
if (status == Response.SC_NO_CONTENT) {
cb.onSuccess(new HttpResponse<T>(res, null, null));
@@ -499,7 +499,7 @@
}
}
- private static <T extends JavaScriptObject> HttpCallback<T> wrap(final AsyncCallback<T> cb) {
+ private static <T extends JavaScriptObject> HttpCallback<T> wrap(AsyncCallback<T> cb) {
return new HttpCallback<T>() {
@Override
public void onSuccess(HttpResponse<T> r) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
index 74b45df..3aae04a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
@@ -24,12 +24,12 @@
public abstract class ScreenLoadCallback<T> extends GerritCallback<T> {
private final Screen screen;
- public ScreenLoadCallback(final Screen s) {
+ public ScreenLoadCallback(Screen s) {
screen = s;
}
@Override
- public final void onSuccess(final T result) {
+ public final void onSuccess(T result) {
if (screen.isAttached()) {
preDisplay(result);
screen.display();
@@ -42,7 +42,7 @@
protected void postDisplay() {}
@Override
- public void onFailure(final Throwable caught) {
+ public void onFailure(Throwable caught) {
if (isSigninFailure(caught)) {
new NotSignedInDialog().center();
} else if (isNoSuchEntity(caught)) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
index 80b8c66..bdebd68 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
@@ -32,7 +32,7 @@
private Project.NameKey projectName;
@Override
- public void _onRequestSuggestions(final Request req, final Callback callback) {
+ public void _onRequestSuggestions(Request req, Callback callback) {
GroupMap.suggestAccountGroupForProject(
projectName == null ? null : projectName.get(),
req.getQuery(),
@@ -58,7 +58,7 @@
private static class AccountGroupSuggestion implements SuggestOracle.Suggestion {
private final GroupInfo info;
- AccountGroupSuggestion(final GroupInfo k) {
+ AccountGroupSuggestion(GroupInfo k) {
info = k;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
index 78ae156..5038ad9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
@@ -27,7 +27,7 @@
/** Suggestion Oracle for Account entities. */
public class AccountSuggestOracle extends SuggestAfterTypingNCharsOracle {
@Override
- public void _onRequestSuggestions(final Request req, final Callback cb) {
+ public void _onRequestSuggestions(Request req, Callback cb) {
AccountApi.suggest(
req.getQuery(),
req.getLimit(),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
index 5d8d56c..a1d2229 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
@@ -29,8 +29,7 @@
private final Button addMember;
private final RemoteSuggestBox suggestBox;
- public AddMemberBox(
- final String buttonLabel, final String hint, final SuggestOracle suggestOracle) {
+ public AddMemberBox(final String buttonLabel, String hint, SuggestOracle suggestOracle) {
addPanel = new FlowPanel();
addMember = new Button(buttonLabel);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
index 1ae4489..68477bc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
@@ -20,13 +20,13 @@
import com.google.gwt.core.client.GWT;
public class ChangeLink extends InlineHyperlink {
- public static String permalink(final Change.Id c) {
+ public static String permalink(Change.Id c) {
return GWT.getHostPageBaseURL() + c.get();
}
protected Change.Id cid;
- public ChangeLink(final String text, final Change.Id c) {
+ public ChangeLink(String text, Change.Id c) {
super(text, PageLinks.toChange(c));
getElement().setPropertyString("href", permalink(c));
cid = c;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java
index 85552c9..0a0c14a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java
@@ -51,7 +51,7 @@
@Override
protected void onRequestSuggestions(Request request, Callback done) {
List<BranchSuggestion> suggestions = new ArrayList<>();
- for (final BranchInfo b : branches) {
+ for (BranchInfo b : branches) {
if (b.ref().contains(request.getQuery())) {
suggestions.add(new BranchSuggestion(b));
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java
index 72bf06c..c5ee34f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java
@@ -24,7 +24,7 @@
public class CommandMenuItem extends Anchor implements ClickHandler {
private final Command command;
- public CommandMenuItem(final String text, final Command cmd) {
+ public CommandMenuItem(String text, Command cmd) {
super(text);
setStyleName(Gerrit.RESOURCES.css().menuItem());
Roles.getMenuitemRole().set(getElement());
@@ -33,7 +33,7 @@
}
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
setFocus(false);
command.execute();
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java
index d497740..b68f329 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java
@@ -37,7 +37,7 @@
protected boolean sent;
- public CommentedActionDialog(final String title, final String heading) {
+ public CommentedActionDialog(String title, String heading) {
super(/* auto hide */ false, /* modal */ true);
setGlassEnabled(true);
setText(title);
@@ -48,7 +48,7 @@
sendButton.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
enableButtons(false);
onSend();
}
@@ -59,7 +59,7 @@
cancelButton.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
hide();
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
index f65fb1b..c0b662a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
@@ -32,7 +32,7 @@
private final DisclosurePanel main;
private final Panel header;
- public ComplexDisclosurePanel(final String text, final boolean isOpen) {
+ public ComplexDisclosurePanel(String text, boolean isOpen) {
// Ick. GWT's DisclosurePanel won't let us subclass it, or do any
// other modification of its header. We're stuck with injecting
// into the DOM directly.
@@ -81,7 +81,7 @@
return header;
}
- public void setContent(final Widget w) {
+ public void setContent(Widget w) {
main.setContent(w);
}
@@ -90,12 +90,12 @@
}
@Override
- public HandlerRegistration addOpenHandler(final OpenHandler<DisclosurePanel> h) {
+ public HandlerRegistration addOpenHandler(OpenHandler<DisclosurePanel> h) {
return main.addOpenHandler(h);
}
@Override
- public HandlerRegistration addCloseHandler(final CloseHandler<DisclosurePanel> h) {
+ public HandlerRegistration addCloseHandler(CloseHandler<DisclosurePanel> h) {
return main.addCloseHandler(h);
}
@@ -109,7 +109,7 @@
*
* @param isOpen {@code true} to open, {@code false} to close
*/
- public void setOpen(final boolean isOpen) {
+ public void setOpen(boolean isOpen) {
main.setOpen(isOpen);
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
index a9a17210..045e0ae 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
@@ -48,11 +48,11 @@
return new MyFlexTable();
}
- protected RowItem getRowItem(final int row) {
+ protected RowItem getRowItem(int row) {
return FancyFlexTable.<RowItem>getRowItem(table.getCellFormatter().getElement(row, 0));
}
- protected void setRowItem(final int row, final RowItem item) {
+ protected void setRowItem(int row, RowItem item) {
setRowItem(table.getCellFormatter().getElement(row, 0), item);
}
@@ -117,15 +117,15 @@
return left;
}
- protected void resetHtml(final SafeHtml body) {
- for (final Iterator<Widget> i = table.iterator(); i.hasNext(); ) {
+ protected void resetHtml(SafeHtml body) {
+ for (Iterator<Widget> i = table.iterator(); i.hasNext(); ) {
i.next();
i.remove();
}
impl.resetHtml(table, body);
}
- protected void scrollIntoView(final int topRow, final int endRow) {
+ protected void scrollIntoView(int topRow, int endRow) {
final CellFormatter fmt = table.getCellFormatter();
final Element top = fmt.getElement(topRow, C_ARROW).getParentElement();
final Element end = fmt.getElement(endRow, C_ARROW).getParentElement();
@@ -164,7 +164,7 @@
Document.get().setScrollTop(nTop);
}
- protected void applyDataRowStyle(final int newRow) {
+ protected void applyDataRowStyle(int newRow) {
table.getCellFormatter().addStyleName(newRow, C_ARROW, Gerrit.RESOURCES.css().iconCell());
table.getCellFormatter().addStyleName(newRow, C_ARROW, Gerrit.RESOURCES.css().leftMostCell());
}
@@ -176,7 +176,7 @@
* @return the td containing element {@code target}; null if {@code target} is not a member of
* this table.
*/
- protected Element getParentCell(final Element target) {
+ protected Element getParentCell(Element target) {
final Element body = FancyFlexTableImpl.getBodyElement(table);
for (Element td = target; td != null && td != body; td = DOM.getParent(td)) {
// If it's a TD, it might be the one we're looking for.
@@ -192,7 +192,7 @@
}
/** @return the row of the child element; -1 if the child is not in the table. */
- protected int rowOf(final Element target) {
+ protected int rowOf(Element target) {
final Element td = getParentCell(target);
if (td == null) {
return -1;
@@ -203,7 +203,7 @@
}
/** @return the cell of the child element; -1 if the child is not in the table. */
- protected int columnOf(final Element target) {
+ protected int columnOf(Element target) {
final Element td = getParentCell(target);
if (td == null) {
return -1;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java
index ded0140..a3a2a7a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java
@@ -20,7 +20,7 @@
import com.google.gwtexpui.safehtml.client.SafeHtml;
public class FancyFlexTableImpl {
- public void resetHtml(final FlexTable myTable, final SafeHtml body) {
+ public void resetHtml(FlexTable myTable, SafeHtml body) {
SafeHtml.setInnerHTML(getBodyElement(myTable), body);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java
index a648412..3eae0f8 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java
@@ -23,7 +23,7 @@
public class FancyFlexTableImplIE8 extends FancyFlexTableImpl {
@Override
- public void resetHtml(final FlexTable myTable, final SafeHtml bodyHtml) {
+ public void resetHtml(FlexTable myTable, SafeHtml bodyHtml) {
final Element oldBody = getBodyElement(myTable);
final Element newBody = parseBody(bodyHtml);
assert newBody != null;
@@ -34,7 +34,7 @@
DOM.appendChild(tableElem, newBody);
}
- private static Element parseBody(final SafeHtml body) {
+ private static Element parseBody(SafeHtml body) {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
b.openElement("table");
b.append(body);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java
index 6e1fb09..f8e382a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java
@@ -18,8 +18,7 @@
private String toHighlight;
- public HighlightingInlineHyperlink(
- final String text, final String token, final String toHighlight) {
+ public HighlightingInlineHyperlink(final String text, String token, String toHighlight) {
super(text, token);
this.toHighlight = toHighlight;
highlight(text, toHighlight);
@@ -31,7 +30,7 @@
highlight(text, toHighlight);
}
- private void highlight(final String text, final String toHighlight) {
+ private void highlight(String text, String toHighlight) {
setHTML(Util.highlight(text, toHighlight));
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java
index 643c766..1e3be3f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java
@@ -21,13 +21,13 @@
public class HighlightingProjectsTable extends ProjectsTable {
private String toHighlight;
- public void display(final ProjectMap projects, final String toHighlight) {
+ public void display(ProjectMap projects, String toHighlight) {
this.toHighlight = toHighlight;
super.display(projects);
}
@Override
- protected void populate(final int row, final ProjectInfo k) {
+ protected void populate(int row, ProjectInfo k) {
populateState(row, k);
table.setWidget(
row, ProjectsTable.C_NAME, new InlineHTML(Util.highlight(k.name(), toHighlight)));
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
index f8ad835..4ccfe9d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
@@ -127,7 +127,7 @@
addKeyDownHandler(
new KeyDownHandler() {
@Override
- public void onKeyDown(final KeyDownEvent event) {
+ public void onKeyDown(KeyDownEvent event) {
onKey(event.getNativeKeyCode());
}
});
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java
index 6c28145..c35d097 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java
@@ -35,7 +35,7 @@
* @param token the history token to which it will link, which may not be null (use {@link Anchor}
* instead if you don't need history processing)
*/
- public Hyperlink(final String text, final String token) {
+ public Hyperlink(String text, String token) {
super(text, token);
}
@@ -52,7 +52,7 @@
}
@Override
- public void onBrowserEvent(final Event event) {
+ public void onBrowserEvent(Event event) {
if (DOM.eventGetType(event) == Event.ONCLICK && impl.handleAsClick(event)) {
event.preventDefault();
go();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java
index 24f2887..a4edb5b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java
@@ -28,7 +28,7 @@
* @param text the hyperlink's text
* @param token the history token to which it will link
*/
- public InlineHyperlink(final String text, final String token) {
+ public InlineHyperlink(String text, String token) {
super(text, token);
}
@@ -36,7 +36,7 @@
public InlineHyperlink() {}
@Override
- public void onBrowserEvent(final Event event) {
+ public void onBrowserEvent(Event event) {
if (DOM.eventGetType(event) == Event.ONCLICK && impl.handleAsClick(event)) {
event.preventDefault();
go();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
index d08b6f9..d3db098 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
@@ -32,20 +32,20 @@
Gerrit.EVENT_BUS.addHandler(ScreenLoadEvent.TYPE, this);
}
- public void addItem(final String text, final Command imp) {
+ public void addItem(String text, Command imp) {
add(new CommandMenuItem(text, imp));
}
- public void addItem(final CommandMenuItem i) {
+ public void addItem(CommandMenuItem i) {
add(i);
}
- public void addItem(final LinkMenuItem i) {
+ public void addItem(LinkMenuItem i) {
i.setMenuBar(this);
add(i);
}
- public void insertItem(final LinkMenuItem i, int beforeIndex) {
+ public void insertItem(LinkMenuItem i, int beforeIndex) {
i.setMenuBar(this);
insert(i, beforeIndex);
}
@@ -66,7 +66,7 @@
return null;
}
- public void add(final Widget i) {
+ public void add(Widget i) {
if (body.getWidgetCount() > 0) {
final Widget p = body.getWidget(body.getWidgetCount() - 1);
p.addStyleName(Gerrit.RESOURCES.css().linkMenuItemNotLast());
@@ -74,7 +74,7 @@
body.add(i);
}
- public void insert(final Widget i, int beforeIndex) {
+ public void insert(Widget i, int beforeIndex) {
if (body.getWidgetCount() == 0 || body.getWidgetCount() <= beforeIndex) {
add(i);
return;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
index 9cc91a0..8a8ab25 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
@@ -21,7 +21,7 @@
public class LinkMenuItem extends InlineHyperlink implements ScreenLoadHandler {
private LinkMenuBar bar;
- public LinkMenuItem(final String text, final String targetHistoryToken) {
+ public LinkMenuItem(String text, String targetHistoryToken) {
super(text, targetHistoryToken);
setStyleName(Gerrit.RESOURCES.css().menuItem());
Roles.getMenuitemRole().set(getElement());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java
index 2c614b5..0f28ddc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java
@@ -54,22 +54,22 @@
}
@Override
- protected void add(final Widget w) {
+ protected void add(Widget w) {
body.add(w);
}
- protected void link(final String text, final String target) {
+ protected void link(String text, String target) {
link(text, target, true);
}
- protected void link(final String text, final String target, final boolean visible) {
+ protected void link(String text, String target, boolean visible) {
final LinkMenuItem item = new LinkMenuItem(text, target);
item.setStyleName(Gerrit.RESOURCES.css().menuItem());
item.setVisible(visible);
menu.add(item);
}
- protected void setLinkVisible(final String token, final boolean visible) {
+ protected void setLinkVisible(String token, boolean visible) {
final LinkMenuItem item = menu.find(token);
item.setVisible(visible);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java
index 8975dda..7e34730 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java
@@ -42,7 +42,7 @@
}
@Override
- public void onBrowserEvent(final Event event) {
+ public void onBrowserEvent(Event event) {
switch (DOM.eventGetType(event)) {
case Event.ONCLICK:
{
@@ -198,11 +198,11 @@
}
}
- protected void movePointerTo(final int newRow) {
+ protected void movePointerTo(int newRow) {
movePointerTo(newRow, true);
}
- protected void movePointerTo(final int newRow, final boolean scroll) {
+ protected void movePointerTo(int newRow, boolean scroll) {
final CellFormatter fmt = table.getCellFormatter();
final boolean clear = 0 <= currentRow && currentRow < table.getRowCount();
if (clear) {
@@ -223,7 +223,7 @@
currentRow = newRow;
}
- protected void scrollIntoView(final Element tr) {
+ protected void scrollIntoView(Element tr) {
if (!computedScrollType) {
parentScrollPanel = null;
Widget w = getParent();
@@ -280,14 +280,14 @@
}
}
- protected void movePointerTo(final Object oldId) {
+ protected void movePointerTo(Object oldId) {
final int row = findRow(oldId);
if (0 <= row) {
movePointerTo(row);
}
}
- protected int findRow(final Object oldId) {
+ protected int findRow(Object oldId) {
if (oldId != null) {
final int max = table.getRowCount();
for (int row = 0; row < max; row++) {
@@ -318,11 +318,11 @@
}
}
- public void setSavePointerId(final String id) {
+ public void setSavePointerId(String id) {
saveId = id;
}
- public void setRegisterKeys(final boolean on) {
+ public void setRegisterKeys(boolean on) {
if (on && isAttached()) {
if (regNavigation == null) {
regNavigation = GlobalKey.add(this, keysNavigation);
@@ -375,7 +375,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
ensurePointerVisible();
onUp();
}
@@ -387,7 +387,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
ensurePointerVisible();
onDown();
}
@@ -399,7 +399,7 @@
}
@Override
- public void onKeyPress(final KeyPressEvent event) {
+ public void onKeyPress(KeyPressEvent event) {
ensurePointerVisible();
onOpen();
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java
index 87de3b7..2c7fcd4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java
@@ -54,33 +54,33 @@
// The first parameter to the contructors must be the FocusWidget to enable,
// subsequent parameters are widgets to listenTo.
- public OnEditEnabler(final FocusWidget w, final TextBoxBase tb) {
+ public OnEditEnabler(FocusWidget w, TextBoxBase tb) {
this(w);
originalValue = tb.getValue().trim();
listenTo(tb);
}
- public OnEditEnabler(final FocusWidget w, final ListBox lb) {
+ public OnEditEnabler(FocusWidget w, ListBox lb) {
this(w);
listenTo(lb);
}
- public OnEditEnabler(final FocusWidget w, final CheckBox cb) {
+ public OnEditEnabler(FocusWidget w, CheckBox cb) {
this(w);
listenTo(cb);
}
- public OnEditEnabler(final FocusWidget w) {
+ public OnEditEnabler(FocusWidget w) {
widget = w;
}
- public void updateOriginalValue(final TextBoxBase tb) {
+ public void updateOriginalValue(TextBoxBase tb) {
originalValue = tb.getValue().trim();
}
// Register input widgets to be listened to
- public void listenTo(final TextBoxBase tb) {
+ public void listenTo(TextBoxBase tb) {
strings.put(tb, tb.getText().trim());
tb.addKeyPressHandler(this);
@@ -105,44 +105,44 @@
tb.addKeyDownHandler(this);
}
- public void listenTo(final ListBox lb) {
+ public void listenTo(ListBox lb) {
lb.addChangeHandler(this);
}
@SuppressWarnings({"unchecked", "rawtypes"})
- public void listenTo(final CheckBox cb) {
+ public void listenTo(CheckBox cb) {
cb.addValueChangeHandler((ValueChangeHandler) this);
}
// Handlers
@Override
- public void onKeyPress(final KeyPressEvent e) {
+ public void onKeyPress(KeyPressEvent e) {
on(e);
}
@Override
- public void onKeyDown(final KeyDownEvent e) {
+ public void onKeyDown(KeyDownEvent e) {
on(e);
}
@Override
- public void onMouseUp(final MouseUpEvent e) {
+ public void onMouseUp(MouseUpEvent e) {
on(e);
}
@Override
- public void onChange(final ChangeEvent e) {
+ public void onChange(ChangeEvent e) {
on(e);
}
@SuppressWarnings("rawtypes")
@Override
- public void onValueChange(final ValueChangeEvent e) {
+ public void onValueChange(ValueChangeEvent e) {
on(e);
}
- private void on(final GwtEvent<?> e) {
+ private void on(GwtEvent<?> e) {
if (widget.isEnabled()
|| !(e.getSource() instanceof FocusWidget)
|| !((FocusWidget) e.getSource()).isEnabled()) {
@@ -172,7 +172,7 @@
}
}
- private void onTextBoxBase(final TextBoxBase tb) {
+ private void onTextBoxBase(TextBoxBase tb) {
// The text appears to not get updated until the handlers complete.
Scheduler.get()
.scheduleDeferred(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java
index fab0cf7..7c45a20 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java
@@ -38,11 +38,11 @@
suggestBox.setVisibleLength(len);
}
- public void setProject(final Project.NameKey project) {
+ public void setProject(Project.NameKey project) {
suggestOracle.setProject(project);
}
- public void setParentProject(final Project.NameKey parent) {
+ public void setParentProject(Project.NameKey parent) {
suggestBox.setText(parent != null ? parent.get() : "");
}
@@ -77,7 +77,7 @@
}
@Override
- public void _onRequestSuggestions(Request req, final Callback callback) {
+ public void _onRequestSuggestions(Request req, Callback callback) {
super._onRequestSuggestions(
req,
new Callback() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java
index cace84b..89bff71 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java
@@ -52,7 +52,7 @@
private boolean poppingUp;
private boolean firstPopupLoad = true;
- public void initPopup(final String popupText, final String currentPageLink) {
+ public void initPopup(String popupText, String currentPageLink) {
createWidgets(popupText, currentPageLink);
final FlowPanel pfp = new FlowPanel();
pfp.add(filterPanel);
@@ -109,7 +109,7 @@
return poppingUp;
}
- private void createWidgets(final String popupText, final String currentPageLink) {
+ private void createWidgets(String popupText, String currentPageLink) {
filterPanel = new HorizontalPanel();
filterPanel.setStyleName(Gerrit.RESOURCES.css().projectFilterPanel());
final Label filterLabel =
@@ -135,13 +135,13 @@
projectsTab =
new HighlightingProjectsTable() {
@Override
- protected void movePointerTo(final int row, final boolean scroll) {
+ protected void movePointerTo(int row, boolean scroll) {
super.movePointerTo(row, scroll);
onMovePointerTo(getRowItem(row).name());
}
@Override
- protected void onOpenRow(final int row) {
+ protected void onOpenRow(int row) {
super.onOpenRow(row);
openRow(getRowItem(row).name());
}
@@ -161,7 +161,7 @@
close.addClickHandler(
new ClickHandler() {
@Override
- public void onClick(final ClickEvent event) {
+ public void onClick(ClickEvent event) {
closePopup();
}
});
@@ -188,7 +188,7 @@
popup.hide();
}
- public void setPreferredCoordinates(final int top, final int left) {
+ public void setPreferredCoordinates(int top, int left) {
this.preferredTop = top;
this.preferredLeft = left;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java
index 2767a05..f2ebf81 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java
@@ -21,7 +21,7 @@
/** Suggestion Oracle for Project.NameKey entities. */
public class ProjectNameSuggestOracle extends SuggestAfterTypingNCharsOracle {
@Override
- public void _onRequestSuggestions(final Request req, final Callback callback) {
+ public void _onRequestSuggestions(Request req, Callback callback) {
ProjectMap.suggest(
req.getQuery(),
req.getLimit(),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java
index 99d0e8e..ac89180 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java
@@ -48,12 +48,12 @@
}
@Override
- protected Object getRowItemKey(final ProjectInfo item) {
+ protected Object getRowItemKey(ProjectInfo item) {
return item.name();
}
@Override
- protected void onOpenRow(final int row) {
+ protected void onOpenRow(int row) {
if (row > 0) {
movePointerTo(row);
}
@@ -84,7 +84,7 @@
finishDisplay();
}
- protected void insert(final int row, final ProjectInfo k) {
+ protected void insert(int row, ProjectInfo k) {
table.insertRow(row);
applyDataRowStyle(row);
@@ -98,7 +98,7 @@
populate(row, k);
}
- protected void populate(final int row, final ProjectInfo k) {
+ protected void populate(int row, ProjectInfo k) {
populateState(row, k);
table.setText(row, C_NAME, k.name());
table.setText(row, C_DESCRIPTION, k.description());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
index b0ee915..03ed899 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
@@ -96,12 +96,12 @@
header.getCellFormatter().setWidth(0, Cols.FarEast.ordinal(), "100%");
}
- protected void setWindowTitle(final String text) {
+ protected void setWindowTitle(String text) {
windowTitle = text;
Gerrit.setWindowTitle(this, text);
}
- protected void setPageTitle(final String text) {
+ protected void setPageTitle(String text) {
final String old = headerText.getText();
if (text.isEmpty()) {
header.setVisible(false);
@@ -118,23 +118,23 @@
header.setVisible(value);
}
- public void setTitle(final Widget w) {
+ public void setTitle(Widget w) {
titleWidget = w;
}
- protected void setTitleEast(final Widget w) {
+ protected void setTitleEast(Widget w) {
header.setWidget(0, Cols.East.ordinal(), w);
}
- protected void setTitleFarEast(final Widget w) {
+ protected void setTitleFarEast(Widget w) {
header.setWidget(0, Cols.FarEast.ordinal(), w);
}
- protected void setTitleWest(final Widget w) {
+ protected void setTitleWest(Widget w) {
header.setWidget(0, Cols.West.ordinal(), w);
}
- protected void add(final Widget w) {
+ protected void add(Widget w) {
body.add(w);
}
@@ -142,7 +142,7 @@
return body;
}
- protected void setTheme(final ThemeInfo t) {
+ protected void setTheme(ThemeInfo t) {
theme = t;
}
@@ -152,7 +152,7 @@
}
/** Set the history token for this screen. */
- public void setToken(final String t) {
+ public void setToken(String t) {
assert t != null && !t.isEmpty();
token = t;
@@ -172,7 +172,7 @@
}
/** Set whether or not {@link Gerrit#isSignedIn()} must be true. */
- public final void setRequiresSignIn(final boolean b) {
+ public final void setRequiresSignIn(boolean b) {
requiresSignIn = b;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java
index b76c2fe..ea18d62 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java
@@ -22,7 +22,7 @@
setStyleName(Gerrit.RESOURCES.css().smallHeading());
}
- public SmallHeading(final String text) {
+ public SmallHeading(String text) {
this();
setText(text);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java
index 26026e1..41e3573 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java
@@ -21,7 +21,7 @@
public static final UIConstants C = GWT.create(UIConstants.class);
public static final UIMessages M = GWT.create(UIMessages.class);
- public static String highlight(final String text, final String toHighlight) {
+ public static String highlight(String text, String toHighlight) {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
if (toHighlight == null || "".equals(toHighlight)) {
b.append(text);
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java b/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java
index ce91a46..cb1891e 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java
@@ -68,7 +68,7 @@
}
}
- private void beginLoading(final String addon) {
+ private void beginLoading(String addon) {
pending++;
Loader.injectScript(
getAddonScriptUri(addon),
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java
index 582a3109..01bc7e2 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java
@@ -29,7 +29,7 @@
public class Loader {
private static native boolean isLibLoaded() /*-{ return $wnd.hasOwnProperty('CodeMirror'); }-*/;
- static void initLibrary(final AsyncCallback<Void> cb) {
+ static void initLibrary(AsyncCallback<Void> cb) {
if (isLibLoaded()) {
cb.onSuccess(null);
return;
@@ -53,7 +53,7 @@
group.done();
}
- private static void injectCss(ExternalTextResource css, final AsyncCallback<Void> cb) {
+ private static void injectCss(ExternalTextResource css, AsyncCallback<Void> cb) {
try {
css.getText(
new ResourceCallback<TextResource>() {
@@ -74,7 +74,7 @@
}
}
- public static void injectScript(SafeUri js, final AsyncCallback<Void> callback) {
+ public static void injectScript(SafeUri js, AsyncCallback<Void> callback) {
final ScriptElement[] script = new ScriptElement[1];
script[0] =
ScriptInjector.fromUrl(js.asString())
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java
index 7440102..5fda608 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java
@@ -70,7 +70,7 @@
}
}
- private void beginLoading(final String mode) {
+ private void beginLoading(String mode) {
pending++;
Loader.injectScript(
ModeInfo.getModeScriptUri(mode),
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java b/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java
index 1dce708..23039d4 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java
@@ -74,7 +74,7 @@
private static final EnumSet<Theme> loaded = EnumSet.of(Theme.DEFAULT);
- public static final void loadTheme(final Theme theme, final AsyncCallback<Void> cb) {
+ public static final void loadTheme(Theme theme, AsyncCallback<Void> cb) {
if (loaded.contains(theme)) {
cb.onSuccess(null);
return;
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java
index 09b6f25..e6918f70 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java
@@ -97,7 +97,7 @@
}
@Override
- public void doFilter(ServletRequest req, ServletResponse res, final FilterChain last)
+ public void doFilter(ServletRequest req, ServletResponse res, FilterChain last)
throws IOException, ServletException {
final Iterator<AllRequestFilter> itr = filters.iterator();
new FilterChain() {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java
index f7309ec..9733d96 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java
@@ -56,12 +56,12 @@
private CurrentUser user;
protected CacheBasedWebSession(
- final HttpServletRequest request,
- final HttpServletResponse response,
- final WebSessionManager manager,
- final AuthConfig authConfig,
- final Provider<AnonymousUser> anonymousProvider,
- final IdentifiedUser.RequestFactory identified) {
+ HttpServletRequest request,
+ HttpServletResponse response,
+ WebSessionManager manager,
+ AuthConfig authConfig,
+ Provider<AnonymousUser> anonymousProvider,
+ IdentifiedUser.RequestFactory identified) {
this.request = request;
this.response = response;
this.manager = manager;
@@ -91,7 +91,7 @@
private String readCookie() {
final Cookie[] all = request.getCookies();
if (all != null) {
- for (final Cookie c : all) {
+ for (Cookie c : all) {
if (ACCOUNT_COOKIE.equals(c.getName())) {
final String v = c.getValue();
return v != null && !"".equals(v) ? v : null;
@@ -229,7 +229,7 @@
response.addCookie(outCookie);
}
- private static boolean isSecure(final HttpServletRequest req) {
+ private static boolean isSecure(HttpServletRequest req) {
return req.isSecure() || "https".equals(req.getScheme());
}
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
index 11342be..52cfde7 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
@@ -32,14 +32,14 @@
enc[o] = '.';
}
- private static int fill(final char[] out, int o, final char f, final int l) {
+ private static int fill(char[] out, int o, char f, int l) {
for (char c = f; c <= l; c++) {
out[o++] = c;
}
return o;
}
- static String encode(final byte[] in) {
+ static String encode(byte[] in) {
final StringBuilder out = new StringBuilder(in.length * 4 / 3);
final int len2 = in.length - 2;
int d = 0;
@@ -52,8 +52,7 @@
return out.toString();
}
- private static void encode3to4(
- final StringBuilder out, final byte[] in, final int inOffset, final int numSigBytes) {
+ private static void encode3to4(StringBuilder out, byte[] in, int inOffset, int numSigBytes) {
// 1 2 3
// 01234567890123456789012345678901 Bit position
// --------000000001111111122222222 Array position from threeBytes
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java
index 825505c..be9df4c 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java
@@ -32,8 +32,7 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
String query = CharMatcher.is('/').trimTrailingFrom(req.getPathInfo());
List<ChangeInfo> results;
try {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java
index bbcd977..4282691 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java
@@ -41,7 +41,7 @@
private final boolean enabled;
@Inject
- Module(@GerritServerConfig final Config cfg) {
+ Module(@GerritServerConfig Config cfg) {
enabled = cfg.getBoolean("http", "addUserAsRequestAttribute", true);
}
@@ -56,7 +56,7 @@
private final Provider<CurrentUser> userProvider;
@Inject
- GetUserFilter(final Provider<CurrentUser> userProvider) {
+ GetUserFilter(Provider<CurrentUser> userProvider) {
this.userProvider = userProvider;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
index a77f660..a89e2d9 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
@@ -16,12 +16,10 @@
import com.google.common.cache.Cache;
import com.google.common.collect.Lists;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.Capable;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.AccessPath;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
@@ -29,12 +27,9 @@
import com.google.gerrit.server.git.AsyncReceiveCommits;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.ReceiveCommits;
-import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.git.validators.UploadValidators;
-import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.ProjectPermission;
@@ -237,23 +232,14 @@
}
static class UploadFilter implements Filter {
- private final Provider<ReviewDb> db;
- private final TagCache tagCache;
- private final ChangeNotes.Factory changeNotesFactory;
- @Nullable private final SearchingChangeCacheImpl changeCache;
+ private final VisibleRefFilter.Factory refFilterFactory;
private final UploadValidators.Factory uploadValidatorsFactory;
@Inject
UploadFilter(
- Provider<ReviewDb> db,
- TagCache tagCache,
- ChangeNotes.Factory changeNotesFactory,
- @Nullable SearchingChangeCacheImpl changeCache,
+ VisibleRefFilter.Factory refFilterFactory,
UploadValidators.Factory uploadValidatorsFactory) {
- this.db = db;
- this.tagCache = tagCache;
- this.changeNotesFactory = changeNotesFactory;
- this.changeCache = changeCache;
+ this.refFilterFactory = refFilterFactory;
this.uploadValidatorsFactory = uploadValidatorsFactory;
}
@@ -279,9 +265,7 @@
uploadValidatorsFactory.create(pc.getProject(), repo, request.getRemoteHost());
up.setPreUploadHook(
PreUploadHookChain.newChain(Lists.newArrayList(up.getPreUploadHook(), uploadValidators)));
- up.setAdvertiseRefsHook(
- new VisibleRefFilter(
- tagCache, changeNotesFactory, changeCache, repo, pc, db.get(), true));
+ up.setAdvertiseRefsHook(refFilterFactory.create(pc.getProjectState(), repo));
next.doFilter(request, response);
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java
index 6411ee5..3dd31d9 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java
@@ -28,12 +28,12 @@
private Provider<HttpServletRequest> requestProvider;
@Inject
- HttpCanonicalWebUrlProvider(@GerritServerConfig final Config config) {
+ HttpCanonicalWebUrlProvider(@GerritServerConfig Config config) {
super(config);
}
@Inject(optional = true)
- public void setHttpServletRequest(final Provider<HttpServletRequest> hsr) {
+ public void setHttpServletRequest(Provider<HttpServletRequest> hsr) {
requestProvider = hsr;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
index 00c18af..eb77a30 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
@@ -42,18 +42,17 @@
@Inject
protected HttpLogoutServlet(
- final AuthConfig authConfig,
- final DynamicItem<WebSession> webSession,
- @CanonicalWebUrl @Nullable final Provider<String> urlProvider,
- final AuditService audit) {
+ AuthConfig authConfig,
+ DynamicItem<WebSession> webSession,
+ @CanonicalWebUrl @Nullable Provider<String> urlProvider,
+ AuditService audit) {
this.webSession = webSession;
this.urlProvider = urlProvider;
this.logoutUrl = authConfig.getLogoutURL();
this.audit = audit;
}
- protected void doLogout(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doLogout(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
webSession.get().logout();
if (logoutUrl != null) {
rsp.sendRedirect(logoutUrl);
@@ -73,8 +72,7 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
final String sid = webSession.get().getSessionId();
final CurrentUser currentUser = webSession.get().getUser();
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java
index 2dedd86..e023644 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java
@@ -29,7 +29,7 @@
private final HttpServletRequest req;
@Inject
- HttpRemotePeerProvider(final HttpServletRequest r) {
+ HttpRemotePeerProvider(HttpServletRequest r) {
req = r;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java
index 87de003..7f78385 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java
@@ -22,7 +22,7 @@
public class LoginUrlToken {
private static final String DEFAULT_TOKEN = '#' + PageLinks.MINE;
- public static String getToken(final HttpServletRequest req) {
+ public static String getToken(HttpServletRequest req) {
String token = req.getPathInfo();
if (Strings.isNullOrEmpty(token)) {
return DEFAULT_TOKEN;
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
index 57ec9c5..8ceb50a 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
@@ -174,7 +174,7 @@
}
}
- private boolean succeedAuthentication(final AccountState who) {
+ private boolean succeedAuthentication(AccountState who) {
setUserIdentified(who.getAccount().getId());
return true;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
index 548db48..6e02796 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
@@ -48,9 +48,7 @@
@Inject
RequestContextFilter(
- final Provider<RequestCleanup> r,
- final Provider<HttpRequestContext> c,
- final ThreadLocalRequestContext l) {
+ Provider<RequestCleanup> r, Provider<HttpRequestContext> c, ThreadLocalRequestContext l) {
cleanup = r;
requestContext = c;
local = l;
@@ -63,8 +61,7 @@
public void destroy() {}
@Override
- public void doFilter(
- final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
RequestContext old = local.setContext(requestContext.get());
try {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
index 4bdd1f0..d8e6f84 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
@@ -52,7 +52,7 @@
private final Provider<String> urlProvider;
@Inject
- RequireSslFilter(@CanonicalWebUrl @Nullable final Provider<String> urlProvider) {
+ RequireSslFilter(@CanonicalWebUrl @Nullable Provider<String> urlProvider) {
this.urlProvider = urlProvider;
}
@@ -63,8 +63,7 @@
public void destroy() {}
@Override
- public void doFilter(
- final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
final HttpServletRequest req = (HttpServletRequest) request;
final HttpServletResponse rsp = (HttpServletResponse) response;
@@ -91,11 +90,11 @@
}
}
- private static boolean isSecure(final HttpServletRequest req) {
+ private static boolean isSecure(HttpServletRequest req) {
return "https".equals(req.getScheme()) || req.isSecure();
}
- private static boolean isLocalHost(final HttpServletRequest req) {
+ private static boolean isLocalHost(HttpServletRequest req) {
return "localhost".equals(req.getServerName()) || "127.0.0.1".equals(req.getServerName());
}
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
index b6719e6..6d9cd3c 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
@@ -121,8 +121,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
}
});
@@ -134,21 +133,19 @@
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
toGerrit(req.getRequestURI(), req, rsp);
}
});
}
- private Key<HttpServlet> screen(final String target) {
+ private Key<HttpServlet> screen(String target) {
return key(
new HttpServlet() {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
toGerrit(target, req, rsp);
}
});
@@ -160,8 +157,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
final String token = req.getPathInfo().substring(1);
toGerrit(token, req, rsp);
}
@@ -174,8 +170,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
try {
String idString = req.getPathInfo();
if (idString.endsWith("/")) {
@@ -224,20 +219,19 @@
});
}
- private Key<HttpServlet> query(final String query) {
+ private Key<HttpServlet> query(String query) {
return key(
new HttpServlet() {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
toGerrit(PageLinks.toChangeQuery(query), req, rsp);
}
});
}
- private Key<HttpServlet> key(final HttpServlet servlet) {
+ private Key<HttpServlet> key(HttpServlet servlet) {
final Key<HttpServlet> srv = Key.get(HttpServlet.class, UniqueAnnotations.create());
bind(srv)
.toProvider(
@@ -257,15 +251,13 @@
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
toGerrit("/register" + req.getPathInfo(), req, rsp);
}
});
}
- static void toGerrit(
- final String target, final HttpServletRequest req, final HttpServletResponse rsp)
+ static void toGerrit(String target, HttpServletRequest req, HttpServletResponse rsp)
throws IOException {
final StringBuilder url = new StringBuilder();
url.append(req.getContextPath());
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java
index 7884089..8b6694c 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java
@@ -55,7 +55,7 @@
private final Cache<String, Val> self;
@Inject
- WebSessionManager(@GerritServerConfig Config cfg, @Assisted final Cache<String, Val> cache) {
+ WebSessionManager(@GerritServerConfig Config cfg, @Assisted Cache<String, Val> cache) {
prng = new SecureRandom();
self = cache;
@@ -76,11 +76,11 @@
}
}
- Key createKey(final Account.Id who) {
+ Key createKey(Account.Id who) {
return new Key(newUniqueToken(who));
}
- private String newUniqueToken(final Account.Id who) {
+ private String newUniqueToken(Account.Id who) {
try {
final int nonceLen = 20;
final ByteArrayOutputStream buf;
@@ -135,7 +135,7 @@
return val;
}
- int getCookieAge(final Val val) {
+ int getCookieAge(Val val) {
if (val.isPersistentCookie()) {
// Client may store the cookie until we would remove it from our
// own cache, after which it will certainly be invalid.
@@ -150,7 +150,7 @@
return -1;
}
- Val get(final Key key) {
+ Val get(Key key) {
Val val = self.getIfPresent(key.token);
if (val != null && val.expiresAt <= nowMs()) {
self.invalidate(key.token);
@@ -159,14 +159,14 @@
return val;
}
- void destroy(final Key key) {
+ void destroy(Key key) {
self.invalidate(key.token);
}
static final class Key {
private transient String token;
- Key(final String t) {
+ Key(String t) {
token = t;
}
@@ -241,7 +241,7 @@
return persistentCookie;
}
- private void writeObject(final ObjectOutputStream out) throws IOException {
+ private void writeObject(ObjectOutputStream out) throws IOException {
writeVarInt32(out, 1);
writeVarInt32(out, accountId.get());
@@ -272,7 +272,7 @@
writeVarInt32(out, 0);
}
- private void readObject(final ObjectInputStream in) throws IOException {
+ private void readObject(ObjectInputStream in) throws IOException {
PARSE:
for (; ; ) {
final int tag = readVarInt32(in);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java
index d0adc4b..ec7fb68 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java
@@ -82,13 +82,13 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp)
throws IOException, ServletException {
doPost(req, rsp);
}
@Override
- protected void doPost(final HttpServletRequest req, final HttpServletResponse rsp)
+ protected void doPost(HttpServletRequest req, HttpServletResponse rsp)
throws IOException, ServletException {
CacheHeaders.setNotCacheable(rsp);
@@ -180,7 +180,7 @@
return HtmlDomUtil.toUTF8(doc);
}
- private AuthResult auth(final Account account) {
+ private AuthResult auth(Account account) {
if (account != null) {
return new AuthResult(account.getId(), null, false);
}
@@ -194,7 +194,7 @@
return null;
}
- private AuthResult byUserName(final String userName) {
+ private AuthResult byUserName(String userName) {
try {
List<AccountState> accountStates = accountQuery.byExternalId(SCHEME_USERNAME, userName);
if (accountStates.isEmpty()) {
@@ -212,7 +212,7 @@
}
}
- private AuthResult byPreferredEmail(final String email) {
+ private AuthResult byPreferredEmail(String email) {
try (ReviewDb db = schema.open()) {
List<Account> matches = db.accounts().byPreferredEmail(email).toList();
return matches.size() == 1 ? auth(matches.get(0)) : null;
@@ -222,7 +222,7 @@
}
}
- private AuthResult byAccountId(final String idStr) {
+ private AuthResult byAccountId(String idStr) {
final Account.Id id;
try {
id = Account.Id.parse(idStr);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
index 3a575a1..c7229bc 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
@@ -66,8 +66,7 @@
private final boolean userNameToLowerCase;
@Inject
- HttpAuthFilter(final DynamicItem<WebSession> webSession, final AuthConfig authConfig)
- throws IOException {
+ HttpAuthFilter(DynamicItem<WebSession> webSession, AuthConfig authConfig) throws IOException {
this.sessionProvider = webSession;
final String pageName = "LoginRedirect.html";
@@ -86,8 +85,7 @@
}
@Override
- public void doFilter(
- final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ public void doFilter(final ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
if (isSessionValid((HttpServletRequest) request)) {
chain.doFilter(request, response);
@@ -165,7 +163,7 @@
}
@Override
- public void init(final FilterConfig filterConfig) {}
+ public void init(FilterConfig filterConfig) {}
@Override
public void destroy() {}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
index 638d527..f8c86ee 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
@@ -21,7 +21,7 @@
public class HttpAuthModule extends ServletModule {
private final AuthConfig authConfig;
- public HttpAuthModule(final AuthConfig authConfig) {
+ public HttpAuthModule(AuthConfig authConfig) {
this.authConfig = authConfig;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java
index 3696c21..d86c85a 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java
@@ -79,7 +79,7 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp)
throws ServletException, IOException {
final String token = LoginUrlToken.getToken(req);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java
index bb3dc6a..534e50ec 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java
@@ -46,7 +46,7 @@
@Inject
HttpsClientSslCertAuthFilter(
- final DynamicItem<WebSession> webSession, final AccountManager accountManager) {
+ final DynamicItem<WebSession> webSession, AccountManager accountManager) {
this.webSession = webSession;
this.accountManager = accountManager;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java
index 8b14af7..e93b0b6 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java
@@ -47,8 +47,7 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
final StringBuilder rdr = new StringBuilder();
rdr.append(urlProvider.get());
rdr.append(LoginUrlToken.getToken(req));
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java
index 67d36e4..af853cc 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java
@@ -57,13 +57,12 @@
}
@Override
- protected long getLastModified(final HttpServletRequest req) {
+ protected long getLastModified(HttpServletRequest req) {
return modified;
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
if (raw != null) {
rsp.setContentType("image/png");
rsp.setContentLength(raw.length);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java
index c5a1f18..5e22081 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java
@@ -54,7 +54,7 @@
private final byte[] raw_css;
private final byte[] gz_css;
- GitwebCssServlet(final Path src) throws IOException {
+ GitwebCssServlet(Path src) throws IOException {
if (src != null) {
final Path dir = src.getParent();
final String name = src.getFileName().toString();
@@ -76,13 +76,12 @@
}
@Override
- protected long getLastModified(final HttpServletRequest req) {
+ protected long getLastModified(HttpServletRequest req) {
return modified;
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
if (raw_css != null) {
rsp.setContentType("text/css");
rsp.setCharacterEncoding(UTF_8.name());
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java
index 70f6e4c..651b582 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java
@@ -57,13 +57,12 @@
}
@Override
- protected long getLastModified(final HttpServletRequest req) {
+ protected long getLastModified(HttpServletRequest req) {
return modified;
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
if (raw != null) {
rsp.setContentType("text/javascript");
rsp.setContentLength(raw.length);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
index abc7fda..ce8a500 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
@@ -370,8 +370,7 @@
}
@Override
- protected void service(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void service(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
if (req.getQueryString() == null || req.getQueryString().isEmpty()) {
// No query string? They want the project list, which we don't
// currently support. Return to Gerrit's own web UI.
@@ -458,7 +457,7 @@
private static Map<String, String> getParameters(HttpServletRequest req) {
final Map<String, String> params = new HashMap<>();
- for (final String pair : req.getQueryString().split("[&;]")) {
+ for (String pair : req.getQueryString().split("[&;]")) {
final int eq = pair.indexOf('=');
if (0 < eq) {
String name = pair.substring(0, eq);
@@ -622,8 +621,7 @@
return env.getEnvArray();
}
- private void copyContentToCGI(final HttpServletRequest req, final OutputStream dst)
- throws IOException {
+ private void copyContentToCGI(HttpServletRequest req, OutputStream dst) throws IOException {
final int contentLength = req.getContentLength();
final InputStream src = req.getInputStream();
new Thread(
@@ -652,7 +650,7 @@
.start();
}
- private void copyStderrToLog(final InputStream in) {
+ private void copyStderrToLog(InputStream in) {
new Thread(
() -> {
try (BufferedReader br =
@@ -673,7 +671,7 @@
return req.getHeaderNames();
}
- private void readCgiHeaders(HttpServletResponse res, final InputStream in) throws IOException {
+ private void readCgiHeaders(HttpServletResponse res, InputStream in) throws IOException {
String line;
while (!(line = readLine(in)).isEmpty()) {
if (line.startsWith("HTTP")) {
@@ -704,7 +702,7 @@
}
}
- private String readLine(final InputStream in) throws IOException {
+ private String readLine(InputStream in) throws IOException {
final StringBuilder buf = new StringBuilder();
int b;
while ((b = in.read()) != -1 && b != '\n') {
@@ -721,12 +719,12 @@
envMap = new HashMap<>();
}
- EnvList(final EnvList l) {
+ EnvList(EnvList l) {
envMap = new HashMap<>(l.envMap);
}
/** Set a name/value pair, null values will be treated as an empty String */
- public void set(final String name, String value) {
+ public void set(String name, String value) {
if (value == null) {
value = "";
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java
index 298301d..a4eea96 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java
@@ -69,8 +69,7 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
String keyStr = req.getPathInfo();
// We shouldn't have to do this extra decode pass, but somehow we
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java
index 8ccf221..10735a5 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java
@@ -53,8 +53,7 @@
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
final byte[] tosend;
if (RPCServletUtils.acceptsGzipEncoding(req)) {
rsp.setHeader("Content-Encoding", "gzip");
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
index c79fa74..914c830 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
@@ -289,7 +289,7 @@
|| name.contains("//"); // windows UNC path can be "//..."
}
- private Callable<Resource> newLoader(final Path p) {
+ private Callable<Resource> newLoader(Path p) {
return () -> {
try {
return new Resource(
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java
index b20f990..55bc2a6 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java
@@ -52,13 +52,12 @@
private final SshInfo sshd;
@Inject
- SshInfoServlet(final SshInfo daemon) {
+ SshInfoServlet(SshInfo daemon) {
sshd = daemon;
}
@Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
final List<HostKey> hostKeys = sshd.getHostKeys();
final String out;
if (!hostKeys.isEmpty()) {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index e893fcc..18da84f 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -738,7 +738,7 @@
return false;
}
- private Object parseRawInput(final HttpServletRequest req, Type type)
+ private Object parseRawInput(HttpServletRequest req, Type type)
throws SecurityException, NoSuchMethodException, IllegalArgumentException,
InstantiationException, IllegalAccessException, InvocationTargetException,
MethodNotAllowedException {
@@ -913,7 +913,7 @@
}
}
- private static BinaryResult stackJsonString(HttpServletResponse res, final BinaryResult src)
+ private static BinaryResult stackJsonString(HttpServletResponse res, BinaryResult src)
throws IOException {
TemporaryBuffer.Heap buf = heap(HEAP_EST_SIZE, Integer.MAX_VALUE);
buf.write(JSON_MAGIC);
@@ -929,7 +929,7 @@
return asBinaryResult(buf).setContentType(JSON_TYPE).setCharacterEncoding(UTF_8);
}
- private static BinaryResult stackBase64(HttpServletResponse res, final BinaryResult src)
+ private static BinaryResult stackBase64(HttpServletResponse res, BinaryResult src)
throws IOException {
BinaryResult b64;
long len = src.getContentLength();
@@ -960,7 +960,7 @@
return b64.setContentType("text/plain").setCharacterEncoding(ISO_8859_1);
}
- private static BinaryResult stackGzip(HttpServletResponse res, final BinaryResult src)
+ private static BinaryResult stackGzip(HttpServletResponse res, BinaryResult src)
throws IOException {
BinaryResult gz;
long len = src.getContentLength();
@@ -1213,7 +1213,7 @@
}
@SuppressWarnings("resource")
- private static BinaryResult asBinaryResult(final TemporaryBuffer.Heap buf) {
+ private static BinaryResult asBinaryResult(TemporaryBuffer.Heap buf) {
return new BinaryResult() {
@Override
public void writeTo(OutputStream os) throws IOException {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
index e561c9b..9e0e8f6 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
@@ -34,7 +34,7 @@
private final Provider<? extends CurrentUser> currentUser;
protected BaseServiceImplementation(
- final Provider<ReviewDb> schema, final Provider<? extends CurrentUser> currentUser) {
+ final Provider<ReviewDb> schema, Provider<? extends CurrentUser> currentUser) {
this.schema = schema;
this.currentUser = currentUser;
}
@@ -63,7 +63,7 @@
* @param callback the callback that will receive the result.
* @param action the action logic to perform.
*/
- protected <T> void run(final AsyncCallback<T> callback, final Action<T> action) {
+ protected <T> void run(AsyncCallback<T> callback, Action<T> action) {
try {
final T r = action.run(schema.get());
if (r != null) {
@@ -100,7 +100,7 @@
}
}
- private static <T> void handleOrmException(final AsyncCallback<T> callback, Exception e) {
+ private static <T> void handleOrmException(AsyncCallback<T> callback, Exception e) {
if (e.getCause() instanceof Failure) {
callback.onFailure(e.getCause().getCause());
} else if (e.getCause() instanceof NoSuchEntityException) {
@@ -114,7 +114,7 @@
public static class Failure extends Exception {
private static final long serialVersionUID = 1L;
- public Failure(final Throwable why) {
+ public Failure(Throwable why) {
super(why);
}
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
index cce87a8..178cda9 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
@@ -52,16 +52,14 @@
private final AuditService audit;
@Inject
- GerritJsonServlet(
- final DynamicItem<WebSession> w, final RemoteJsonService s, final AuditService a) {
+ GerritJsonServlet(final DynamicItem<WebSession> w, RemoteJsonService s, AuditService a) {
session = w;
service = s;
audit = a;
}
@Override
- protected GerritCall createActiveCall(
- final HttpServletRequest req, final HttpServletResponse rsp) {
+ protected GerritCall createActiveCall(final HttpServletRequest req, HttpServletResponse rsp) {
final GerritCall call = new GerritCall(session.get(), req, new AuditedHttpServletResponse(rsp));
currentCall.set(call);
return call;
@@ -82,7 +80,7 @@
}
@Override
- protected void preInvoke(final GerritCall call) {
+ protected void preInvoke(GerritCall call) {
super.preInvoke(call);
if (call.isComplete()) {
@@ -106,8 +104,7 @@
}
@Override
- protected void service(final HttpServletRequest req, final HttpServletResponse resp)
- throws IOException {
+ protected void service(HttpServletRequest req, HttpServletResponse resp) throws IOException {
try {
super.service(req, resp);
} finally {
@@ -163,7 +160,7 @@
return args;
}
- private String extractWhat(final Audit note, final GerritCall call) {
+ private String extractWhat(Audit note, GerritCall call) {
Class<?> methodClass = call.getMethodClass();
String methodClassName = methodClass != null ? methodClass.getName() : "<UNKNOWN_CLASS>";
methodClassName = methodClassName.substring(methodClassName.lastIndexOf(".") + 1);
@@ -233,7 +230,7 @@
return null;
}
- GerritCall(final WebSession session, final HttpServletRequest i, final HttpServletResponse o) {
+ GerritCall(WebSession session, HttpServletRequest i, HttpServletResponse o) {
super(i, o);
this.session = session;
this.when = TimeUtil.nowMs();
@@ -248,7 +245,7 @@
}
@Override
- public void onFailure(final Throwable error) {
+ public void onFailure(Throwable error) {
if (error instanceof IllegalArgumentException || error instanceof IllegalStateException) {
super.onFailure(error);
} else if (error instanceof OrmException || error instanceof RuntimeException) {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java
index 9fd9269..b167167 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java
@@ -27,7 +27,7 @@
private final Class<? extends RemoteJsonService> serviceClass;
@Inject
- GerritJsonServletProvider(final Class<? extends RemoteJsonService> c) {
+ GerritJsonServletProvider(Class<? extends RemoteJsonService> c) {
serviceClass = c;
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java
index a9d654c..b932169 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java
@@ -44,7 +44,7 @@
* successfully.
*/
public abstract class Handler<T> implements Callable<T> {
- public static <T> Handler<T> wrap(final Callable<T> r) {
+ public static <T> Handler<T> wrap(Callable<T> r) {
return new Handler<T>() {
@Override
public T call() throws Exception {
@@ -58,7 +58,7 @@
*
* @param callback callback to receive the result of {@link #call()}.
*/
- public final void to(final AsyncCallback<T> callback) {
+ public final void to(AsyncCallback<T> callback) {
try {
final T r = call();
if (r != null) {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java
index 5315182..b03609e 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java
@@ -26,7 +26,7 @@
private final String prefix;
- protected RpcServletModule(final String pathPrefix) {
+ protected RpcServletModule(String pathPrefix) {
prefix = pathPrefix;
}
@@ -38,7 +38,7 @@
rpc(name, clazz);
}
- protected void rpc(final String name, Class<? extends RemoteJsonService> clazz) {
+ protected void rpc(String name, Class<? extends RemoteJsonService> clazz) {
final Key<GerritJsonServlet> srv = Key.get(GerritJsonServlet.class, UniqueAnnotations.create());
final GerritJsonServletProvider provider = new GerritJsonServletProvider(clazz);
bind(clazz);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java
index ec67661..7a7713d 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java
@@ -44,9 +44,9 @@
}
@Override
- public void daemonHostKeys(final AsyncCallback<List<SshHostKey>> callback) {
+ public void daemonHostKeys(AsyncCallback<List<SshHostKey>> callback) {
final ArrayList<SshHostKey> r = new ArrayList<>(hostKeys.size());
- for (final HostKey hk : hostKeys) {
+ for (HostKey hk : hostKeys) {
String host = hk.getHost();
if (host.startsWith("*:")) {
final String port = host.substring(2);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
index 3b620f1..afec3b6 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
@@ -14,6 +14,10 @@
package com.google.gerrit.httpd.rpc.project;
+import static com.google.gerrit.server.permissions.GlobalPermission.ADMINISTRATE_SERVER;
+import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE;
+import static com.google.gerrit.server.permissions.RefPermission.READ;
+
import com.google.common.collect.Maps;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.GroupDescription;
@@ -39,10 +43,10 @@
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.ProjectPermission;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectControl;
-import com.google.gerrit.server.project.RefControl;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
@@ -122,10 +126,11 @@
}
}
- final RefControl metaConfigControl = pc.controlForRef(RefNames.REFS_CONFIG);
List<AccessSection> local = new ArrayList<>();
Set<String> ownerOf = new HashSet<>();
Map<AccountGroup.UUID, Boolean> visibleGroups = new HashMap<>();
+ PermissionBackend.ForProject perm = permissionBackend.user(user).project(projectName);
+ boolean checkReadConfig = check(perm, RefNames.REFS_CONFIG, READ);
for (AccessSection section : config.getAccessSections()) {
String name = section.getName();
@@ -134,20 +139,19 @@
local.add(section);
ownerOf.add(name);
- } else if (metaConfigControl.isVisible()) {
+ } else if (checkReadConfig) {
local.add(section);
}
} else if (RefConfigSection.isValid(name)) {
- RefControl rc = pc.controlForRef(name);
- if (rc.isOwner()) {
+ if (pc.controlForRef(name).isOwner()) {
local.add(section);
ownerOf.add(name);
- } else if (metaConfigControl.isVisible()) {
+ } else if (checkReadConfig) {
local.add(section);
- } else if (rc.isVisible()) {
+ } else if (check(perm, name, READ)) {
// Filter the section to only add rules describing groups that
// are visible to the current-user. This includes any group the
// user is a member of, as well as groups they own or that
@@ -205,17 +209,17 @@
detail.setInheritsFrom(config.getProject().getParent(allProjectsName));
- if (projectName.equals(allProjectsName)) {
- if (pc.isOwner()) {
- ownerOf.add(AccessSection.GLOBAL_CAPABILITIES);
- }
+ if (projectName.equals(allProjectsName)
+ && permissionBackend.user(user).testOrFalse(ADMINISTRATE_SERVER)) {
+ ownerOf.add(AccessSection.GLOBAL_CAPABILITIES);
}
detail.setLocal(local);
detail.setOwnerOf(ownerOf);
detail.setCanUpload(
- metaConfigControl.isVisible() && (pc.isOwner() || metaConfigControl.canUpload()));
- detail.setConfigVisible(pc.isOwner() || metaConfigControl.isVisible());
+ pc.isOwner()
+ || (checkReadConfig && perm.ref(RefNames.REFS_CONFIG).testOrFalse(CREATE_CHANGE)));
+ detail.setConfigVisible(pc.isOwner() || checkReadConfig);
detail.setGroupInfo(buildGroupInfo(local));
detail.setLabelTypes(pc.getLabelTypes());
detail.setFileHistoryLinks(getConfigFileLogLinks(projectName.get()));
@@ -257,4 +261,14 @@
}
return pc;
}
+
+ private static boolean check(PermissionBackend.ForProject ctx, String ref, RefPermission perm)
+ throws PermissionBackendException {
+ try {
+ ctx.ref(ref).check(perm);
+ return true;
+ } catch (AuthException denied) {
+ return false;
+ }
+ }
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java
index bdb274d..da471c3 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java
@@ -41,11 +41,11 @@
@Override
public void projectAccess(
- final Project.NameKey projectName, final AsyncCallback<ProjectAccess> callback) {
+ final Project.NameKey projectName, AsyncCallback<ProjectAccess> callback) {
projectAccessFactory.create(projectName).to(callback);
}
- private static ObjectId getBase(final String baseRevision) {
+ private static ObjectId getBase(String baseRevision) {
if (baseRevision != null && !baseRevision.isEmpty()) {
return ObjectId.fromString(baseRevision);
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java
index 1a79d57..4e2a4d3 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java
@@ -22,6 +22,7 @@
import com.google.gerrit.common.data.PermissionRule;
import com.google.gerrit.common.errors.PermissionDeniedException;
import com.google.gerrit.extensions.api.changes.AddReviewerInput;
+import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Change;
@@ -39,9 +40,11 @@
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectControl;
-import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.project.SetParent;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.UpdateException;
@@ -68,6 +71,7 @@
}
private final ReviewDb db;
+ private final PermissionBackend permissionBackend;
private final Sequences seq;
private final Provider<PostReviewers> reviewersProvider;
private final ProjectCache projectCache;
@@ -78,6 +82,7 @@
@Inject
ReviewProjectAccess(
final ProjectControl.Factory projectControlFactory,
+ PermissionBackend permissionBackend,
GroupBackend groupBackend,
MetaDataUpdate.User metaDataUpdateFactory,
ReviewDb db,
@@ -107,6 +112,7 @@
message,
false);
this.db = db;
+ this.permissionBackend = permissionBackend;
this.seq = seq;
this.reviewersProvider = reviewersProvider;
this.projectCache = projectCache;
@@ -124,13 +130,23 @@
ProjectConfig config,
MetaDataUpdate md,
boolean parentProjectUpdate)
- throws IOException, OrmException, PermissionDeniedException {
- RefControl refsMetaConfigControl = projectControl.controlForRef(RefNames.REFS_CONFIG);
- if (!refsMetaConfigControl.isVisible()) {
+ throws IOException, OrmException, PermissionDeniedException, PermissionBackendException {
+ PermissionBackend.ForRef metaRef =
+ permissionBackend
+ .user(projectControl.getUser())
+ .project(projectControl.getProject().getNameKey())
+ .ref(RefNames.REFS_CONFIG);
+ try {
+ metaRef.check(RefPermission.READ);
+ } catch (AuthException denied) {
throw new PermissionDeniedException(RefNames.REFS_CONFIG + " not visible");
}
- if (!projectControl.isOwner() && !refsMetaConfigControl.canUpload()) {
- throw new PermissionDeniedException("cannot upload to " + RefNames.REFS_CONFIG);
+ if (!projectControl.isOwner()) {
+ try {
+ metaRef.check(RefPermission.CREATE_CHANGE);
+ } catch (AuthException denied) {
+ throw new PermissionDeniedException("cannot create change for " + RefNames.REFS_CONFIG);
+ }
}
md.setInsertChangeId(true);
diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
index 86989dd..086dcc2 100644
--- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
+++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
@@ -74,7 +74,7 @@
* <p>This method adds the given filter to all {@link AllRequestFilter.FilterProxy} instances
* created by {@link #getFilterProxy()}.
*/
- private ReloadableRegistrationHandle<AllRequestFilter> addFilter(final AllRequestFilter filter) {
+ private ReloadableRegistrationHandle<AllRequestFilter> addFilter(AllRequestFilter filter) {
Key<AllRequestFilter> key = Key.get(AllRequestFilter.class);
return filters.add(key, Providers.of(filter));
}
diff --git a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
index b22ba49..4efbecc 100644
--- a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
+++ b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
@@ -59,11 +59,11 @@
private static ClassLoader daemonClassLoader;
- public static void main(final String[] argv) throws Exception {
+ public static void main(String[] argv) throws Exception {
System.exit(mainImpl(argv));
}
- public static int mainImpl(final String[] argv) throws Exception {
+ public static int mainImpl(String[] argv) throws Exception {
if (argv.length == 0) {
File me;
try {
@@ -108,7 +108,7 @@
return invokeProgram(cl, argv);
}
- public static void daemonStart(final String[] argv) throws Exception {
+ public static void daemonStart(String[] argv) throws Exception {
if (daemonClassLoader != null) {
throw new IllegalStateException("daemonStart can be called only once per JVM instance");
}
@@ -128,7 +128,7 @@
}
}
- public static void daemonStop(final String[] argv) throws Exception {
+ public static void daemonStop(String[] argv) throws Exception {
if (daemonClassLoader == null) {
throw new IllegalStateException("daemonStop can be called only after call to daemonStop");
}
@@ -148,7 +148,7 @@
return "PrologShell".equals(cn) || "Rulec".equals(cn);
}
- private static String getVersion(final File me) {
+ private static String getVersion(File me) {
if (me == null) {
return "";
}
@@ -163,8 +163,7 @@
}
}
- private static int invokeProgram(final ClassLoader loader, final String[] origArgv)
- throws Exception {
+ private static int invokeProgram(ClassLoader loader, String[] origArgv) throws Exception {
String name = origArgv[0];
final String[] argv = new String[origArgv.length - 1];
System.arraycopy(origArgv, 1, argv, 0, argv.length);
@@ -316,7 +315,7 @@
}
}
- private static String safeName(final ZipEntry ze) {
+ private static String safeName(ZipEntry ze) {
// Try to derive the name of the temporary file so it
// doesn't completely suck. Best if we can make it
// match the name it was in the archive.
@@ -535,7 +534,7 @@
if (tmpEntries != null) {
final long now = System.currentTimeMillis();
final long expired = now - MILLISECONDS.convert(7, DAYS);
- for (final File tmpEntry : tmpEntries) {
+ for (File tmpEntry : tmpEntries) {
if (tmpEntry.isDirectory() && tmpEntry.lastModified() < expired) {
final String[] all = tmpEntry.list();
if (all == null || all.length == 0) {
diff --git a/gerrit-main/src/main/java/Main.java b/gerrit-main/src/main/java/Main.java
index 8c9deb1..0eca665 100644
--- a/gerrit-main/src/main/java/Main.java
+++ b/gerrit-main/src/main/java/Main.java
@@ -19,7 +19,7 @@
// to jump into the real main code.
//
- public static void main(final String[] argv) throws Exception {
+ public static void main(String[] argv) throws Exception {
if (onSupportedJavaVersion()) {
com.google.gerrit.launcher.GerritLauncher.main(argv);
diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java
index 1406267..a97e8ae 100644
--- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java
+++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java
@@ -29,19 +29,17 @@
private final OpenIdServiceImpl impl;
@Inject
- OpenIdLoginServlet(final OpenIdServiceImpl i) {
+ OpenIdLoginServlet(OpenIdServiceImpl i) {
impl = i;
}
@Override
- public void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ public void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
doPost(req, rsp);
}
@Override
- public void doPost(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ public void doPost(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
try {
CacheHeaders.setNotCacheable(rsp);
impl.doAuth(req, rsp);
diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
index a3bf361..86ed398 100644
--- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
+++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
@@ -99,12 +99,12 @@
@Inject
OpenIdServiceImpl(
- final DynamicItem<WebSession> cf,
- final Provider<IdentifiedUser> iu,
+ DynamicItem<WebSession> cf,
+ Provider<IdentifiedUser> iu,
CanonicalWebUrl up,
- @GerritServerConfig final Config config,
- final AuthConfig ac,
- final AccountManager am,
+ @GerritServerConfig Config config,
+ AuthConfig ac,
+ AccountManager am,
ProxyProperties proxyProperties) {
if (proxyProperties.getProxyUrl() != null) {
@@ -139,9 +139,9 @@
DiscoveryResult discover(
HttpServletRequest req,
String openidIdentifier,
- final SignInMode mode,
- final boolean remember,
- final String returnToken) {
+ SignInMode mode,
+ boolean remember,
+ String returnToken) {
final State state;
state = init(req, openidIdentifier, mode, remember, returnToken);
if (state == null) {
@@ -183,7 +183,7 @@
return new DiscoveryResult(aReq.getDestinationUrl(false), aReq.getParameterMap());
}
- private boolean requestRegistration(final AuthRequest aReq) {
+ private boolean requestRegistration(AuthRequest aReq) {
if (AuthRequest.SELECT_ID.equals(aReq.getIdentity())) {
// We don't know anything about the identity, as the provider
// will offer the user a way to indicate their identity. Skip
@@ -204,7 +204,7 @@
}
/** Called by {@link OpenIdLoginServlet} doGet, doPost */
- void doAuth(final HttpServletRequest req, final HttpServletResponse rsp) throws Exception {
+ void doAuth(HttpServletRequest req, HttpServletResponse rsp) throws Exception {
if (OMODE_CANCEL.equals(req.getParameter(OPENID_MODE))) {
cancel(req, rsp);
return;
@@ -459,7 +459,7 @@
}
}
- private boolean isSignIn(final SignInMode mode) {
+ private boolean isSignIn(SignInMode mode) {
switch (mode) {
case SIGN_IN:
case REGISTER:
@@ -470,7 +470,7 @@
}
}
- private static SignInMode signInMode(final HttpServletRequest req) {
+ private static SignInMode signInMode(HttpServletRequest req) {
try {
return SignInMode.valueOf(req.getParameter(P_MODE));
} catch (RuntimeException e) {
@@ -478,8 +478,7 @@
}
}
- private void callback(
- final boolean isNew, final HttpServletRequest req, final HttpServletResponse rsp)
+ private void callback(final boolean isNew, HttpServletRequest req, HttpServletResponse rsp)
throws IOException {
String token = req.getParameter(P_TOKEN);
if (token == null || token.isEmpty() || token.startsWith("/SignInFailure,")) {
@@ -495,8 +494,7 @@
rsp.sendRedirect(rdr.toString());
}
- private void cancel(final HttpServletRequest req, final HttpServletResponse rsp)
- throws IOException {
+ private void cancel(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
if (isSignIn(signInMode(req))) {
webSession.get().logout();
}
@@ -504,7 +502,7 @@
}
private void cancelWithError(
- final HttpServletRequest req, final HttpServletResponse rsp, final String errorDetail)
+ final HttpServletRequest req, HttpServletResponse rsp, String errorDetail)
throws IOException {
final SignInMode mode = signInMode(req);
if (isSignIn(mode)) {
@@ -554,8 +552,8 @@
return new State(discovered, retTo, contextUrl);
}
- boolean isAllowedOpenID(final String id) {
- for (final OpenIdProviderPattern pattern : allowedOpenIDs) {
+ boolean isAllowedOpenID(String id) {
+ for (OpenIdProviderPattern pattern : allowedOpenIDs) {
if (pattern.matches(id)) {
return true;
}
@@ -568,7 +566,7 @@
final UrlEncoded retTo;
final String contextUrl;
- State(final DiscoveryInformation d, final UrlEncoded r, final String c) {
+ State(DiscoveryInformation d, UrlEncoded r, String c) {
discovered = d;
retTo = r;
contextUrl = c;
diff --git a/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java b/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java
index 48890dd..33dd609 100644
--- a/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java
+++ b/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java
@@ -38,15 +38,15 @@
public class AuthSMTPClient extends SMTPClient {
private String authTypes;
- public AuthSMTPClient(final String charset) {
+ public AuthSMTPClient(String charset) {
super(charset);
}
- public void enableSSL(final boolean verify) {
+ public void enableSSL(boolean verify) {
_socketFactory_ = sslFactory(verify);
}
- public boolean startTLS(final String hostname, final int port, final boolean verify)
+ public boolean startTLS(String hostname, int port, boolean verify)
throws SocketException, IOException {
if (sendCommand("STARTTLS") != 220) {
return false;
@@ -74,7 +74,7 @@
return true;
}
- private static SSLSocketFactory sslFactory(final boolean verify) {
+ private static SSLSocketFactory sslFactory(boolean verify) {
if (verify) {
return (SSLSocketFactory) SSLSocketFactory.getDefault();
}
@@ -168,7 +168,7 @@
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
- private String toHex(final byte[] b) {
+ private String toHex(byte[] b) {
final StringBuilder sec = new StringBuilder();
for (byte c : b) {
final int u = (c >> 4) & 0xf;
@@ -186,7 +186,7 @@
return SMTPReply.isPositiveCompletion(sendCommand("AUTH", cmd));
}
- private static String encodeBase64(final byte[] data) {
+ private static String encodeBase64(byte[] data) {
return new String(Base64.encodeBase64(data), UTF_8);
}
}
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java
index 8090f60..9435979 100644
--- a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java
+++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java
@@ -29,8 +29,7 @@
public class EditDeserializer implements JsonDeserializer<Edit>, JsonSerializer<Edit> {
@Override
- public Edit deserialize(
- final JsonElement json, final Type typeOfT, final JsonDeserializationContext context)
+ public Edit deserialize(final JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException {
if (json.isJsonNull()) {
return null;
@@ -60,7 +59,7 @@
return new ReplaceEdit(get(o, 0), get(o, 1), get(o, 2), get(o, 3), l);
}
- private static int get(final JsonArray a, final int idx) throws JsonParseException {
+ private static int get(JsonArray a, int idx) throws JsonParseException {
final JsonElement v = a.get(idx);
if (!v.isJsonPrimitive()) {
throw new JsonParseException("Expected array of 4 for Edit type");
@@ -73,8 +72,7 @@
}
@Override
- public JsonElement serialize(
- final Edit src, final Type typeOfSrc, final JsonSerializationContext context) {
+ public JsonElement serialize(final Edit src, Type typeOfSrc, JsonSerializationContext context) {
if (src == null) {
return JsonNull.INSTANCE;
}
@@ -88,7 +86,7 @@
return a;
}
- private void add(final JsonArray a, final Edit src) {
+ private void add(JsonArray a, Edit src) {
a.add(new JsonPrimitive(src.getBeginA()));
a.add(new JsonPrimitive(src.getEndA()));
a.add(new JsonPrimitive(src.getBeginB()));
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
index ce8a9f3..184cb36 100644
--- a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
+++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
@@ -46,7 +46,7 @@
}
@Override
- public void printJson(final StringBuilder sb, final Edit o) {
+ public void printJson(StringBuilder sb, Edit o) {
sb.append('[');
append(sb, o);
if (o instanceof ReplaceEdit) {
@@ -58,7 +58,7 @@
sb.append(']');
}
- private void append(final StringBuilder sb, final Edit o) {
+ private void append(StringBuilder sb, Edit o) {
sb.append(o.getBeginA());
sb.append(',');
sb.append(o.getEndA());
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java
index 6617793..c98da64 100644
--- a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java
+++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java
@@ -20,8 +20,7 @@
import org.eclipse.jgit.util.IO;
public class ObjectIdSerialization {
- public static void writeCanBeNull(final OutputStream out, final AnyObjectId id)
- throws IOException {
+ public static void writeCanBeNull(OutputStream out, AnyObjectId id) throws IOException {
if (id != null) {
out.write((byte) 1);
writeNotNull(out, id);
@@ -30,11 +29,11 @@
}
}
- public static void writeNotNull(final OutputStream out, final AnyObjectId id) throws IOException {
+ public static void writeNotNull(OutputStream out, AnyObjectId id) throws IOException {
id.copyRawTo(out);
}
- public static ObjectId readCanBeNull(final InputStream in) throws IOException {
+ public static ObjectId readCanBeNull(InputStream in) throws IOException {
switch (in.read()) {
case 0:
return null;
@@ -45,7 +44,7 @@
}
}
- public static ObjectId readNotNull(final InputStream in) throws IOException {
+ public static ObjectId readNotNull(InputStream in) throws IOException {
final byte[] b = new byte[20];
IO.readFully(in, b, 0, 20);
return ObjectId.fromRaw(b);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java
index e740ec8..e1a7bd4 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java
@@ -165,7 +165,7 @@
execFile(GerritLauncher.getHomeDirectory(), STARTUP_FILE);
}
- protected void execResource(final String p) {
+ protected void execResource(String p) {
try (InputStream in = JythonShell.class.getClassLoader().getResourceAsStream(p)) {
if (in != null) {
execStream(in, "resource " + p);
@@ -177,7 +177,7 @@
}
}
- protected void execFile(final File parent, final String p) {
+ protected void execFile(File parent, String p) {
try {
File script = new File(parent, p);
if (script.canExecute()) {
@@ -200,7 +200,7 @@
}
}
- protected void execStream(final InputStream in, final String p) {
+ protected void execStream(InputStream in, String p) {
try {
runMethod0(
console,
@@ -213,7 +213,7 @@
}
}
- private static UnsupportedOperationException noShell(final String m, Throwable why) {
+ private static UnsupportedOperationException noShell(String m, Throwable why) {
final String prefix = "Cannot create Jython shell: ";
final String postfix = "\n (You might need to install jython.jar in the lib directory)";
return new UnsupportedOperationException(prefix + m + postfix, why);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java
index 9f54634..ff08d59 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java
@@ -49,7 +49,7 @@
private final AsyncAppender async;
@Inject
- HttpLog(final SystemLog systemLog) {
+ HttpLog(SystemLog systemLog) {
async = systemLog.createAsyncAppender(LOG_NAME, new HttpLogLayout());
}
@@ -62,7 +62,7 @@
}
@Override
- public void log(final Request req, final Response rsp) {
+ public void log(Request req, Response rsp) {
final LoggingEvent event =
new LoggingEvent( //
Logger.class.getName(), // fqnOfCategoryClass
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java
index bfa4d64..2eea88d 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java
@@ -96,7 +96,7 @@
}
}
- private void formatDate(final long now, final StringBuilder sbuf) {
+ private void formatDate(long now, StringBuilder sbuf) {
final long rounded = now - (int) (now % 1000);
if (rounded != lastTimeMillis) {
synchronized (dateFormat) {
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java
index ebca467..1d3e1702 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java
@@ -19,7 +19,7 @@
public class JettyEnv {
final Injector webInjector;
- public JettyEnv(final Injector webInjector) {
+ public JettyEnv(Injector webInjector) {
this.webInjector = webInjector;
}
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java
index d356d96..c818276 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java
@@ -21,7 +21,7 @@
public class JettyModule extends LifecycleModule {
private final JettyEnv env;
- public JettyModule(final JettyEnv env) {
+ public JettyModule(JettyEnv env) {
this.env = env;
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
index c7606d6..79bc224 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -79,7 +79,7 @@
private final Config cfg;
@Inject
- Lifecycle(final JettyServer server, @GerritServerConfig final Config cfg) {
+ Lifecycle(JettyServer server, @GerritServerConfig Config cfg) {
this.server = server;
this.cfg = cfg;
}
@@ -297,7 +297,7 @@
return config;
}
- static boolean isReverseProxied(final URI[] listenUrls) {
+ static boolean isReverseProxied(URI[] listenUrls) {
for (URI u : listenUrls) {
if ("http".equals(u.getScheme()) || "https".equals(u.getScheme())) {
return false;
@@ -306,7 +306,7 @@
return true;
}
- static URI[] listenURLs(final Config cfg) {
+ static URI[] listenURLs(Config cfg) {
String[] urls = cfg.getStringList("httpd", null, "listenurl");
if (urls.length == 0) {
urls = new String[] {"http://*:8080/"};
@@ -352,7 +352,7 @@
return pool;
}
- private Handler makeContext(final JettyEnv env, final Config cfg) {
+ private Handler makeContext(JettyEnv env, Config cfg) {
final Set<String> paths = new HashSet<>();
for (URI u : listenURLs(cfg)) {
String p = u.getPath();
@@ -385,8 +385,7 @@
return r;
}
- private ContextHandler makeContext(
- final String contextPath, final JettyEnv env, final Config cfg) {
+ private ContextHandler makeContext(final String contextPath, JettyEnv env, Config cfg) {
final ServletContextHandler app = new ServletContextHandler();
// This enables the use of sessions in Jetty, feature available
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
index ccaee8f..a83ede6 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
@@ -22,7 +22,6 @@
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.QueueProvider;
-import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.CancelableRunnable;
import com.google.gerrit.sshd.CommandExecutorQueueProvider;
import com.google.inject.Inject;
@@ -30,6 +29,7 @@
import com.google.inject.Singleton;
import com.google.inject.servlet.ServletModule;
import java.io.IOException;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.Filter;
@@ -85,10 +85,10 @@
@Inject
ProjectQoSFilter(
- final Provider<CurrentUser> user,
+ Provider<CurrentUser> user,
QueueProvider queue,
- final ServletContext context,
- @GerritServerConfig final Config cfg) {
+ ServletContext context,
+ @GerritServerConfig Config cfg) {
this.user = user;
this.queue = queue;
this.context = context;
@@ -102,7 +102,7 @@
final HttpServletResponse rsp = (HttpServletResponse) response;
final Continuation cont = ContinuationSupport.getContinuation(req);
- WorkQueue.Executor executor = getExecutor();
+ ScheduledThreadPoolExecutor executor = getExecutor();
if (cont.isInitial()) {
TaskThunk task = new TaskThunk(executor, cont, req);
@@ -136,7 +136,7 @@
}
}
- private WorkQueue.Executor getExecutor() {
+ private ScheduledThreadPoolExecutor getExecutor() {
return queue.getQueue(user.get().getCapabilities().getQueueType());
}
@@ -148,7 +148,7 @@
private final class TaskThunk implements CancelableRunnable, ContinuationListener {
- private final WorkQueue.Executor executor;
+ private final ScheduledThreadPoolExecutor executor;
private final Continuation cont;
private final String name;
private final Object lock = new Object();
@@ -156,7 +156,9 @@
private Thread worker;
TaskThunk(
- final WorkQueue.Executor executor, final Continuation cont, final HttpServletRequest req) {
+ ScheduledThreadPoolExecutor executor,
+ Continuation cont,
+ HttpServletRequest req) {
this.executor = executor;
this.cont = cont;
this.name = generateName(req);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java
index 56b644a..49fd1f9 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java
@@ -438,11 +438,11 @@
}
}
- private SiteRun createSiteRun(final SiteInit init) {
+ private SiteRun createSiteRun(SiteInit init) {
return createSysInjector(init).getInstance(SiteRun.class);
}
- private Injector createSysInjector(final SiteInit init) {
+ private Injector createSysInjector(SiteInit init) {
if (sysInjector == null) {
final List<Module> modules = new ArrayList<>();
modules.add(
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
index 8868a31..2e49e13 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
@@ -29,7 +29,7 @@
private final Config cfg;
@Inject
- Browser(@GerritServerConfig final Config cfg) {
+ Browser(@GerritServerConfig Config cfg) {
this.cfg = cfg;
}
@@ -37,7 +37,7 @@
open(null /* root page */);
}
- public void open(final String link) throws Exception {
+ public void open(String link) throws Exception {
String url = cfg.getString("gerrit", null, "canonicalWebUrl");
if (url == null) {
url = cfg.getString("httpd", null, "listenUrl");
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java
index b80bf35..44f883a 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java
@@ -22,7 +22,7 @@
private final SitePaths site;
- public DatabaseConfigModule(final SitePaths site) {
+ public DatabaseConfigModule(SitePaths site) {
this.site = site;
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java
index 5db4287..3aad0f4 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java
@@ -27,7 +27,7 @@
private final SitePaths site;
@Inject
- DerbyInitializer(final SitePaths site) {
+ DerbyInitializer(SitePaths site) {
this.site = site;
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java
index 1f3fd0f..63aa6ec 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java
@@ -27,7 +27,7 @@
private final SitePaths site;
@Inject
- H2Initializer(final SitePaths site) {
+ H2Initializer(SitePaths site) {
this.site = site;
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java
index 3958069..dea45a71 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java
@@ -41,7 +41,7 @@
private final Section container;
@Inject
- InitContainer(final ConsoleUI ui, final SitePaths site, final Section.Factory sections) {
+ InitContainer(ConsoleUI ui, SitePaths site, Section.Factory sections) {
this.ui = ui;
this.site = site;
this.container = sections.get("container", null);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java
index fc42f9d..e57b6b9 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java
@@ -31,7 +31,7 @@
private final Section gerrit;
@Inject
- InitGitManager(final ConsoleUI ui, final Section.Factory sections) {
+ InitGitManager(ConsoleUI ui, Section.Factory sections) {
this.ui = ui;
this.gerrit = sections.get("gerrit", null);
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java
index 4526a87..9f02a56 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java
@@ -43,8 +43,7 @@
final ConsoleUI ui;
@Inject
- public InitPluginStepsLoader(
- final ConsoleUI ui, final SitePaths sitePaths, final Injector initInjector) {
+ public InitPluginStepsLoader(final ConsoleUI ui, SitePaths sitePaths, Injector initInjector) {
this.pluginsDir = sitePaths.plugins_dir;
this.initInjector = initInjector;
this.ui = ui;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java
index 97359b3..666b549 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java
@@ -34,7 +34,7 @@
private final SitePaths site;
@Inject
- InitSendEmail(final ConsoleUI ui, final SitePaths site, final Section.Factory sections) {
+ InitSendEmail(ConsoleUI ui, SitePaths site, Section.Factory sections) {
this.ui = ui;
this.sendemail = sections.get("sendemail", null);
this.site = site;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java
index 3259f96..c599e99 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java
@@ -122,7 +122,7 @@
return val;
}
- private static String read(final String p) throws IOException {
+ private static String read(String p) throws IOException {
try (InputStream in = Libraries.class.getClassLoader().getResourceAsStream(p)) {
if (in == null) {
throw new FileNotFoundException("Cannot load resource " + p);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java
index 0ba4083..fb4e0eb 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java
@@ -65,16 +65,16 @@
this.needs = new ArrayList<>(2);
}
- void setName(final String name) {
+ void setName(String name) {
this.name = name;
}
- void setJarUrl(final String url) {
+ void setJarUrl(String url) {
this.jarUrl = url;
download = jarUrl.startsWith("http");
}
- void setSHA1(final String sha1) {
+ void setSHA1(String sha1) {
this.sha1 = sha1;
}
@@ -230,7 +230,7 @@
Files.copy(p, dst);
}
- private static Path url2file(final String urlString) throws IOException {
+ private static Path url2file(String urlString) throws IOException {
final URL url = new URL(urlString);
try {
return Paths.get(url.toURI());
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
index 243ea09..be61061 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
@@ -165,7 +165,7 @@
chmod(0444, ex);
}
- private static List<InitStep> stepsOf(final Injector injector) {
+ private static List<InitStep> stepsOf(Injector injector) {
final ArrayList<InitStep> r = new ArrayList<>();
for (Binding<InitStep> b : all(injector)) {
r.add(b.getProvider().get());
@@ -173,7 +173,7 @@
return r;
}
- private static List<Binding<InitStep>> all(final Injector injector) {
+ private static List<Binding<InitStep>> all(Injector injector) {
return injector.findBindingsByType(new TypeLiteral<InitStep>() {});
}
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java
index d5d7e78..f994432 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java
@@ -162,8 +162,7 @@
savePublic(cfg);
}
- private boolean convertUrl(final Section database, String url)
- throws UnsupportedEncodingException {
+ private boolean convertUrl(Section database, String url) throws UnsupportedEncodingException {
String username = null;
String password = null;
@@ -243,14 +242,14 @@
return false;
}
- private void sethost(final Section database, final InetSocketAddress addr) {
+ private void sethost(Section database, InetSocketAddress addr) {
database.set("hostname", SocketUtil.hostname(addr));
if (0 < addr.getPort()) {
database.set("port", String.valueOf(addr.getPort()));
}
}
- private void setuser(final Section database, String username, String password) {
+ private void setuser(Section database, String username, String password) {
if (username != null && !username.isEmpty()) {
database.set("username", username);
}
@@ -278,7 +277,7 @@
throw new IOException("Cannot read " + name, e);
}
final Properties dbprop = new Properties();
- for (final Map.Entry<Object, Object> e : srvprop.entrySet()) {
+ for (Map.Entry<Object, Object> e : srvprop.entrySet()) {
final String key = (String) e.getKey();
if (key.startsWith("database.")) {
dbprop.put(key.substring("database.".length()), e.getValue());
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java
index 18ccb1a..2068540 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java
@@ -27,7 +27,7 @@
}
/** Get a UI instance, possibly forcing batch mode. */
- public static ConsoleUI getInstance(final boolean batchMode) {
+ public static ConsoleUI getInstance(boolean batchMode) {
Console console = batchMode ? null : System.console();
return console != null ? new Interactive(console) : new Batch();
}
@@ -87,7 +87,7 @@
private static class Interactive extends ConsoleUI {
private final Console console;
- Interactive(final Console console) {
+ Interactive(Console console) {
this.console = console;
}
@@ -164,7 +164,7 @@
console.printf("error: '%s' is not a valid choice\n", r);
}
console.printf(" Supported options are:\n");
- for (final String v : allowedValues) {
+ for (String v : allowedValues) {
console.printf(" %s\n", v.toLowerCase());
}
}
@@ -207,7 +207,7 @@
if (r.isEmpty()) {
return def;
}
- for (final T e : options) {
+ for (T e : options) {
if (e.toString().equalsIgnoreCase(r)) {
return e;
}
@@ -216,7 +216,7 @@
console.printf("error: '%s' is not a valid choice\n", r);
}
console.printf(" Supported options are:\n");
- for (final T e : options) {
+ for (T e : options) {
console.printf(" %s\n", e.toString().toLowerCase());
}
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java
index b80cb22..656f53a 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java
@@ -46,7 +46,7 @@
return new Die(why, cause);
}
- public static void savePublic(final FileBasedConfig sec) throws IOException {
+ public static void savePublic(FileBasedConfig sec) throws IOException {
if (modified(sec)) {
sec.save();
}
@@ -79,7 +79,7 @@
return SystemReader.getInstance().getHostname();
}
- public static boolean isLocal(final String hostname) {
+ public static boolean isLocal(String hostname) {
try {
return InetAddress.getByName(hostname).isLoopbackAddress();
} catch (UnknownHostException e) {
@@ -127,7 +127,7 @@
}
}
- private static InputStream open(final Class<?> sibling, final String name) {
+ private static InputStream open(Class<?> sibling, String name) {
final InputStream in = sibling.getResourceAsStream(name);
if (in == null) {
String pkg = sibling.getName();
@@ -186,12 +186,12 @@
return new URI(url);
}
- public static boolean isAnyAddress(final URI u) {
+ public static boolean isAnyAddress(URI u) {
return u.getHost() == null
&& (u.getAuthority().equals("*") || u.getAuthority().startsWith("*:"));
}
- public static int portOf(final URI uri) {
+ public static int portOf(URI uri) {
int port = uri.getPort();
if (port < 0) {
port = "https".equals(uri.getScheme()) ? 443 : 80;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java
index d52005f..c1c8745 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java
@@ -58,7 +58,7 @@
return flags.cfg.getString(section, subsection, name);
}
- public void set(final String name, final String value) {
+ public void set(String name, String value) {
final ArrayList<String> all = new ArrayList<>();
all.addAll(Arrays.asList(flags.cfg.getStringList(section, subsection, name)));
@@ -78,7 +78,7 @@
}
}
- public <T extends Enum<?>> void set(final String name, final T value) {
+ public <T extends Enum<?>> void set(String name, T value) {
if (value != null) {
set(name, value.name());
} else {
@@ -90,12 +90,11 @@
set(name, (String) null);
}
- public String string(final String title, final String name, final String dv) {
+ public String string(String title, String name, String dv) {
return string(title, name, dv, false);
}
- public String string(
- final String title, final String name, final String dv, final boolean nullIfDefault) {
+ public String string(final String title, String name, String dv, boolean nullIfDefault) {
final String ov = get(name);
String nv = ui.readString(ov != null ? ov : dv, "%s", title);
if (nullIfDefault && nv.equals(dv)) {
@@ -107,7 +106,7 @@
return nv;
}
- public Path path(final String title, final String name, final String defValue) {
+ public Path path(String title, String name, String defValue) {
return site.resolve(string(title, name, defValue));
}
@@ -129,7 +128,7 @@
}
public <T extends Enum<?>, A extends EnumSet<? extends T>> T select(
- String title, String name, T defValue, A allowedValues, final boolean nullIfDefault) {
+ String title, String name, T defValue, A allowedValues, boolean nullIfDefault) {
final boolean set = get(name) != null;
T oldValue = flags.cfg.getEnum(section, subsection, name, defValue);
T newValue = ui.readEnum(oldValue, allowedValues, "%s", title);
@@ -146,8 +145,7 @@
return newValue;
}
- public String select(
- final String title, final String name, final String dv, Set<String> allowedValues) {
+ public String select(final String title, String name, String dv, Set<String> allowedValues) {
final String ov = get(name);
String nv = ui.readString(ov != null ? ov : dv, allowedValues, "%s", title);
if (!eq(ov, nv)) {
@@ -156,7 +154,7 @@
return nv;
}
- public String password(final String username, final String password) {
+ public String password(String username, String password) {
final String ov = getSecure(password);
String user = flags.sec.get(section, subsection, username);
@@ -219,7 +217,7 @@
return section;
}
- private static boolean eq(final String a, final String b) {
+ private static boolean eq(String a, String b) {
if (a == null && b == null) {
return true;
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
index 825bd70..fca5551 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
@@ -38,7 +38,7 @@
return n.toLowerCase();
}
- public final int main(final String[] argv) throws Exception {
+ public final int main(String[] argv) throws Exception {
final CmdLineParser clp = new CmdLineParser(OptionHandlers.empty(), this);
try {
clp.parseArgument(argv);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java
index e625219..c051bff 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java
@@ -57,6 +57,7 @@
import com.google.gerrit.server.git.ReceiveCommitsExecutorModule;
import com.google.gerrit.server.git.SearchingChangeCacheImpl;
import com.google.gerrit.server.git.TagCache;
+import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.group.GroupModule;
import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
import com.google.gerrit.server.notedb.NoteDbModule;
@@ -130,6 +131,7 @@
factory(MergeUtil.Factory.class);
factory(PatchSetInserter.Factory.class);
factory(RebaseChangeOp.Factory.class);
+ factory(VisibleRefFilter.Factory.class);
// As Reindex is a batch program, don't assume the index is available for
// the change cache.
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
index e5076c9..afb2fb4 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
@@ -49,8 +49,7 @@
root.addAppender(dst);
}
- public static LifecycleListener start(final Path sitePath, final Config config)
- throws IOException {
+ public static LifecycleListener start(Path sitePath, Config config) throws IOException {
Path logdir =
FileUtil.mkdirsOrDie(new SitePaths(sitePath).logs_dir, "Cannot create log directory");
if (SystemLog.shouldConfigure()) {
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
index 7eed2ef..c9df7e7 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
@@ -23,7 +23,7 @@
private static final ShutdownCallback cb = new ShutdownCallback();
/** Add a task to be performed when graceful shutdown is requested. */
- public static void add(final Runnable task) {
+ public static void add(Runnable task) {
if (!cb.add(task)) {
// If the shutdown has already begun we cannot enqueue a new
// task. Instead trigger the task in the caller, without any
@@ -55,7 +55,7 @@
setName("ShutdownCallback");
}
- boolean add(final Runnable newTask) {
+ boolean add(Runnable newTask) {
synchronized (this) {
if (!shutdownStarted && !shutdownComplete) {
if (tasks.isEmpty()) {
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
index 279584a..41feba2 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
@@ -83,7 +83,7 @@
this.sitePath = sitePath;
}
- protected SiteProgram(Path sitePath, final Provider<DataSource> dsProvider) {
+ protected SiteProgram(Path sitePath, Provider<DataSource> dsProvider) {
this.sitePath = sitePath;
this.dsProvider = dsProvider;
}
@@ -107,7 +107,7 @@
/** @return provides database connectivity and site path. */
protected Injector createDbInjector(
- final boolean enableMetrics, final DataSourceProvider.Context context) {
+ final boolean enableMetrics, DataSourceProvider.Context context) {
final Path sitePath = getSitePath();
final List<Module> modules = new ArrayList<>();
diff --git a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java
index 13e19ae..df5be2c 100644
--- a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java
+++ b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java
@@ -40,7 +40,7 @@
}
@Override
- public void requestSuggestions(final Request req, final Callback done) {
+ public void requestSuggestions(Request req, Callback done) {
if (req.getQuery().length() < chars) {
responseEmptySuggestion(req, done);
return;
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java
index 1b06f0f..61c807c 100644
--- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java
+++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java
@@ -24,8 +24,7 @@
private final int aSize;
private final int bSize;
- public EditList(
- final List<Edit> edits, final int contextLines, final int aSize, final int bSize) {
+ public EditList(final List<Edit> edits, int contextLines, int aSize, int bSize) {
this.edits = edits;
this.context = contextLines;
this.aSize = aSize;
@@ -65,7 +64,7 @@
};
}
- private int findCombinedEnd(final int i) {
+ private int findCombinedEnd(int i) {
int end = i + 1;
while (end < edits.size() && (combineA(end) || combineB(end))) {
end++;
@@ -73,14 +72,14 @@
return end - 1;
}
- private boolean combineA(final int i) {
+ private boolean combineA(int i) {
final Edit s = edits.get(i);
final Edit e = edits.get(i - 1);
// + 1 to prevent '... skipping 1 common line ...' messages.
return s.getBeginA() - e.getEndA() <= 2 * context + 1;
}
- private boolean combineB(final int i) {
+ private boolean combineB(int i) {
final int s = edits.get(i).getBeginB();
final int e = edits.get(i - 1).getEndB();
// + 1 to prevent '... skipping 1 common line ...' messages.
@@ -98,7 +97,7 @@
private final int aEnd;
private final int bEnd;
- private Hunk(final int ci, final int ei) {
+ private Hunk(int ci, int ei) {
curIdx = ci;
endIdx = ei;
curEdit = edits.get(curIdx);
@@ -172,7 +171,7 @@
return aCur < aEnd || bCur < bEnd;
}
- private boolean in(final Edit edit) {
+ private boolean in(Edit edit) {
return aCur < edit.getEndA() || bCur < edit.getEndB();
}
}
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java
index 5ff0447..348f9b2 100644
--- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java
+++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java
@@ -31,11 +31,11 @@
return size;
}
- public void setSize(final int s) {
+ public void setSize(int s) {
size = s;
}
- public String get(final int idx) {
+ public String get(int idx) {
final String line = getLine(idx);
if (line == null) {
throw new ArrayIndexOutOfBoundsException(idx);
@@ -43,7 +43,7 @@
return line;
}
- public boolean contains(final int idx) {
+ public boolean contains(int idx) {
return getLine(idx) != null;
}
@@ -51,7 +51,7 @@
return ranges.isEmpty() ? size() : ranges.get(0).base;
}
- public int next(final int idx) {
+ public int next(int idx) {
// Most requests are sequential in nature, fetching the next
// line from the current range, or the immediate next range.
//
@@ -106,7 +106,7 @@
return size();
}
- private String getLine(final int idx) {
+ private String getLine(int idx) {
// Most requests are sequential in nature, fetching the next
// line from the current range, or the next range.
//
@@ -148,7 +148,7 @@
return null;
}
- public void addLine(final int i, final String content) {
+ public void addLine(int i, String content) {
final Range r;
if (!ranges.isEmpty() && i == last().end()) {
r = last();
@@ -180,14 +180,14 @@
protected int base;
protected List<String> lines;
- private Range(final int b) {
+ private Range(int b) {
base = b;
lines = new ArrayList<>();
}
protected Range() {}
- private String get(final int i) {
+ private String get(int i) {
return lines.get(i - base);
}
@@ -195,7 +195,7 @@
return base + lines.size();
}
- private boolean contains(final int i) {
+ private boolean contains(int i) {
return base <= i && i < end();
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java
index fe2122f..74dadc5 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java
@@ -42,7 +42,7 @@
protected NameKey() {}
- public NameKey(final String n) {
+ public NameKey(String n) {
name = n;
}
@@ -66,7 +66,7 @@
protected UUID() {}
- public UUID(final String n) {
+ public UUID(String n) {
uuid = n;
}
@@ -81,7 +81,7 @@
}
/** Parse an AccountGroup.UUID out of a string representation. */
- public static UUID parse(final String str) {
+ public static UUID parse(String str) {
final UUID r = new UUID();
r.fromString(str);
return r;
@@ -102,7 +102,7 @@
protected Id() {}
- public Id(final int id) {
+ public Id(int id) {
this.id = id;
}
@@ -117,7 +117,7 @@
}
/** Parse an AccountGroup.Id out of a string representation. */
- public static Id parse(final String str) {
+ public static Id parse(String str) {
final Id r = new Id();
r.fromString(str);
return r;
@@ -188,7 +188,7 @@
return name;
}
- public void setNameKey(final AccountGroup.NameKey nameKey) {
+ public void setNameKey(AccountGroup.NameKey nameKey) {
name = nameKey;
}
@@ -196,7 +196,7 @@
return description;
}
- public void setDescription(final String d) {
+ public void setDescription(String d) {
description = d;
}
@@ -204,11 +204,11 @@
return ownerGroupUUID;
}
- public void setOwnerGroupUUID(final AccountGroup.UUID uuid) {
+ public void setOwnerGroupUUID(AccountGroup.UUID uuid) {
ownerGroupUUID = uuid;
}
- public void setVisibleToAll(final boolean visibleToAll) {
+ public void setVisibleToAll(boolean visibleToAll) {
this.visibleToAll = visibleToAll;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java
index b4bf783..99ff35be 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java
@@ -33,7 +33,7 @@
includeUUID = new AccountGroup.UUID();
}
- public Key(final AccountGroup.Id g, final AccountGroup.UUID u) {
+ public Key(AccountGroup.Id g, AccountGroup.UUID u) {
groupId = g;
includeUUID = u;
}
@@ -62,7 +62,7 @@
protected AccountGroupById() {}
- public AccountGroupById(final AccountGroupById.Key k) {
+ public AccountGroupById(AccountGroupById.Key k) {
key = k;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java
index d1e72af..a127a70 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java
@@ -37,7 +37,7 @@
includeUUID = new AccountGroup.UUID();
}
- public Key(final AccountGroup.Id g, final AccountGroup.UUID u, final Timestamp t) {
+ public Key(AccountGroup.Id g, AccountGroup.UUID u, Timestamp t) {
groupId = g;
includeUUID = u;
addedOn = t;
@@ -76,8 +76,7 @@
protected AccountGroupByIdAud() {}
- public AccountGroupByIdAud(
- final AccountGroupById m, final Account.Id adder, final Timestamp when) {
+ public AccountGroupByIdAud(final AccountGroupById m, Account.Id adder, Timestamp when) {
final AccountGroup.Id group = m.getGroupId();
final AccountGroup.UUID include = m.getIncludeUUID();
key = new AccountGroupByIdAud.Key(group, include, when);
@@ -92,7 +91,7 @@
return removedOn == null;
}
- public void removed(final Account.Id deleter, final Timestamp when) {
+ public void removed(Account.Id deleter, Timestamp when) {
removedBy = deleter;
removedOn = when;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java
index ce6999f..ce5b347 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java
@@ -33,7 +33,7 @@
groupId = new AccountGroup.Id();
}
- public Key(final Account.Id a, final AccountGroup.Id g) {
+ public Key(Account.Id a, AccountGroup.Id g) {
accountId = a;
groupId = g;
}
@@ -58,7 +58,7 @@
protected AccountGroupMember() {}
- public AccountGroupMember(final AccountGroupMember.Key k) {
+ public AccountGroupMember(AccountGroupMember.Key k) {
key = k;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java
index 4f3992d..da19351 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java
@@ -37,7 +37,7 @@
groupId = new AccountGroup.Id();
}
- public Key(final Account.Id a, final AccountGroup.Id g, final Timestamp t) {
+ public Key(Account.Id a, AccountGroup.Id g, Timestamp t) {
accountId = a;
groupId = g;
addedOn = t;
@@ -76,8 +76,7 @@
protected AccountGroupMemberAudit() {}
- public AccountGroupMemberAudit(
- final AccountGroupMember m, final Account.Id adder, Timestamp addedOn) {
+ public AccountGroupMemberAudit(final AccountGroupMember m, Account.Id adder, Timestamp addedOn) {
final Account.Id who = m.getAccountId();
final AccountGroup.Id group = m.getAccountGroupId();
key = new AccountGroupMemberAudit.Key(who, group, addedOn);
@@ -92,7 +91,7 @@
return removedOn == null;
}
- public void removed(final Account.Id deleter, final Timestamp when) {
+ public void removed(Account.Id deleter, Timestamp when) {
removedBy = deleter;
removedOn = when;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java
index 3645dac..372d644 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java
@@ -30,7 +30,7 @@
accountId = new Account.Id();
}
- public Id(final Account.Id a, final int s) {
+ public Id(Account.Id a, int s) {
accountId = a;
seq = s;
}
@@ -63,7 +63,7 @@
protected AccountSshKey() {}
- public AccountSshKey(final AccountSshKey.Id i, final String pub) {
+ public AccountSshKey(AccountSshKey.Id i, String pub) {
id = i;
sshPublicKey = pub.replace("\n", "").replace("\r", "");
valid = id.isValid();
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java
index d0df7c6..fd8bbfd 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java
@@ -33,12 +33,12 @@
projectName = new Project.NameKey();
}
- public NameKey(final Project.NameKey proj, final String branchName) {
+ public NameKey(Project.NameKey proj, String branchName) {
projectName = proj;
set(branchName);
}
- public NameKey(String proj, final String branchName) {
+ public NameKey(String proj, String branchName) {
this(new Project.NameKey(proj), branchName);
}
@@ -68,7 +68,7 @@
protected Branch() {}
- public Branch(final Branch.NameKey newName) {
+ public Branch(Branch.NameKey newName) {
name = newName;
}
@@ -88,7 +88,7 @@
return revision;
}
- public void setRevision(final RevId id) {
+ public void setRevision(RevId id) {
revision = id;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java
index a101ca0..a94dab3 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java
@@ -102,7 +102,7 @@
protected Id() {}
- public Id(final int id) {
+ public Id(int id) {
this.id = id;
}
@@ -130,7 +130,7 @@
}
/** Parse a Change.Id out of a string representation. */
- public static Id parse(final String str) {
+ public static Id parse(String str) {
final Id r = new Id();
r.fromString(str);
return r;
@@ -262,7 +262,7 @@
protected Key() {}
- public Key(final String id) {
+ public Key(String id) {
this.id = id;
}
@@ -291,7 +291,7 @@
}
/** Parse a Change.Key out of a string representation. */
- public static Key parse(final String str) {
+ public static Key parse(String str) {
final Key r = new Key();
r.fromString(str);
return r;
@@ -416,8 +416,8 @@
return changeStatus;
}
- public static Status forCode(final char c) {
- for (final Status s : Status.values()) {
+ public static Status forCode(char c) {
+ for (Status s : Status.values()) {
if (s.code == c) {
return s;
}
@@ -576,7 +576,7 @@
return changeKey;
}
- public void setKey(final Change.Key k) {
+ public void setKey(Change.Key k) {
changeKey = k;
}
@@ -648,7 +648,7 @@
return null;
}
- public void setCurrentPatchSet(final PatchSetInfo ps) {
+ public void setCurrentPatchSet(PatchSetInfo ps) {
if (originalSubject == null && subject != null) {
// Change was created before schema upgrade. Use the last subject
// associated with this change, as the most recent discussion will
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java
index caf20c7..edc022f 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java
@@ -34,7 +34,7 @@
changeId = new Change.Id();
}
- public Key(final Change.Id change, final String uuid) {
+ public Key(Change.Id change, String uuid) {
this.changeId = change;
this.uuid = uuid;
}
@@ -84,8 +84,7 @@
protected ChangeMessage() {}
- public ChangeMessage(
- final ChangeMessage.Key k, final Account.Id a, final Timestamp wo, final PatchSet.Id psid) {
+ public ChangeMessage(final ChangeMessage.Key k, Account.Id a, Timestamp wo, PatchSet.Id psid) {
key = k;
author = a;
writtenOn = wo;
@@ -101,7 +100,7 @@
return author;
}
- public void setAuthor(final Account.Id accountId) {
+ public void setAuthor(Account.Id accountId) {
if (author != null) {
throw new IllegalStateException("Cannot modify author once assigned");
}
@@ -129,7 +128,7 @@
return message;
}
- public void setMessage(final String s) {
+ public void setMessage(String s) {
message = s;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java
index 9d61186..6a3b69c 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java
@@ -35,7 +35,7 @@
}
@Override
- protected void set(final String newValue) {
+ protected void set(String newValue) {
assert get().equals(newValue);
}
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java
index c38078e..e69cab2 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java
@@ -31,7 +31,7 @@
public LabelId() {}
- public LabelId(final String n) {
+ public LabelId(String n) {
id = n;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java
index 269b6d4..0492c6c 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java
@@ -49,7 +49,7 @@
patchSetId = new PatchSet.Id();
}
- public Key(final PatchSet.Id ps, final String name) {
+ public Key(PatchSet.Id ps, String name) {
this.patchSetId = ps;
this.fileName = name;
}
@@ -70,7 +70,7 @@
}
/** Parse a Patch.Id out of a string representation. */
- public static Key parse(final String str) {
+ public static Key parse(String str) {
final Key r = new Key();
r.fromString(str);
return r;
@@ -103,7 +103,7 @@
private final char code;
- ChangeType(final char c) {
+ ChangeType(char c) {
code = c;
}
@@ -116,8 +116,8 @@
return s != null && s.length() == 1 && s.charAt(0) == code;
}
- public static ChangeType forCode(final char c) {
- for (final ChangeType s : ChangeType.values()) {
+ public static ChangeType forCode(char c) {
+ for (ChangeType s : ChangeType.values()) {
if (s.code == c) {
return s;
}
@@ -156,7 +156,7 @@
private final char code;
- PatchType(final char c) {
+ PatchType(char c) {
code = c;
}
@@ -165,8 +165,8 @@
return code;
}
- public static PatchType forCode(final char c) {
- for (final PatchType s : PatchType.values()) {
+ public static PatchType forCode(char c) {
+ for (PatchType s : PatchType.values()) {
if (s.code == c) {
return s;
}
@@ -203,7 +203,7 @@
protected Patch() {}
- public Patch(final Patch.Key newId) {
+ public Patch(Patch.Key newId) {
key = newId;
setChangeType(ChangeType.MODIFIED);
setPatchType(PatchType.UNIFIED);
@@ -217,7 +217,7 @@
return nbrComments;
}
- public void setCommentCount(final int n) {
+ public void setCommentCount(int n) {
nbrComments = n;
}
@@ -225,7 +225,7 @@
return nbrDrafts;
}
- public void setDraftCount(final int n) {
+ public void setDraftCount(int n) {
nbrDrafts = n;
}
@@ -249,7 +249,7 @@
return ChangeType.forCode(changeType);
}
- public void setChangeType(final ChangeType type) {
+ public void setChangeType(ChangeType type) {
changeType = type.getCode();
}
@@ -257,7 +257,7 @@
return PatchType.forCode(patchType);
}
- public void setPatchType(final PatchType type) {
+ public void setPatchType(PatchType type) {
patchType = type.getCode();
}
@@ -269,7 +269,7 @@
return sourceFileName;
}
- public void setSourceFileName(final String n) {
+ public void setSourceFileName(String n) {
sourceFileName = n;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java
index 90552b8..de953dc 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java
@@ -48,7 +48,7 @@
patchKey = new Patch.Key();
}
- public Key(final Patch.Key p, final String uuid) {
+ public Key(Patch.Key p, String uuid) {
this.patchKey = p;
this.uuid = uuid;
}
@@ -84,7 +84,7 @@
private final char code;
- Status(final char c) {
+ Status(char c) {
code = c;
}
@@ -92,8 +92,8 @@
return code;
}
- public static Status forCode(final char c) {
- for (final Status s : Status.values()) {
+ public static Status forCode(char c) {
+ for (Status s : Status.values()) {
if (s.code == c) {
return s;
}
@@ -247,7 +247,7 @@
return Status.forCode(status);
}
- public void setStatus(final Status s) {
+ public void setStatus(Status s) {
status = s.getCode();
}
@@ -255,7 +255,7 @@
return side;
}
- public void setSide(final short s) {
+ public void setSide(short s) {
side = s;
}
@@ -263,7 +263,7 @@
return message;
}
- public void setMessage(final String s) {
+ public void setMessage(String s) {
message = s;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
index 138da5a..0cc76ed 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
@@ -86,7 +86,7 @@
changeId = new Change.Id();
}
- public Id(final Change.Id change, final int id) {
+ public Id(Change.Id change, int id) {
this.changeId = change;
this.patchSetId = id;
}
@@ -111,7 +111,7 @@
}
/** Parse a PatchSet.Id out of a string representation. */
- public static Id parse(final String str) {
+ public static Id parse(String str) {
final Id r = new Id();
r.fromString(str);
return r;
@@ -183,7 +183,7 @@
@Column(id = 6, notNull = false, length = Integer.MAX_VALUE)
protected String groups;
- //DELETED id = 7 (pushCertficate)
+ // DELETED id = 7 (pushCertficate)
/** Certificate sent with a push that created this patch set. */
@Column(id = 8, notNull = false, length = Integer.MAX_VALUE)
@@ -200,7 +200,7 @@
protected PatchSet() {}
- public PatchSet(final PatchSet.Id k) {
+ public PatchSet(PatchSet.Id k) {
id = k;
}
@@ -227,7 +227,7 @@
return revision;
}
- public void setRevision(final RevId i) {
+ public void setRevision(RevId i) {
revision = i;
}
@@ -235,7 +235,7 @@
return uploader;
}
- public void setUploader(final Account.Id who) {
+ public void setUploader(Account.Id who) {
uploader = who;
}
@@ -243,7 +243,7 @@
return createdOn;
}
- public void setCreatedOn(final Timestamp ts) {
+ public void setCreatedOn(Timestamp ts) {
createdOn = ts;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java
index ef2732b..0f3e4e1 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java
@@ -40,7 +40,7 @@
categoryId = new LabelId();
}
- public Key(final PatchSet.Id ps, final Account.Id a, final LabelId c) {
+ public Key(PatchSet.Id ps, Account.Id a, LabelId c) {
this.patchSetId = ps;
this.accountId = a;
this.categoryId = c;
@@ -111,7 +111,7 @@
setGranted(ts);
}
- public PatchSetApproval(final PatchSet.Id psId, final PatchSetApproval src) {
+ public PatchSetApproval(PatchSet.Id psId, PatchSetApproval src) {
key = new PatchSetApproval.Key(psId, src.getAccountId(), src.getLabelId());
value = src.getValue();
granted = src.granted;
@@ -153,7 +153,7 @@
return value;
}
- public void setValue(final short v) {
+ public void setValue(short v) {
value = v;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java
index 4970db1..f949013 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java
@@ -22,7 +22,7 @@
public RevId id;
public String shortMessage;
- public ParentInfo(final RevId id, final String shortMessage) {
+ public ParentInfo(RevId id, String shortMessage) {
this.id = id;
this.shortMessage = shortMessage;
}
@@ -55,7 +55,7 @@
protected PatchSetInfo() {}
- public PatchSetInfo(final PatchSet.Id k) {
+ public PatchSetInfo(PatchSet.Id k) {
key = k;
}
@@ -67,7 +67,7 @@
return subject;
}
- public void setSubject(final String s) {
+ public void setSubject(String s) {
if (s != null && s.length() > 255) {
subject = s.substring(0, 255);
} else {
@@ -79,7 +79,7 @@
return message;
}
- public void setMessage(final String m) {
+ public void setMessage(String m) {
message = m;
}
@@ -87,7 +87,7 @@
return author;
}
- public void setAuthor(final UserIdentity u) {
+ public void setAuthor(UserIdentity u) {
author = u;
}
@@ -95,11 +95,11 @@
return committer;
}
- public void setCommitter(final UserIdentity u) {
+ public void setCommitter(UserIdentity u) {
committer = u;
}
- public void setParents(final List<ParentInfo> p) {
+ public void setParents(List<ParentInfo> p) {
parents = p;
}
@@ -107,7 +107,7 @@
return parents;
}
- public void setRevId(final String s) {
+ public void setRevId(String s) {
revId = s;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java
index 9918317..8911b1b 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java
@@ -31,7 +31,7 @@
protected NameKey() {}
- public NameKey(final String n) {
+ public NameKey(String n) {
name = n;
}
@@ -59,7 +59,7 @@
}
/** Parse a Project.NameKey out of a string representation. */
- public static NameKey parse(final String str) {
+ public static NameKey parse(String str) {
final NameKey r = new NameKey();
r.fromString(str);
return r;
@@ -129,7 +129,7 @@
return description;
}
- public void setDescription(final String d) {
+ public void setDescription(String d) {
description = d;
}
@@ -161,23 +161,23 @@
return enableReviewerByEmail;
}
- public void setEnableReviewerByEmail(final InheritableBoolean enable) {
+ public void setEnableReviewerByEmail(InheritableBoolean enable) {
enableReviewerByEmail = enable;
}
- public void setUseContributorAgreements(final InheritableBoolean u) {
+ public void setUseContributorAgreements(InheritableBoolean u) {
useContributorAgreements = u;
}
- public void setUseSignedOffBy(final InheritableBoolean sbo) {
+ public void setUseSignedOffBy(InheritableBoolean sbo) {
useSignedOffBy = sbo;
}
- public void setUseContentMerge(final InheritableBoolean cm) {
+ public void setUseContentMerge(InheritableBoolean cm) {
useContentMerge = cm;
}
- public void setRequireChangeID(final InheritableBoolean cid) {
+ public void setRequireChangeID(InheritableBoolean cid) {
requireChangeID = cid;
}
@@ -205,7 +205,7 @@
requireSignedPush = require;
}
- public void setMaxObjectSizeLimit(final String limit) {
+ public void setMaxObjectSizeLimit(String limit) {
maxObjectSizeLimit = limit;
}
@@ -217,7 +217,7 @@
return submitType;
}
- public void setSubmitType(final SubmitType type) {
+ public void setSubmitType(SubmitType type) {
submitType = type;
}
@@ -225,7 +225,7 @@
return state;
}
- public void setState(final ProjectState newState) {
+ public void setState(ProjectState newState) {
state = newState;
}
@@ -233,7 +233,7 @@
return defaultDashboardId;
}
- public void setDefaultDashboard(final String defaultDashboardId) {
+ public void setDefaultDashboard(String defaultDashboardId) {
this.defaultDashboardId = defaultDashboardId;
}
@@ -241,7 +241,7 @@
return localDefaultDashboardId;
}
- public void setLocalDefaultDashboard(final String localDefaultDashboardId) {
+ public void setLocalDefaultDashboard(String localDefaultDashboardId) {
this.localDefaultDashboardId = localDefaultDashboardId;
}
@@ -249,11 +249,11 @@
return themeName;
}
- public void setThemeName(final String themeName) {
+ public void setThemeName(String themeName) {
this.themeName = themeName;
}
- public void copySettingsFrom(final Project update) {
+ public void copySettingsFrom(Project update) {
description = update.description;
useContributorAgreements = update.useContributorAgreements;
useSignedOffBy = update.useSignedOffBy;
@@ -282,7 +282,7 @@
* @param allProjectsName name key of the wild project
* @return name key of the parent project, {@code null} if this project is the wild project
*/
- public Project.NameKey getParent(final Project.NameKey allProjectsName) {
+ public Project.NameKey getParent(Project.NameKey allProjectsName) {
if (parent != null) {
return parent;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java
index d04f8e6..d2a3bd6 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java
@@ -25,7 +25,7 @@
protected RevId() {}
- public RevId(final String str) {
+ public RevId(String str) {
id = str;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java
index 9abc744..cd42dd1 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java
@@ -35,7 +35,7 @@
}
@Override
- protected void set(final String newValue) {
+ protected void set(String newValue) {
assert get().equals(newValue);
}
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java
index 8cc9737..2f6008f 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java
@@ -32,7 +32,7 @@
protected Id() {}
- public Id(final String id) {
+ public Id(String id) {
this.id = id;
}
@@ -56,7 +56,7 @@
protected System() {}
- public System(final String s) {
+ public System(String s) {
this.system = s;
}
@@ -89,7 +89,7 @@
trackingSystem = new System();
}
- protected Key(final Change.Id ch, final Id id, final System s) {
+ protected Key(Change.Id ch, Id id, System s) {
changeId = ch;
trackingKey = id;
trackingSystem = s;
@@ -119,11 +119,11 @@
protected TrackingId() {}
- public TrackingId(final Change.Id ch, final TrackingId.Id id, final TrackingId.System s) {
+ public TrackingId(Change.Id ch, TrackingId.Id id, TrackingId.System s) {
key = new Key(ch, id, s);
}
- public TrackingId(final Change.Id ch, final String id, final String s) {
+ public TrackingId(Change.Id ch, String id, String s) {
key = new Key(ch, new TrackingId.Id(id), new TrackingId.System(s));
}
@@ -149,7 +149,7 @@
}
@Override
- public boolean equals(final Object obj) {
+ public boolean equals(Object obj) {
if (obj instanceof TrackingId) {
final TrackingId tr = (TrackingId) obj;
return key.equals(tr.key);
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java
index ddc1297..0b7aee3 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java
@@ -39,7 +39,7 @@
return name;
}
- public void setName(final String n) {
+ public void setName(String n) {
name = n;
}
@@ -47,7 +47,7 @@
return email;
}
- public void setEmail(final String e) {
+ public void setEmail(String e) {
email = e;
}
@@ -59,7 +59,7 @@
return when;
}
- public void setDate(final Timestamp d) {
+ public void setDate(Timestamp d) {
when = d;
}
@@ -67,7 +67,7 @@
return tz;
}
- public void setTimeZone(final int offset) {
+ public void setTimeZone(int offset) {
tz = offset;
}
@@ -75,7 +75,7 @@
return accountId;
}
- public void setAccount(final Account.Id id) {
+ public void setAccount(Account.Id id) {
accountId = id;
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java b/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java
index 6910d22..5e25651 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java
@@ -68,7 +68,7 @@
}
@Override
- public void register(final Runnable trigger) {
+ public void register(Runnable trigger) {
registry.register(
name,
new com.codahale.metrics.Gauge<V>() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java
index c2643de..3478694 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java
@@ -26,7 +26,7 @@
LinkedHashMultimap.create();
public PredicateClassLoader(
- final DynamicSet<PredicateProvider> predicateProviders, final ClassLoader parent) {
+ final DynamicSet<PredicateProvider> predicateProviders, ClassLoader parent) {
super(parent);
for (PredicateProvider predicateProvider : predicateProviders) {
@@ -37,10 +37,10 @@
}
@Override
- protected Class<?> findClass(final String className) throws ClassNotFoundException {
+ protected Class<?> findClass(String className) throws ClassNotFoundException {
final Collection<ClassLoader> classLoaders =
packageClassLoaderMap.get(getPackageName(className));
- for (final ClassLoader cl : classLoaders) {
+ for (ClassLoader cl : classLoaders) {
try {
return Class.forName(className, true, cl);
} catch (ClassNotFoundException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java
index 23c59f5..36cb4cc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java
@@ -137,7 +137,7 @@
/** Release resources stored in interpreter's hash manager. */
public void close() {
- for (final Iterator<Runnable> i = cleanup.iterator(); i.hasNext(); ) {
+ for (Iterator<Runnable> i = cleanup.iterator(); i.hasNext(); ) {
try {
i.next().run();
} catch (Throwable err) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
index 1ef284c..d63f36a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
@@ -97,7 +97,7 @@
}
private static Iterable<PatchSetApproval> filterApprovals(
- Iterable<PatchSetApproval> psas, final Account.Id accountId) {
+ Iterable<PatchSetApproval> psas, Account.Id accountId) {
return Iterables.filter(psas, a -> Objects.equals(a.getAccountId(), accountId));
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java
index 49ed8ef..37b6435 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java
@@ -259,7 +259,7 @@
}
private List<Comment> byCommentStatus(
- ResultSet<PatchLineComment> comments, final PatchLineComment.Status status) {
+ ResultSet<PatchLineComment> comments, PatchLineComment.Status status) {
return toComments(
serverId, Lists.newArrayList(Iterables.filter(comments, c -> c.getStatus() == status)));
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java
index 8c68270..87ba55a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java
@@ -29,7 +29,7 @@
private final String email;
@Inject
- public GerritPersonIdentProvider(@GerritServerConfig final Config cfg) {
+ public GerritPersonIdentProvider(@GerritServerConfig Config cfg) {
String name = cfg.getString("user", null, "name");
if (name == null) {
name = "Gerrit Code Review";
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
index 2c4c61c..5121a6f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
@@ -349,7 +349,7 @@
return newRefLogIdent(new Date(), TimeZone.getDefault());
}
- public PersonIdent newRefLogIdent(final Date when, final TimeZone tz) {
+ public PersonIdent newRefLogIdent(Date when, TimeZone tz) {
final Account ua = getAccount();
String name = ua.getFullName();
@@ -369,7 +369,7 @@
return new PersonIdent(name, user + "@" + guessHost(), when, tz);
}
- public PersonIdent newCommitterIdent(final Date when, final TimeZone tz) {
+ public PersonIdent newCommitterIdent(Date when, TimeZone tz) {
final Account ua = getAccount();
String name = ua.getFullName();
String email = ua.getPreferredEmail();
@@ -517,7 +517,7 @@
return host;
}
- private String getHost(final InetAddress in) {
+ private String getHost(InetAddress in) {
if (Boolean.FALSE.equals(disableReverseDnsLookup)) {
return in.getCanonicalHostName();
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java
index f3ab21d..7688f1d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java
@@ -32,8 +32,7 @@
* @throws RepositoryNotFoundException the repository of the branch's project does not exist.
* @throws IOException error while retrieving the branch from the repository.
*/
- public static boolean branchExists(
- final GitRepositoryManager repoManager, final Branch.NameKey branch)
+ public static boolean branchExists(final GitRepositoryManager repoManager, Branch.NameKey branch)
throws RepositoryNotFoundException, IOException {
try (Repository repo = repoManager.openRepository(branch.getParentKey())) {
boolean exists = repo.getRefDatabase().exactRef(branch.get()) != null;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java b/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java
index 72b361c..ea60682 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java
@@ -30,7 +30,7 @@
private boolean ran;
/** Register a task to be completed after the request ends. */
- public void add(final Runnable task) {
+ public void add(Runnable task) {
synchronized (cleanup) {
if (ran) {
throw new IllegalStateException("Request has already been cleaned up");
@@ -43,7 +43,7 @@
public void run() {
synchronized (cleanup) {
ran = true;
- for (final Iterator<Runnable> i = cleanup.iterator(); i.hasNext(); ) {
+ for (Iterator<Runnable> i = cleanup.iterator(); i.hasNext(); ) {
try {
i.next().run();
} catch (Throwable err) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java
index cbaae1e..a7c04f6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java
@@ -267,8 +267,7 @@
}
}
- public Set<Account.Id> byChange(final Change.Id changeId, final String label)
- throws OrmException {
+ public Set<Account.Id> byChange(Change.Id changeId, String label) throws OrmException {
try (Repository repo = repoManager.openRepository(allUsers)) {
return getRefNames(repo, RefNames.refsStarredChangesPrefix(changeId))
.stream()
@@ -283,8 +282,7 @@
@Deprecated
// To be used only for IsStarredByLegacyPredicate.
- public Set<Change.Id> byAccount(final Account.Id accountId, final String label)
- throws OrmException {
+ public Set<Change.Id> byAccount(Account.Id accountId, String label) throws OrmException {
try (Repository repo = repoManager.openRepository(allUsers)) {
return getRefNames(repo, RefNames.REFS_STARRED_CHANGES)
.stream()
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java
index 83b6ec6..891dec2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java
@@ -33,7 +33,7 @@
* hex escape (\x00, \x01, ...) or as a C-style escape sequence (\a, \b, \t, \n, \v, \f, or \r).
* Backslashes in the input string are doubled (\\).
*/
- public static String escapeString(final String str) {
+ public static String escapeString(String str) {
// Allocate a buffer big enough to cover the case with a string needed
// very excessive escaping without having to reallocate the buffer.
final StringBuilder result = new StringBuilder(3 * str.length());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java b/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java
index adad11c..2b7b618 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java
@@ -25,7 +25,7 @@
public UrlEncoded() {}
- public UrlEncoded(final String url) {
+ public UrlEncoded(String url) {
this.url = url;
}
@@ -37,7 +37,7 @@
separator = '?';
buffer.append(url);
}
- for (final Map.Entry<String, String> entry : entrySet()) {
+ for (Map.Entry<String, String> entry : entrySet()) {
final String key = entry.getKey();
final String val = entry.getValue();
if (separator != 0) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 533ed9d..64a3874 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -181,7 +181,7 @@
* @param project Project name.
* @return Links for projects.
*/
- public List<WebLinkInfo> getProjectLinks(final String project) {
+ public List<WebLinkInfo> getProjectLinks(String project) {
return filterLinks(projectLinks, webLink -> webLink.getProjectWeblink(project));
}
@@ -190,7 +190,7 @@
* @param branch Branch name
* @return Links for branches.
*/
- public List<WebLinkInfo> getBranchLinks(final String project, final String branch) {
+ public List<WebLinkInfo> getBranchLinks(String project, String branch) {
return filterLinks(branchLinks, webLink -> webLink.getBranchWebLink(project, branch));
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
index 024c610..492d0e8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
@@ -20,6 +20,7 @@
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.GetAccess;
import com.google.inject.Inject;
import java.io.IOException;
@@ -48,11 +49,11 @@
@Override
public Map<String, ProjectAccessInfo> apply(TopLevelResource resource)
- throws ResourceNotFoundException, ResourceConflictException, IOException {
+ throws ResourceNotFoundException, ResourceConflictException, IOException,
+ PermissionBackendException {
Map<String, ProjectAccessInfo> access = new TreeMap<>();
for (String p : projects) {
- Project.NameKey projectName = new Project.NameKey(p);
- access.put(p, getAccess.apply(projectName));
+ access.put(p, getAccess.apply(new Project.NameKey(p)));
}
return access;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java
index 9eec82d..255078a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java
@@ -58,7 +58,7 @@
}
@Override
- public Set<Account.Id> get(final String email) {
+ public Set<Account.Id> get(String email) {
try {
return cache.get(email);
} catch (ExecutionException e) {
@@ -68,7 +68,7 @@
}
@Override
- public void evict(final String email) {
+ public void evict(String email) {
if (email != null) {
cache.invalidate(email);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
index 1600982..e4df457 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
@@ -194,7 +194,7 @@
}
}
- private Optional<AccountState> load(final ReviewDb db, final Account.Id who)
+ private Optional<AccountState> load(ReviewDb db, Account.Id who)
throws OrmException, IOException, ConfigInvalidException {
Account account = accounts.get(db, who);
if (account == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java
index 88a2411..c6abb5b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java
@@ -99,7 +99,7 @@
* because {@link GroupMembership#getKnownGroups()} may only return a subset of the effective
* groups.
*/
- public boolean canSee(final Account.Id otherUser) {
+ public boolean canSee(Account.Id otherUser) {
return canSee(
new OtherUser() {
@Override
@@ -121,7 +121,7 @@
* because {@link GroupMembership#getKnownGroups()} may only return a subset of the effective
* groups.
*/
- public boolean canSee(final AccountState otherUser) {
+ public boolean canSee(AccountState otherUser) {
return canSee(
new OtherUser() {
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java
index a536c1a..b8b4a9e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java
@@ -18,11 +18,11 @@
public class AccountException extends Exception {
private static final long serialVersionUID = 1L;
- public AccountException(final String message) {
+ public AccountException(String message) {
super(message);
}
- public AccountException(final String message, final Throwable why) {
+ public AccountException(String message, Throwable why) {
super(message, why);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java
index 19fd34d..f1a2555 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java
@@ -21,7 +21,7 @@
public class AccountUserNameException extends AccountException {
private static final long serialVersionUID = 1L;
- public AccountUserNameException(final String message, final Throwable why) {
+ public AccountUserNameException(String message, Throwable why) {
super(message, why);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java
index 4dd9926..e654b8d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java
@@ -89,7 +89,7 @@
return password;
}
- public void setPassword(final String pass) {
+ public void setPassword(String pass) {
password = pass;
}
@@ -97,7 +97,7 @@
return displayName;
}
- public void setDisplayName(final String name) {
+ public void setDisplayName(String name) {
displayName = name != null && name.length() > 0 ? name : null;
}
@@ -105,7 +105,7 @@
return emailAddress;
}
- public void setEmailAddress(final String email) {
+ public void setEmailAddress(String email) {
emailAddress = email != null && email.length() > 0 ? email : null;
}
@@ -113,7 +113,7 @@
return userName;
}
- public void setUserName(final String user) {
+ public void setUserName(String user) {
userName = user;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java
index 795f1c5..d8e46f4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java
@@ -37,7 +37,7 @@
}
@Override
- public boolean allowsEdit(final AccountFieldName field) {
+ public boolean allowsEdit(AccountFieldName field) {
if (authConfig.getAuthType() == AuthType.HTTP) {
switch (field) {
case USER_NAME:
@@ -62,7 +62,7 @@
}
@Override
- public AuthRequest authenticate(final AuthRequest who) {
+ public AuthRequest authenticate(AuthRequest who) {
if (who.getEmailAddress() == null
&& who.getLocalUser() != null
&& emailExpander.canExpand(who.getLocalUser())) {
@@ -72,10 +72,10 @@
}
@Override
- public void onCreateAccount(final AuthRequest who, final Account account) {}
+ public void onCreateAccount(AuthRequest who, Account account) {}
@Override
- public Account.Id lookup(final String accountName) {
+ public Account.Id lookup(String accountName) {
if (emailExpander.canExpand(accountName)) {
final Set<Account.Id> c = byEmail.get(emailExpander.expand(accountName));
if (1 == c.size()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java
index 8368eda..20c152e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java
@@ -30,12 +30,14 @@
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
+import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.eclipse.jgit.errors.ConfigInvalidException;
+@Singleton
public class DeleteExternalIds implements RestModifyView<AccountResource, List<String>> {
private final AccountManager accountManager;
private final ExternalIds externalIds;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java
index 3c501e9..af2ab19 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java
@@ -23,7 +23,7 @@
class None implements EmailExpander {
public static final None INSTANCE = new None();
- public static boolean canHandle(final String fmt) {
+ public static boolean canHandle(String fmt) {
return fmt == null || fmt.isEmpty();
}
@@ -43,26 +43,26 @@
class Simple implements EmailExpander {
private static final String PLACEHOLDER = "{0}";
- public static boolean canHandle(final String fmt) {
+ public static boolean canHandle(String fmt) {
return fmt != null && fmt.contains(PLACEHOLDER);
}
private final String lhs;
private final String rhs;
- public Simple(final String fmt) {
+ public Simple(String fmt) {
final int p = fmt.indexOf(PLACEHOLDER);
lhs = fmt.substring(0, p);
rhs = fmt.substring(p + PLACEHOLDER.length());
}
@Override
- public boolean canExpand(final String user) {
+ public boolean canExpand(String user) {
return !user.contains(" ");
}
@Override
- public String expand(final String user) {
+ public String expand(String user) {
return lhs + user + rhs;
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
index b14491f..1706880 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
@@ -88,7 +88,7 @@
}
@Override
- public AccountGroup get(final AccountGroup.Id groupId) {
+ public AccountGroup get(AccountGroup.Id groupId) {
try {
Optional<AccountGroup> g = byId.get(groupId);
return g.isPresent() ? g.get() : missing(groupId);
@@ -99,7 +99,7 @@
}
@Override
- public void evict(final AccountGroup group) throws IOException {
+ public void evict(AccountGroup group) throws IOException {
if (group.getId() != null) {
byId.invalidate(group.getId());
}
@@ -113,8 +113,8 @@
}
@Override
- public void evictAfterRename(
- final AccountGroup.NameKey oldName, final AccountGroup.NameKey newName) throws IOException {
+ public void evictAfterRename(final AccountGroup.NameKey oldName, AccountGroup.NameKey newName)
+ throws IOException {
if (oldName != null) {
byName.invalidate(oldName.get());
}
@@ -175,12 +175,12 @@
private final SchemaFactory<ReviewDb> schema;
@Inject
- ByIdLoader(final SchemaFactory<ReviewDb> sf) {
+ ByIdLoader(SchemaFactory<ReviewDb> sf) {
schema = sf;
}
@Override
- public Optional<AccountGroup> load(final AccountGroup.Id key) throws Exception {
+ public Optional<AccountGroup> load(AccountGroup.Id key) throws Exception {
try (ReviewDb db = schema.open()) {
return Optional.ofNullable(db.accountGroups().get(key));
}
@@ -191,7 +191,7 @@
private final SchemaFactory<ReviewDb> schema;
@Inject
- ByNameLoader(final SchemaFactory<ReviewDb> sf) {
+ ByNameLoader(SchemaFactory<ReviewDb> sf) {
schema = sf;
}
@@ -212,7 +212,7 @@
private final SchemaFactory<ReviewDb> schema;
@Inject
- ByUUIDLoader(final SchemaFactory<ReviewDb> sf) {
+ ByUUIDLoader(SchemaFactory<ReviewDb> sf) {
schema = sf;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java
index 4bab3a7..6ba2e5e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java
@@ -20,7 +20,7 @@
public class GroupComparator implements Comparator<AccountGroup> {
@Override
- public int compare(final AccountGroup group1, final AccountGroup group2) {
+ public int compare(AccountGroup group1, AccountGroup group2) {
return group1.getName().compareTo(group2.getName());
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java
index e88e97e..4b4c266 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java
@@ -32,11 +32,11 @@
private final GroupBackend groupBackend;
@Inject
- GenericFactory(final GroupBackend gb) {
+ GenericFactory(GroupBackend gb) {
groupBackend = gb;
}
- public GroupControl controlFor(final CurrentUser who, final AccountGroup.UUID groupId)
+ public GroupControl controlFor(CurrentUser who, AccountGroup.UUID groupId)
throws NoSuchGroupException {
final GroupDescription.Basic group = groupBackend.get(groupId);
if (group == null) {
@@ -52,13 +52,13 @@
private final GroupBackend groupBackend;
@Inject
- Factory(final GroupCache gc, final Provider<CurrentUser> cu, final GroupBackend gb) {
+ Factory(GroupCache gc, Provider<CurrentUser> cu, GroupBackend gb) {
groupCache = gc;
user = cu;
groupBackend = gb;
}
- public GroupControl controlFor(final AccountGroup.Id groupId) throws NoSuchGroupException {
+ public GroupControl controlFor(AccountGroup.Id groupId) throws NoSuchGroupException {
final AccountGroup group = groupCache.get(groupId);
if (group == null) {
throw new NoSuchGroupException(groupId);
@@ -66,7 +66,7 @@
return controlFor(GroupDescriptions.forAccountGroup(group));
}
- public GroupControl controlFor(final AccountGroup.UUID groupId) throws NoSuchGroupException {
+ public GroupControl controlFor(AccountGroup.UUID groupId) throws NoSuchGroupException {
final GroupDescription.Basic group = groupBackend.get(groupId);
if (group == null) {
throw new NoSuchGroupException(groupId);
@@ -82,7 +82,7 @@
return new GroupControl(user.get(), group, groupBackend);
}
- public GroupControl validateFor(final AccountGroup.Id groupId) throws NoSuchGroupException {
+ public GroupControl validateFor(AccountGroup.Id groupId) throws NoSuchGroupException {
final GroupControl c = controlFor(groupId);
if (!c.isVisible()) {
throw new NoSuchGroupException(groupId);
@@ -90,7 +90,7 @@
return c;
}
- public GroupControl validateFor(final AccountGroup.UUID groupUUID) throws NoSuchGroupException {
+ public GroupControl validateFor(AccountGroup.UUID groupUUID) throws NoSuchGroupException {
final GroupControl c = controlFor(groupUUID);
if (!c.isVisible()) {
throw new NoSuchGroupException(groupUUID);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
index 1c9baf8..e1fc101 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
@@ -139,7 +139,7 @@
private final SchemaFactory<ReviewDb> schema;
@Inject
- SubgroupsLoader(final SchemaFactory<ReviewDb> sf) {
+ SubgroupsLoader(SchemaFactory<ReviewDb> sf) {
schema = sf;
}
@@ -165,7 +165,7 @@
private final SchemaFactory<ReviewDb> schema;
@Inject
- ParentGroupsLoader(final SchemaFactory<ReviewDb> sf) {
+ ParentGroupsLoader(SchemaFactory<ReviewDb> sf) {
schema = sf;
}
@@ -190,7 +190,7 @@
private final SchemaFactory<ReviewDb> schema;
@Inject
- AllExternalLoader(final SchemaFactory<ReviewDb> sf) {
+ AllExternalLoader(SchemaFactory<ReviewDb> sf) {
schema = sf;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java
index ea99b9b..d84d051 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java
@@ -58,7 +58,7 @@
this.currentUser = currentUser;
}
- public Set<Account> listAccounts(final AccountGroup.UUID groupUUID, final Project.NameKey project)
+ public Set<Account> listAccounts(AccountGroup.UUID groupUUID, Project.NameKey project)
throws NoSuchGroupException, NoSuchProjectException, OrmException, IOException {
return listAccounts(groupUUID, project, new HashSet<AccountGroup.UUID>());
}
@@ -78,8 +78,7 @@
return Collections.emptySet();
}
- private Set<Account> getProjectOwners(
- final Project.NameKey project, final Set<AccountGroup.UUID> seen)
+ private Set<Account> getProjectOwners(final Project.NameKey project, Set<AccountGroup.UUID> seen)
throws NoSuchProjectException, NoSuchGroupException, OrmException, IOException {
seen.add(SystemGroupBackend.PROJECT_OWNERS);
if (project == null) {
@@ -90,7 +89,7 @@
projectControl.controlFor(project, currentUser).getProjectState().getAllOwners();
final HashSet<Account> projectOwners = new HashSet<>();
- for (final AccountGroup.UUID ownerGroup : ownerGroups) {
+ for (AccountGroup.UUID ownerGroup : ownerGroups) {
if (!seen.contains(ownerGroup)) {
projectOwners.addAll(listAccounts(ownerGroup, project, seen));
}
@@ -99,19 +98,19 @@
}
private Set<Account> getGroupMembers(
- final AccountGroup group, final Project.NameKey project, final Set<AccountGroup.UUID> seen)
+ final AccountGroup group, Project.NameKey project, Set<AccountGroup.UUID> seen)
throws NoSuchGroupException, OrmException, NoSuchProjectException, IOException {
seen.add(group.getGroupUUID());
final GroupDetail groupDetail = groupDetailFactory.create(group.getId()).call();
final Set<Account> members = new HashSet<>();
if (groupDetail.members != null) {
- for (final AccountGroupMember member : groupDetail.members) {
+ for (AccountGroupMember member : groupDetail.members) {
members.add(accountCache.get(member.getAccountId()).getAccount());
}
}
if (groupDetail.includes != null) {
- for (final AccountGroupById groupInclude : groupDetail.includes) {
+ for (AccountGroupById groupInclude : groupDetail.includes) {
final AccountGroup includedGroup = groupCache.get(groupInclude.getIncludeUUID());
if (includedGroup != null && !seen.contains(includedGroup.getGroupUUID())) {
members.addAll(listAccounts(includedGroup.getGroupUUID(), project, seen));
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java
index b0ada0d..a42362c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java
@@ -64,7 +64,7 @@
}
@Override
- public Collection<GroupReference> suggest(final String name, final ProjectControl project) {
+ public Collection<GroupReference> suggest(String name, ProjectControl project) {
return groupCache
.all()
.stream()
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java
index cbd2072..cc39883 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java
@@ -109,7 +109,7 @@
return query().withQuery(query);
}
- private List<ChangeInfo> get(final QueryRequest q) throws RestApiException {
+ private List<ChangeInfo> get(QueryRequest q) throws RestApiException {
QueryChanges qc = queryProvider.get();
if (q.getQuery() != null) {
qc.addQuery(q.getQuery());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java
index 4a587a8..afcd273 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java
@@ -19,6 +19,7 @@
import com.google.gerrit.extensions.api.projects.BranchApi;
import com.google.gerrit.extensions.api.projects.BranchInfo;
import com.google.gerrit.extensions.api.projects.BranchInput;
+import com.google.gerrit.extensions.api.projects.ReflogEntryInfo;
import com.google.gerrit.extensions.restapi.BinaryResult;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.RestApiException;
@@ -29,10 +30,12 @@
import com.google.gerrit.server.project.FileResource;
import com.google.gerrit.server.project.FilesCollection;
import com.google.gerrit.server.project.GetContent;
+import com.google.gerrit.server.project.GetReflog;
import com.google.gerrit.server.project.ProjectResource;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
+import java.util.List;
public class BranchApiImpl implements BranchApi {
interface Factory {
@@ -44,6 +47,7 @@
private final DeleteBranch deleteBranch;
private final FilesCollection filesCollection;
private final GetContent getContent;
+ private final GetReflog getReflog;
private final String ref;
private final ProjectResource project;
@@ -54,6 +58,7 @@
DeleteBranch deleteBranch,
FilesCollection filesCollection,
GetContent getContent,
+ GetReflog getReflog,
@Assisted ProjectResource project,
@Assisted String ref) {
this.branches = branches;
@@ -61,6 +66,7 @@
this.deleteBranch = deleteBranch;
this.filesCollection = filesCollection;
this.getContent = getContent;
+ this.getReflog = getReflog;
this.project = project;
this.ref = ref;
}
@@ -103,6 +109,15 @@
}
}
+ @Override
+ public List<ReflogEntryInfo> reflog() throws RestApiException {
+ try {
+ return getReflog.apply(resource());
+ } catch (IOException e) {
+ throw new RestApiException("Cannot retrieve reflog", e);
+ }
+ }
+
private BranchResource resource() throws RestApiException, IOException {
return branches.parse(project, IdString.fromDecoded(ref));
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java
index 4d135b8..d41f02c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java
@@ -39,7 +39,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
final String n = params.getParameter(0);
final AccountGroup group = groupCache.get(new AccountGroup.NameKey(n));
if (group == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java
index 79ab8c8..d547b8c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java
@@ -41,7 +41,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
final String n = params.getParameter(0);
GroupReference group = GroupBackends.findExactSuggestion(groupBackend, n);
if (group == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java
index bdf0c91..0e841ec 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java
@@ -45,7 +45,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
final String token = params.getParameter(0);
final String[] tokens = token.split(",");
if (tokens.length != 3) {
@@ -57,7 +57,7 @@
final Change.Key key = Change.Key.parse(tokens[2]);
final Project.NameKey project = new Project.NameKey(tokens[0]);
final Branch.NameKey branch = new Branch.NameKey(project, tokens[1]);
- for (final ChangeData cd : queryProvider.get().byBranchKey(branch, key)) {
+ for (ChangeData cd : queryProvider.get().byBranchKey(branch, key)) {
setter.addValue(cd.getId());
return 1;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java
index e8283be..cb70abf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java
@@ -35,7 +35,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
final String token = params.getParameter(0);
final PatchSet.Id id;
try {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java
index bd0cdcd..1823527 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java
@@ -58,7 +58,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
String projectName = params.getParameter(0);
while (projectName.endsWith("/")) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java
index e0193c5..4325c00 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java
@@ -36,7 +36,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
final String token = params.getParameter(0);
try {
setter.addValue(SocketUtil.parse(token, 0));
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java
index b7af2e7..0be75a7 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java
@@ -34,7 +34,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
setter.addValue(params.getParameter(0));
owner.stopOptionParsing();
return 1;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java
index b0b6142..1b1faa4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java
@@ -20,7 +20,7 @@
public class AuthenticationUnavailableException extends AccountException {
private static final long serialVersionUID = 1L;
- public AuthenticationUnavailableException(final String message, final Throwable why) {
+ public AuthenticationUnavailableException(String message, Throwable why) {
super(message, why);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java
index 3ad97b0..af9c51b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java
@@ -33,7 +33,7 @@
}
@Override
- public AuthUser authenticate(final AuthRequest request) throws AuthException {
+ public AuthUser authenticate(AuthRequest request) throws AuthException {
List<AuthUser> authUsers = new ArrayList<>();
List<AuthException> authExs = new ArrayList<>();
for (AuthBackend backend : authBackends) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
index 1acd647..20a2be6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
@@ -73,7 +73,7 @@
@Inject
Helper(
- @GerritServerConfig final Config config,
+ @GerritServerConfig Config config,
@Named(LdapModule.PARENT_GROUPS_CACHE) Cache<String, ImmutableSet<String>> parentGroups) {
this.config = config;
this.server = LdapRealm.optional(config, "server");
@@ -135,7 +135,7 @@
return new InitialDirContext(env);
}
- private DirContext kerberosOpen(final Properties env) throws LoginException, NamingException {
+ private DirContext kerberosOpen(Properties env) throws LoginException, NamingException {
LoginContext ctx = new LoginContext("KerberosLogin");
ctx.login();
Subject subject = ctx.getSubject();
@@ -207,8 +207,7 @@
}
Set<AccountGroup.UUID> queryForGroups(
- final DirContext ctx, final String username, LdapQuery.Result account)
- throws NamingException {
+ final DirContext ctx, String username, LdapQuery.Result account) throws NamingException {
final LdapSchema schema = getSchema(ctx);
final Set<String> groupDNs = new HashSet<>();
@@ -330,7 +329,7 @@
final ParameterizedString groupName;
final List<LdapQuery> groupMemberQueryList;
- LdapSchema(final DirContext ctx) {
+ LdapSchema(DirContext ctx) {
type = discoverLdapType(ctx);
groupMemberQueryList = new ArrayList<>();
accountQueryList = new ArrayList<>();
@@ -360,7 +359,7 @@
throw new IllegalArgumentException("No variables in ldap.groupMemberPattern");
}
- for (final String name : groupMemberQuery.getParameters()) {
+ for (String name : groupMemberQuery.getParameters()) {
accountAtts.add(name);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
index 1a8d916..3683b35 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
@@ -113,7 +113,7 @@
}
@Override
- public GroupDescription.Basic get(final AccountGroup.UUID uuid) {
+ public GroupDescription.Basic get(AccountGroup.UUID uuid) {
if (!handles(uuid)) {
return null;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java
index 28eb05d..3d25e86 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java
@@ -61,8 +61,7 @@
return pattern.getParameterNames();
}
- List<Result> query(final DirContext ctx, final Map<String, String> params)
- throws NamingException {
+ List<Result> query(DirContext ctx, Map<String, String> params) throws NamingException {
final SearchControls sc = new SearchControls();
final NamingEnumeration<SearchResult> res;
@@ -87,9 +86,9 @@
class Result {
private final Map<String, Attribute> atts = new HashMap<>();
- Result(final SearchResult sr) {
+ Result(SearchResult sr) {
if (returnAttributes != null) {
- for (final String attName : returnAttributes) {
+ for (String attName : returnAttributes) {
final Attribute a = sr.getAttributes().get(attName);
if (a != null && a.size() > 0) {
atts.put(attName, a);
@@ -111,12 +110,12 @@
return get("dn");
}
- String get(final String attName) throws NamingException {
+ String get(String attName) throws NamingException {
final Attribute att = getAll(attName);
return att != null && 0 < att.size() ? String.valueOf(att.get(0)) : null;
}
- Attribute getAll(final String attName) {
+ Attribute getAll(String attName) {
return atts.get(attName);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
index 4685dc0..a34e3fc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
@@ -81,11 +81,9 @@
AuthConfig authConfig,
EmailExpander emailExpander,
LdapGroupBackend groupBackend,
- @Named(LdapModule.GROUP_CACHE)
- final LoadingCache<String, Set<AccountGroup.UUID>> membershipCache,
- @Named(LdapModule.USERNAME_CACHE)
- final LoadingCache<String, Optional<Account.Id>> usernameCache,
- @GerritServerConfig final Config config) {
+ @Named(LdapModule.GROUP_CACHE) LoadingCache<String, Set<AccountGroup.UUID>> membershipCache,
+ @Named(LdapModule.USERNAME_CACHE) LoadingCache<String, Optional<Account.Id>> usernameCache,
+ @GerritServerConfig Config config) {
this.helper = helper;
this.authConfig = authConfig;
this.emailExpander = emailExpander;
@@ -110,11 +108,11 @@
mandatoryGroup = optional(config, "mandatoryGroup");
}
- static SearchScope scope(final Config c, final String setting) {
+ static SearchScope scope(Config c, String setting) {
return c.getEnum("ldap", null, setting, SearchScope.SUBTREE);
}
- static String optional(final Config config, final String name) {
+ static String optional(Config config, String name) {
return config.getString("ldap", null, name);
}
@@ -134,7 +132,7 @@
return config.getBoolean("ldap", name, defaultValue);
}
- static String required(final Config config, final String name) {
+ static String required(Config config, String name) {
final String v = optional(config, name);
if (v == null || "".equals(v)) {
throw new IllegalArgumentException("No ldap." + name + " configured");
@@ -142,12 +140,12 @@
return v;
}
- static List<String> optionalList(final Config config, final String name) {
+ static List<String> optionalList(Config config, String name) {
String[] s = config.getStringList("ldap", null, name);
return Arrays.asList(s);
}
- static List<String> requiredList(final Config config, final String name) {
+ static List<String> requiredList(Config config, String name) {
List<String> vlist = optionalList(config, name);
if (vlist.isEmpty()) {
@@ -157,7 +155,7 @@
return vlist;
}
- static String optdef(final Config c, final String n, final String d) {
+ static String optdef(Config c, String n, String d) {
final String[] v = c.getStringList("ldap", null, n);
if (v == null || v.length == 0) {
return d;
@@ -171,7 +169,7 @@
}
}
- static String reqdef(final Config c, final String n, final String d) {
+ static String reqdef(Config c, String n, String d) {
final String v = optdef(c, n, d);
if (v == null) {
throw new IllegalArgumentException("No ldap." + n + " configured");
@@ -200,7 +198,7 @@
}
@Override
- public boolean allowsEdit(final AccountFieldName field) {
+ public boolean allowsEdit(AccountFieldName field) {
return !readOnlyAccountFields.contains(field);
}
@@ -210,7 +208,7 @@
}
final Map<String, String> values = new HashMap<>();
- for (final String name : m.attributes()) {
+ for (String name : m.attributes()) {
values.put(name, m.get(name));
}
@@ -219,7 +217,7 @@
}
@Override
- public AuthRequest authenticate(final AuthRequest who) throws AccountException {
+ public AuthRequest authenticate(AuthRequest who) throws AccountException {
if (config.getBoolean("ldap", "localUsernameToLowerCase", false)) {
who.setLocalUser(who.getLocalUser().toLowerCase(Locale.US));
}
@@ -298,7 +296,7 @@
}
@Override
- public void onCreateAccount(final AuthRequest who, final Account account) {
+ public void onCreateAccount(AuthRequest who, Account account) {
usernameCache.put(who.getLocalUser(), Optional.of(account.getId()));
}
@@ -335,7 +333,7 @@
private final Helper helper;
@Inject
- MemberLoader(final Helper helper) {
+ MemberLoader(Helper helper) {
this.helper = helper;
}
@@ -358,12 +356,12 @@
private final Helper helper;
@Inject
- ExistenceLoader(final Helper helper) {
+ ExistenceLoader(Helper helper) {
this.helper = helper;
}
@Override
- public Boolean load(final String groupDn) throws Exception {
+ public Boolean load(String groupDn) throws Exception {
final DirContext ctx = helper.open();
try {
Name compositeGroupName = new CompositeName().add(groupDn);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java
index 5df13f9..fe1f1ff 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java
@@ -22,7 +22,7 @@
abstract class LdapType {
static final LdapType RFC_2307 = new Rfc2307();
- static LdapType guessType(final DirContext ctx) throws NamingException {
+ static LdapType guessType(DirContext ctx) throws NamingException {
final Attributes rootAtts = ctx.getAttributes("");
Attribute supported = rootAtts.get("supportedCapabilities");
if (supported != null
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java
index 369914d..0038608 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java
@@ -36,7 +36,7 @@
private final int scope;
- SearchScope(final int scope) {
+ SearchScope(int scope) {
this.scope = scope;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index 80d644f..70e1619 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -53,6 +53,7 @@
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
+import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectControl;
@@ -90,6 +91,7 @@
private static final Logger log = LoggerFactory.getLogger(ChangeInserter.class);
+ private final PermissionBackend permissionBackend;
private final ProjectControl.GenericFactory projectControlFactory;
private final IdentifiedUser.GenericFactory userFactory;
private final ChangeControl.GenericFactory changeControlFactory;
@@ -138,6 +140,7 @@
@Inject
ChangeInserter(
+ PermissionBackend permissionBackend,
ProjectControl.GenericFactory projectControlFactory,
IdentifiedUser.GenericFactory userFactory,
ChangeControl.GenericFactory changeControlFactory,
@@ -154,6 +157,7 @@
@Assisted Change.Id changeId,
@Assisted ObjectId commitId,
@Assisted String refName) {
+ this.permissionBackend = permissionBackend;
this.projectControlFactory = projectControlFactory;
this.userFactory = userFactory;
this.changeControlFactory = changeControlFactory;
@@ -453,7 +457,7 @@
}
private Set<Account.Id> filterOnChangeVisibility(
- final ReviewDb db, final ChangeNotes notes, Set<Account.Id> accounts) {
+ final ReviewDb db, ChangeNotes notes, Set<Account.Id> accounts) {
return accounts
.stream()
.filter(
@@ -543,6 +547,8 @@
return;
}
+ PermissionBackend.ForRef perm =
+ permissionBackend.user(ctx.getUser()).project(ctx.getProject()).ref(refName);
try {
RefControl refControl =
projectControlFactory.controlFor(ctx.getProject(), ctx.getUser()).controlForRef(refName);
@@ -555,7 +561,7 @@
commitId,
ctx.getIdentifiedUser())) {
commitValidatorsFactory
- .forGerritCommits(refControl, new NoSshInfo(), ctx.getRevWalk())
+ .forGerritCommits(perm, refControl, new NoSshInfo(), ctx.getRevWalk())
.validate(event);
}
} catch (CommitValidationException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
index 7a6c209..14b7207 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
@@ -242,7 +242,7 @@
}
if ((prior.getParentCount() != 1 || next.getParentCount() != 1)
- && (!onlyFirstParentChanged(prior, next) || prior.getParentCount() == 0)) {
+ && (prior.getParentCount() == 0 || !onlyFirstParentChanged(prior, next))) {
// Trivial rebases done by machine only work well on 1 parent.
return ChangeKind.REWORK;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java
index 95491f5..b4867c4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java
@@ -14,23 +14,22 @@
package com.google.gerrit.server.change;
-import com.google.gerrit.common.data.Capable;
import com.google.gerrit.extensions.api.changes.CherryPickInput;
import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.webui.UiAction;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.git.IntegrationException;
-import com.google.gerrit.server.project.ChangeControl;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.ProjectPermission;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.InvalidChangeOperationException;
import com.google.gerrit.server.project.NoSuchChangeException;
-import com.google.gerrit.server.project.ProjectControl;
-import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.RetryHelper;
import com.google.gerrit.server.update.RetryingRestModifyView;
@@ -45,59 +44,54 @@
public class CherryPick
extends RetryingRestModifyView<RevisionResource, CherryPickInput, ChangeInfo>
implements UiAction<RevisionResource> {
- private final Provider<ReviewDb> dbProvider;
+ private final PermissionBackend permissionBackend;
+ private final Provider<CurrentUser> user;
private final CherryPickChange cherryPickChange;
private final ChangeJson.Factory json;
@Inject
CherryPick(
+ PermissionBackend permissionBackend,
+ Provider<CurrentUser> user,
RetryHelper retryHelper,
- Provider<ReviewDb> dbProvider,
CherryPickChange cherryPickChange,
ChangeJson.Factory json) {
super(retryHelper);
- this.dbProvider = dbProvider;
+ this.permissionBackend = permissionBackend;
+ this.user = user;
this.cherryPickChange = cherryPickChange;
this.json = json;
}
@Override
- protected ChangeInfo applyImpl(
- BatchUpdate.Factory updateFactory, RevisionResource revision, CherryPickInput input)
- throws OrmException, IOException, UpdateException, RestApiException {
- final ChangeControl control = revision.getControl();
+ public ChangeInfo applyImpl(
+ BatchUpdate.Factory updateFactory, RevisionResource rsrc, CherryPickInput input)
+ throws OrmException, IOException, UpdateException, RestApiException,
+ PermissionBackendException {
input.parent = input.parent == null ? 1 : input.parent;
-
if (input.message == null || input.message.trim().isEmpty()) {
throw new BadRequestException("message must be non-empty");
} else if (input.destination == null || input.destination.trim().isEmpty()) {
throw new BadRequestException("destination must be non-empty");
}
- if (!control.isVisible(dbProvider.get())) {
- throw new AuthException("Cherry pick not permitted");
- }
-
- ProjectControl projectControl = control.getProjectControl();
- Capable capable = projectControl.canPushToAtLeastOneRef();
- if (capable != Capable.OK) {
- throw new AuthException(capable.getMessage());
- }
-
- RefControl refControl = projectControl.controlForRef(RefNames.fullName(input.destination));
- if (!refControl.canUpload()) {
- throw new AuthException(
- "Not allowed to cherry pick "
- + revision.getChange().getId().toString()
- + " to "
- + input.destination);
- }
+ String refName = RefNames.fullName(input.destination);
+ CreateChange.checkValidCLA(rsrc.getControl().getProjectControl());
+ permissionBackend
+ .user(user)
+ .project(rsrc.getChange().getProject())
+ .ref(refName)
+ .check(RefPermission.CREATE_CHANGE);
try {
Change.Id cherryPickedChangeId =
cherryPickChange.cherryPick(
- updateFactory, revision.getChange(), revision.getPatchSet(), input, refControl);
- return json.noOptions().format(revision.getProject(), cherryPickedChangeId);
+ updateFactory,
+ rsrc.getChange(),
+ rsrc.getPatchSet(),
+ input,
+ rsrc.getControl().getProjectControl().controlForRef(refName));
+ return json.noOptions().format(rsrc.getProject(), cherryPickedChangeId);
} catch (InvalidChangeOperationException e) {
throw new BadRequestException(e.getMessage());
} catch (IntegrationException | NoSuchChangeException e) {
@@ -106,10 +100,15 @@
}
@Override
- public UiAction.Description getDescription(RevisionResource resource) {
+ public UiAction.Description getDescription(RevisionResource rsrc) {
return new UiAction.Description()
.setLabel("Cherry Pick")
.setTitle("Cherry pick change to a different branch")
- .setVisible(resource.getControl().getProjectControl().canUpload() && resource.isCurrent());
+ .setVisible(
+ rsrc.isCurrent()
+ && permissionBackend
+ .user(user)
+ .project(rsrc.getProject())
+ .testOrFalse(ProjectPermission.CREATE_CHANGE));
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java
index 1b63cb5..41f0463 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java
@@ -15,27 +15,28 @@
package com.google.gerrit.server.change;
import com.google.common.base.Strings;
-import com.google.gerrit.common.data.Capable;
import com.google.gerrit.extensions.api.changes.CherryPickInput;
import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
+import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.git.IntegrationException;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.CommitResource;
import com.google.gerrit.server.project.InvalidChangeOperationException;
-import com.google.gerrit.server.project.ProjectControl;
-import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.RetryHelper;
import com.google.gerrit.server.update.RetryingRestModifyView;
import com.google.gerrit.server.update.UpdateException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -43,14 +44,21 @@
@Singleton
public class CherryPickCommit
extends RetryingRestModifyView<CommitResource, CherryPickInput, ChangeInfo> {
-
+ private final PermissionBackend permissionBackend;
+ private final Provider<CurrentUser> user;
private final CherryPickChange cherryPickChange;
private final ChangeJson.Factory json;
@Inject
CherryPickCommit(
- RetryHelper retryHelper, CherryPickChange cherryPickChange, ChangeJson.Factory json) {
+ RetryHelper retryHelper,
+ Provider<CurrentUser> user,
+ CherryPickChange cherryPickChange,
+ ChangeJson.Factory json,
+ PermissionBackend permissionBackend) {
super(retryHelper);
+ this.permissionBackend = permissionBackend;
+ this.user = user;
this.cherryPickChange = cherryPickChange;
this.json = json;
}
@@ -58,35 +66,40 @@
@Override
public ChangeInfo applyImpl(
BatchUpdate.Factory updateFactory, CommitResource rsrc, CherryPickInput input)
- throws OrmException, IOException, UpdateException, RestApiException {
+ throws OrmException, IOException, UpdateException, RestApiException,
+ PermissionBackendException {
RevCommit commit = rsrc.getCommit();
String message = Strings.nullToEmpty(input.message).trim();
input.message = message.isEmpty() ? commit.getFullMessage() : message;
String destination = Strings.nullToEmpty(input.destination).trim();
input.parent = input.parent == null ? 1 : input.parent;
+ Project.NameKey projectName = rsrc.getProject().getProject().getNameKey();
if (destination.isEmpty()) {
throw new BadRequestException("destination must be non-empty");
}
- ProjectControl projectControl = rsrc.getProject();
- Capable capable = projectControl.canPushToAtLeastOneRef();
- if (capable != Capable.OK) {
- throw new AuthException(capable.getMessage());
- }
-
String refName = RefNames.fullName(destination);
- RefControl refControl = projectControl.controlForRef(refName);
- if (!refControl.canUpload()) {
- throw new AuthException("Not allowed to cherry pick " + commit + " to " + destination);
- }
+ CreateChange.checkValidCLA(rsrc.getProject());
+ permissionBackend
+ .user(user)
+ .project(projectName)
+ .ref(refName)
+ .check(RefPermission.CREATE_CHANGE);
- Project.NameKey project = projectControl.getProject().getNameKey();
try {
Change.Id cherryPickedChangeId =
cherryPickChange.cherryPick(
- updateFactory, null, null, null, null, project, commit, input, refControl);
- return json.noOptions().format(project, cherryPickedChangeId);
+ updateFactory,
+ null,
+ null,
+ null,
+ null,
+ projectName,
+ commit,
+ input,
+ rsrc.getProject().controlForRef(refName));
+ return json.noOptions().format(projectName, cherryPickedChangeId);
} catch (InvalidChangeOperationException e) {
throw new BadRequestException(e.getMessage());
} catch (IntegrationException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java
index ca70b0e..d0e489b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java
@@ -475,7 +475,7 @@
}
private void insertMergedPatchSet(
- final RevCommit commit, final @Nullable PatchSet.Id psIdToDelete, boolean reuseOldPsId) {
+ final RevCommit commit, @Nullable PatchSet.Id psIdToDelete, boolean reuseOldPsId) {
ProblemInfo notFound = problem("No patch set found for merged commit " + commit.name());
if (!user.get().isIdentifiedUser()) {
notFound.status = Status.FIX_FAILED;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java
index 599ce5e..cca9cb6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java
@@ -52,13 +52,14 @@
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MergeUtil;
+import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.InvalidChangeOperationException;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.project.ProjectResource;
import com.google.gerrit.server.project.ProjectsCollection;
-import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.RetryHelper;
import com.google.gerrit.server.update.RetryingRestModifyView;
@@ -89,13 +90,13 @@
@Singleton
public class CreateChange
extends RetryingRestModifyView<TopLevelResource, ChangeInput, Response<ChangeInfo>> {
-
private final String anonymousCowardName;
private final Provider<ReviewDb> db;
private final GitRepositoryManager gitManager;
private final AccountCache accountCache;
private final Sequences seq;
private final TimeZone serverTimeZone;
+ private final PermissionBackend permissionBackend;
private final Provider<CurrentUser> user;
private final ProjectsCollection projectsCollection;
private final ChangeInserter.Factory changeInserterFactory;
@@ -115,6 +116,7 @@
AccountCache accountCache,
Sequences seq,
@GerritPersonIdent PersonIdent myIdent,
+ PermissionBackend permissionBackend,
Provider<CurrentUser> user,
ProjectsCollection projectsCollection,
ChangeInserter.Factory changeInserterFactory,
@@ -132,6 +134,7 @@
this.accountCache = accountCache;
this.seq = seq;
this.serverTimeZone = myIdent.getTimeZone();
+ this.permissionBackend = permissionBackend;
this.user = user;
this.projectsCollection = projectsCollection;
this.changeInserterFactory = changeInserterFactory;
@@ -165,26 +168,18 @@
if (input.status != ChangeStatus.NEW && input.status != ChangeStatus.DRAFT) {
throw new BadRequestException("unsupported change status");
}
-
if (!allowDrafts && input.status == ChangeStatus.DRAFT) {
throw new MethodNotAllowedException("draft workflow is disabled");
}
}
- String refName = RefNames.fullName(input.branch);
ProjectResource rsrc = projectsCollection.parse(input.project);
-
- Capable r = rsrc.getControl().canPushToAtLeastOneRef();
- if (r != Capable.OK) {
- throw new AuthException(r.getMessage());
- }
-
- RefControl refControl = rsrc.getControl().controlForRef(refName);
- if (!refControl.canUpload() || !refControl.isVisible()) {
- throw new AuthException("cannot upload review");
- }
+ checkValidCLA(rsrc.getControl());
Project.NameKey project = rsrc.getNameKey();
+ String refName = RefNames.fullName(input.branch);
+ permissionBackend.user(user).project(project).ref(refName).check(RefPermission.CREATE_CHANGE);
+
try (Repository git = gitManager.openRepository(project);
ObjectInserter oi = git.newObjectInserter();
ObjectReader reader = oi.newReader();
@@ -345,4 +340,11 @@
private static ObjectId emptyTreeId(ObjectInserter inserter) throws IOException {
return inserter.insert(new TreeFormatter());
}
+
+ static void checkValidCLA(ProjectControl ctl) throws AuthException {
+ Capable capable = ctl.canPushToAtLeastOneRef();
+ if (capable != Capable.OK) {
+ throw new AuthException(capable.getMessage());
+ }
+ }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java
index 01401b8..0c2ec68 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java
@@ -136,7 +136,7 @@
}
}
- private static BinaryResult asBinaryResult(byte[] raw, final ObjectLoader obj) {
+ private static BinaryResult asBinaryResult(byte[] raw, ObjectLoader obj) {
if (raw != null) {
return BinaryResult.create(raw);
}
@@ -206,7 +206,7 @@
@SuppressWarnings("resource")
private BinaryResult zipBlob(
- final String path, final ObjectLoader obj, RevCommit commit, @Nullable final String suffix) {
+ final String path, ObjectLoader obj, RevCommit commit, @Nullable final String suffix) {
final String commitName = commit.getName();
final long when = commit.getCommitTime() * 1000L;
return new BinaryResult() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
index b25b588..6ccd460 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
@@ -55,7 +55,7 @@
Map<String, FileInfo> toFileInfoMap(Change change, ObjectId objectId, @Nullable PatchSet base)
throws PatchListNotAvailableException {
ObjectId a = (base == null) ? null : ObjectId.fromString(base.getRevision().get());
- return toFileInfoMap(change, new PatchListKey(a, objectId, Whitespace.IGNORE_NONE));
+ return toFileInfoMap(change, PatchListKey.againstCommit(a, objectId, Whitespace.IGNORE_NONE));
}
Map<String, FileInfo> toFileInfoMap(Change change, RevId revision, int parent)
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
index 6449f9b..1ac5a88f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
@@ -441,7 +441,7 @@
}
@Override
- public final int parseArguments(final Parameters params) throws CmdLineException {
+ public final int parseArguments(Parameters params) throws CmdLineException {
final String value = params.getParameter(0);
short context;
if ("all".equalsIgnoreCase(value)) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java
index 843ef3c..6111dfb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java
@@ -42,8 +42,7 @@
private static final Logger log = LoggerFactory.getLogger(IncludedInResolver.class);
- public static Result resolve(final Repository repo, final RevWalk rw, final RevCommit commit)
- throws IOException {
+ public static Result resolve(Repository repo, RevWalk rw, RevCommit commit) throws IOException {
RevFlag flag = newFlag(rw);
try {
return new IncludedInResolver(repo, rw, commit, flag).resolve();
@@ -53,7 +52,7 @@
}
public static boolean includedInOne(
- final Repository repo, final RevWalk rw, final RevCommit commit, final Collection<Ref> refs)
+ final Repository repo, RevWalk rw, RevCommit commit, Collection<Ref> refs)
throws IOException {
RevFlag flag = newFlag(rw);
try {
@@ -100,7 +99,7 @@
return detail;
}
- private boolean includedInOne(final Collection<Ref> refs) throws IOException {
+ private boolean includedInOne(Collection<Ref> refs) throws IOException {
parseCommits(refs);
List<RevCommit> before = new ArrayList<>();
List<RevCommit> after = new ArrayList<>();
@@ -112,7 +111,7 @@
}
/** Resolves which tip refs include the target commit. */
- private Set<String> includedIn(final Collection<RevCommit> tips, int limit)
+ private Set<String> includedIn(Collection<RevCommit> tips, int limit)
throws IOException, MissingObjectException, IncorrectObjectTypeException {
Set<String> result = new HashSet<>();
for (RevCommit tip : tips) {
@@ -149,7 +148,7 @@
* @param before
* @param after
*/
- private void partition(final List<RevCommit> before, final List<RevCommit> after) {
+ private void partition(List<RevCommit> before, List<RevCommit> after) {
int insertionPoint =
Collections.binarySearch(
tipsByCommitTime,
@@ -187,7 +186,7 @@
}
/** Parse commit of ref and store the relation between ref and commit. */
- private void parseCommits(final Collection<Ref> refs) throws IOException {
+ private void parseCommits(Collection<Ref> refs) throws IOException {
if (commitToRef != null) {
return;
}
@@ -219,7 +218,7 @@
sortOlderFirst(tipsByCommitTime);
}
- private void sortOlderFirst(final List<RevCommit> tips) {
+ private void sortOlderFirst(List<RevCommit> tips) {
Collections.sort(
tips,
new Comparator<RevCommit>() {
@@ -236,7 +235,7 @@
public Result() {}
- public void setBranches(final List<String> b) {
+ public void setBranches(List<String> b) {
Collections.sort(b);
branches = b;
}
@@ -245,7 +244,7 @@
return branches;
}
- public void setTags(final List<String> t) {
+ public void setTags(List<String> t) {
Collections.sort(t);
tags = t;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
index 581f2ba..a5fe978 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -320,6 +320,9 @@
return;
}
+ PermissionBackend.ForRef perm =
+ permissionBackend.user(ctx.getUser()).ref(origCtl.getChange().getDest());
+
String refName = getPatchSetId().toRefName();
try (CommitReceivedEvent event =
new CommitReceivedEvent(
@@ -333,7 +336,7 @@
commitId,
ctx.getIdentifiedUser())) {
commitValidatorsFactory
- .forGerritCommits(origCtl.getRefControl(), new NoSshInfo(), ctx.getRevWalk())
+ .forGerritCommits(perm, origCtl.getRefControl(), new NoSshInfo(), ctx.getRevWalk())
.validate(event);
} catch (CommitValidationException e) {
throw new ResourceConflictException(e.getFullMessage());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java
index 658b87b..eab06fb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java
@@ -14,11 +14,9 @@
package com.google.gerrit.server.change;
-import com.google.gerrit.common.data.Capable;
import com.google.gerrit.extensions.api.changes.PublishChangeEditInput;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.AcceptsPost;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ChildCollection;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.NotImplementedException;
@@ -88,11 +86,7 @@
protected Response<?> applyImpl(
BatchUpdate.Factory updateFactory, ChangeResource rsrc, PublishChangeEditInput in)
throws IOException, OrmException, RestApiException, UpdateException {
- Capable r = rsrc.getControl().getProjectControl().canPushToAtLeastOneRef();
- if (r != Capable.OK) {
- throw new AuthException(r.getMessage());
- }
-
+ CreateChange.checkValidCLA(rsrc.getControl().getProjectControl());
Optional<ChangeEdit> edit = editUtil.byChange(rsrc.getChange());
if (!edit.isPresent()) {
throw new ResourceConflictException(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
index 56d54ee..af06054 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
@@ -14,19 +14,18 @@
package com.google.gerrit.server.change;
+import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE;
+
import com.google.common.base.Strings;
import com.google.gerrit.common.TimeUtil;
-import com.google.gerrit.common.data.Capable;
import com.google.gerrit.extensions.api.changes.RevertInput;
import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.webui.UiAction;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.Change.Status;
import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
@@ -43,10 +42,10 @@
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.mail.send.RevertedSender;
import com.google.gerrit.server.notedb.ReviewerStateInternal;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.NoSuchChangeException;
-import com.google.gerrit.server.project.ProjectControl;
-import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdateOp;
import com.google.gerrit.server.update.ChangeContext;
@@ -82,6 +81,8 @@
private static final Logger log = LoggerFactory.getLogger(Revert.class);
private final Provider<ReviewDb> db;
+ private final PermissionBackend permissionBackend;
+ private final Provider<CurrentUser> user;
private final GitRepositoryManager repoManager;
private final ChangeInserter.Factory changeInserterFactory;
private final ChangeMessagesUtil cmUtil;
@@ -96,6 +97,8 @@
@Inject
Revert(
Provider<ReviewDb> db,
+ PermissionBackend permissionBackend,
+ Provider<CurrentUser> user,
GitRepositoryManager repoManager,
ChangeInserter.Factory changeInserterFactory,
ChangeMessagesUtil cmUtil,
@@ -109,6 +112,8 @@
ChangeReverted changeReverted) {
super(retryHelper);
this.db = db;
+ this.permissionBackend = permissionBackend;
+ this.user = user;
this.repoManager = repoManager;
this.changeInserterFactory = changeInserterFactory;
this.cmUtil = cmUtil;
@@ -122,27 +127,21 @@
}
@Override
- protected ChangeInfo applyImpl(
- BatchUpdate.Factory updateFactory, ChangeResource req, RevertInput input)
- throws IOException, OrmException, RestApiException, UpdateException, NoSuchChangeException {
- RefControl refControl = req.getControl().getRefControl();
- ProjectControl projectControl = req.getControl().getProjectControl();
-
- Capable capable = projectControl.canPushToAtLeastOneRef();
- if (capable != Capable.OK) {
- throw new AuthException(capable.getMessage());
- }
-
- Change change = req.getChange();
- if (!refControl.canUpload()) {
- throw new AuthException("revert not permitted");
- } else if (change.getStatus() != Status.MERGED) {
+ public ChangeInfo applyImpl(
+ BatchUpdate.Factory updateFactory, ChangeResource rsrc, RevertInput input)
+ throws IOException, OrmException, RestApiException, UpdateException, NoSuchChangeException,
+ PermissionBackendException {
+ Change change = rsrc.getChange();
+ if (change.getStatus() != Change.Status.MERGED) {
throw new ResourceConflictException("change is " + ChangeUtil.status(change));
}
- Change.Id revertedChangeId =
- revert(updateFactory, req.getControl(), Strings.emptyToNull(input.message));
- return json.noOptions().format(req.getProject(), revertedChangeId);
+ CreateChange.checkValidCLA(rsrc.getControl().getProjectControl());
+ permissionBackend.user(user).ref(change.getDest()).check(CREATE_CHANGE);
+
+ Change.Id revertId =
+ revert(updateFactory, rsrc.getControl(), Strings.emptyToNull(input.message));
+ return json.noOptions().format(rsrc.getProject(), revertId);
}
private Change.Id revert(BatchUpdate.Factory updateFactory, ChangeControl ctl, String message)
@@ -234,13 +233,14 @@
}
@Override
- public UiAction.Description getDescription(ChangeResource resource) {
+ public UiAction.Description getDescription(ChangeResource rsrc) {
+ Change change = rsrc.getChange();
return new UiAction.Description()
.setLabel("Revert")
.setTitle("Revert the change")
.setVisible(
- resource.getChange().getStatus() == Status.MERGED
- && resource.getControl().getRefControl().canUpload());
+ change.getStatus() == Change.Status.MERGED
+ && permissionBackend.user(user).ref(change.getDest()).testOrFalse(CREATE_CHANGE));
}
private class NotifyOp implements BatchUpdateOp {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java
index 3f3d6fd..79676f6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java
@@ -24,7 +24,7 @@
private final String anonymousCoward;
@Inject
- public AnonymousCowardNameProvider(@GerritServerConfig final Config cfg) {
+ public AnonymousCowardNameProvider(@GerritServerConfig Config cfg) {
String anonymousCoward = cfg.getString("user", null, "anonymousCoward");
if (anonymousCoward == null) {
anonymousCoward = DEFAULT;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java
index 7b93277..d5c2439 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java
@@ -67,7 +67,7 @@
private GitBasicAuthPolicy gitBasicAuthPolicy;
@Inject
- AuthConfig(@GerritServerConfig final Config cfg) throws XsrfException {
+ AuthConfig(@GerritServerConfig Config cfg) throws XsrfException {
authType = toType(cfg);
httpHeader = cfg.getString("auth", null, "httpheader");
httpDisplaynameHeader = cfg.getString("auth", null, "httpdisplaynameheader");
@@ -126,7 +126,7 @@
return Collections.unmodifiableList(r);
}
- private static AuthType toType(final Config cfg) {
+ private static AuthType toType(Config cfg) {
return cfg.getEnum("auth", null, "type", AuthType.OPENID);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java
index 7b40786..16c7508 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java
@@ -31,7 +31,7 @@
this.cacheProvider = cacheProvider;
}
- public CacheResource(String pluginName, String cacheName, final Cache<?, ?> cache) {
+ public CacheResource(String pluginName, String cacheName, Cache<?, ?> cache) {
this(
pluginName,
cacheName,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
index e670e2c..539951f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
@@ -23,7 +23,7 @@
private final String canonicalUrl;
@Inject
- public CanonicalWebUrlProvider(@GerritServerConfig final Config config) {
+ public CanonicalWebUrlProvider(@GerritServerConfig Config config) {
String u = config.getString("gerrit", null, "canonicalweburl");
if (u != null && !u.endsWith("/")) {
u += "/";
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java
index 0da1d3b..c6527fd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java
@@ -31,7 +31,7 @@
public class ConfigUtil {
@SuppressWarnings("unchecked")
- private static <T> T[] allValuesOf(final T defaultValue) {
+ private static <T> T[] allValuesOf(T defaultValue) {
try {
return (T[]) defaultValue.getClass().getMethod("values").invoke(null);
} catch (IllegalArgumentException
@@ -63,7 +63,7 @@
final T[] all) {
String n = valueString.replace(' ', '_').replace('-', '_');
- for (final T e : all) {
+ for (T e : all) {
if (e.name().equalsIgnoreCase(n)) {
return e;
}
@@ -81,7 +81,7 @@
r.append(".");
r.append(setting);
r.append("; supported values are: ");
- for (final T e : all) {
+ for (T e : all) {
r.append(e.name());
r.append(" ");
}
@@ -194,7 +194,7 @@
* assume if the value does not contain an indication of the units.
* @return the setting, or {@code defaultValue} if not set, expressed in {@code units}.
*/
- public static long getTimeUnit(final String valueString, long defaultValue, TimeUnit wantUnit) {
+ public static long getTimeUnit(String valueString, long defaultValue, TimeUnit wantUnit) {
Matcher m = Pattern.compile("^(0|[1-9][0-9]*)\\s*(.*)$").matcher(valueString);
if (!m.matches()) {
return defaultValue;
@@ -410,8 +410,8 @@
return Integer.class == t || int.class == t;
}
- private static boolean match(final String a, final String... cases) {
- for (final String b : cases) {
+ private static boolean match(String a, String... cases) {
+ for (String b : cases) {
if (b != null && b.equalsIgnoreCase(a)) {
return true;
}
@@ -434,7 +434,7 @@
+ valueString);
}
- private static IllegalArgumentException notTimeUnit(final String val) {
+ private static IllegalArgumentException notTimeUnit(String val) {
return new IllegalArgumentException("Invalid time unit value: " + val);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java
index 48d4507..e9d5e5e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java
@@ -40,7 +40,7 @@
private final ImmutableSet<ArchiveFormat> archiveFormats;
@Inject
- DownloadConfig(@GerritServerConfig final Config cfg) {
+ DownloadConfig(@GerritServerConfig Config cfg) {
String[] allSchemes = cfg.getStringList("download", null, "scheme");
if (allSchemes.length == 0) {
downloadSchemes =
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java
index 1c42c09..734bf03 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java
@@ -23,7 +23,7 @@
private final EmailExpander expander;
@Inject
- EmailExpanderProvider(@GerritServerConfig final Config cfg) {
+ EmailExpanderProvider(@GerritServerConfig Config cfg) {
final String s = cfg.getString("auth", null, "emailformat");
if (EmailExpander.Simple.canHandle(s)) {
expander = new EmailExpander.Simple(s);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 6c3be8c..366cbd1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -123,6 +123,7 @@
import com.google.gerrit.server.git.ReplaceOp;
import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
+import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.git.strategy.SubmitStrategy;
import com.google.gerrit.server.git.validators.CommitValidationListener;
import com.google.gerrit.server.git.validators.MergeValidationListener;
@@ -261,6 +262,7 @@
factory(RegisterNewEmailSender.Factory.class);
factory(ReplacePatchSetSender.Factory.class);
factory(SetAssigneeSender.Factory.class);
+ factory(VisibleRefFilter.Factory.class);
bind(PermissionCollection.Factory.class);
bind(AccountVisibility.class).toProvider(AccountVisibilityProvider.class).in(SINGLETON);
factory(ProjectOwnerGroupsProvider.Factory.class);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java
index 100a7cd..a93d1f2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java
@@ -32,7 +32,7 @@
/** Creates {@link GerritServerConfig}. */
public class GerritServerConfigModule extends AbstractModule {
- public static String getSecureStoreClassName(final Path sitePath) {
+ public static String getSecureStoreClassName(Path sitePath) {
if (sitePath != null) {
return getSecureStoreFromGerritConfig(sitePath);
}
@@ -41,7 +41,7 @@
return nullToDefault(secureStoreProperty);
}
- private static String getSecureStoreFromGerritConfig(final Path sitePath) {
+ private static String getSecureStoreFromGerritConfig(Path sitePath) {
AbstractModule m =
new AbstractModule() {
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
index 4358186..fdb400b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
@@ -32,7 +32,7 @@
@Inject
public RequestScopedReviewDbProvider(
- final SchemaFactory<ReviewDb> schema, final Provider<RequestCleanup> cleanup) {
+ final SchemaFactory<ReviewDb> schema, Provider<RequestCleanup> cleanup) {
this.schema = schema;
this.cleanup = cleanup;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java
index ac2f0c6..ddd2877 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java
@@ -25,7 +25,7 @@
private final Pattern match;
private final String system;
- public TrackingFooter(String f, final String m, final String s) throws PatternSyntaxException {
+ public TrackingFooter(String f, String m, String s) throws PatternSyntaxException {
f = f.trim();
if (f.endsWith(":")) {
f = f.substring(0, f.length() - 1);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java
index a897bdc..85528d9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java
@@ -23,7 +23,7 @@
public class TrackingFooters {
protected List<TrackingFooter> trackingFooters;
- public TrackingFooters(final List<TrackingFooter> trFooters) {
+ public TrackingFooters(List<TrackingFooter> trFooters) {
trackingFooters = trFooters;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java
index 5389b1f..2b1af36 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java
@@ -40,7 +40,7 @@
private static final Logger log = LoggerFactory.getLogger(TrackingFootersProvider.class);
@Inject
- TrackingFootersProvider(@GerritServerConfig final Config cfg) {
+ TrackingFootersProvider(@GerritServerConfig Config cfg) {
for (String name : cfg.getSubsections(TRACKING_ID_TAG)) {
boolean configValid = true;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java
index 15c1ae9..f1d7d96 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java
@@ -149,7 +149,7 @@
return psUtil.get(db.get(), notes, PatchSet.Id.fromRef(info.ref));
}
- private Supplier<ChangeAttribute> changeAttributeSupplier(final Change change) {
+ private Supplier<ChangeAttribute> changeAttributeSupplier(Change change) {
return Suppliers.memoize(
new Supplier<ChangeAttribute>() {
@Override
@@ -159,7 +159,7 @@
});
}
- private Supplier<AccountAttribute> accountAttributeSupplier(final AccountInfo account) {
+ private Supplier<AccountAttribute> accountAttributeSupplier(AccountInfo account) {
return Suppliers.memoize(
new Supplier<AccountAttribute>() {
@Override
@@ -172,7 +172,7 @@
}
private Supplier<PatchSetAttribute> patchSetAttributeSupplier(
- final Change change, final PatchSet patchSet) {
+ final Change change, PatchSet patchSet) {
return Suppliers.memoize(
new Supplier<PatchSetAttribute>() {
@Override
@@ -298,7 +298,7 @@
}
@Override
- public void onReviewerDeleted(final ReviewerDeletedListener.Event ev) {
+ public void onReviewerDeleted(ReviewerDeletedListener.Event ev) {
try {
ChangeNotes notes = getNotes(ev.getChange());
Change change = notes.getChange();
@@ -362,7 +362,7 @@
}
@Override
- public void onGitReferenceUpdated(final GitReferenceUpdatedListener.Event ev) {
+ public void onGitReferenceUpdated(GitReferenceUpdatedListener.Event ev) {
RefUpdatedEvent event = new RefUpdatedEvent();
if (ev.getUpdater() != null) {
event.submitter = accountAttributeSupplier(ev.getUpdater());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
index a3ea7f8..db0066d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
@@ -17,7 +17,6 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.ConfigUtil;
import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.git.WorkQueue.Executor;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.util.RequestScopePropagator;
import com.google.inject.Inject;
@@ -30,6 +29,7 @@
import java.io.OutputStream;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Repository;
@@ -63,7 +63,7 @@
@Provides
@Singleton
@Named(TIMEOUT_NAME)
- long getTimeoutMillis(@GerritServerConfig final Config cfg) {
+ long getTimeoutMillis(@GerritServerConfig Config cfg) {
return ConfigUtil.getTimeUnit(
cfg, "receive", null, "timeout", TimeUnit.MINUTES.toMillis(4), TimeUnit.MILLISECONDS);
}
@@ -72,7 +72,7 @@
private class Worker implements ProjectRunnable {
private final Collection<ReceiveCommand> commands;
- private Worker(final Collection<ReceiveCommand> commands) {
+ private Worker(Collection<ReceiveCommand> commands) {
this.commands = commands;
}
@@ -125,19 +125,19 @@
}
private final ReceiveCommits rc;
- private final Executor executor;
+ private final ScheduledThreadPoolExecutor executor;
private final RequestScopePropagator scopePropagator;
private final MultiProgressMonitor progress;
private final long timeoutMillis;
@Inject
AsyncReceiveCommits(
- final ReceiveCommits.Factory factory,
- @ReceiveCommitsExecutor final Executor executor,
- final RequestScopePropagator scopePropagator,
- @Named(TIMEOUT_NAME) final long timeoutMillis,
- @Assisted final ProjectControl projectControl,
- @Assisted final Repository repo) {
+ ReceiveCommits.Factory factory,
+ @ReceiveCommitsExecutor ScheduledThreadPoolExecutor executor,
+ RequestScopePropagator scopePropagator,
+ @Named(TIMEOUT_NAME) long timeoutMillis,
+ @Assisted ProjectControl projectControl,
+ @Assisted Repository repo) {
this.executor = executor;
this.scopePropagator = scopePropagator;
rc = factory.create(projectControl, repo);
@@ -148,7 +148,7 @@
}
@Override
- public void onPreReceive(final ReceivePack rp, final Collection<ReceiveCommand> commands) {
+ public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
try {
progress.waitFor(
executor.submit(scopePropagator.wrap(new Worker(commands))),
@@ -163,7 +163,7 @@
rc.addError("internal error while processing changes");
// ReceiveCommits has tried its best to catch errors, so anything at this
// point is very bad.
- for (final ReceiveCommand c : commands) {
+ for (ReceiveCommand c : commands) {
if (c.getResult() == Result.NOT_ATTEMPTED) {
c.setResult(Result.REJECTED_OTHER_REASON, "internal error");
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
index d09e857..29570a7 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
@@ -75,10 +75,10 @@
@Inject
BanCommit(
- final Provider<IdentifiedUser> currentUser,
- final GitRepositoryManager repoManager,
- @GerritPersonIdent final PersonIdent gerritIdent,
- final NotesBranchUtil.Factory notesBranchUtilFactory) {
+ Provider<IdentifiedUser> currentUser,
+ GitRepositoryManager repoManager,
+ @GerritPersonIdent PersonIdent gerritIdent,
+ NotesBranchUtil.Factory notesBranchUtilFactory) {
this.currentUser = currentUser;
this.repoManager = repoManager;
this.notesBranchUtilFactory = notesBranchUtilFactory;
@@ -86,7 +86,7 @@
}
public BanCommitResult ban(
- final ProjectControl projectControl, final List<ObjectId> commitsToBan, final String reason)
+ ProjectControl projectControl, List<ObjectId> commitsToBan, String reason)
throws PermissionDeniedException, IOException, ConcurrentRefUpdateException {
if (!projectControl.isOwner()) {
throw new PermissionDeniedException("Not project owner: not permitted to ban commits");
@@ -100,7 +100,7 @@
RevWalk revWalk = new RevWalk(repo);
ObjectInserter inserter = repo.newObjectInserter()) {
ObjectId noteId = null;
- for (final ObjectId commitToBan : commitsToBan) {
+ for (ObjectId commitToBan : commitsToBan) {
try {
revWalk.parseCommit(commitToBan);
} catch (MissingObjectException e) {
@@ -146,8 +146,7 @@
return currentUser.get().newCommitterIdent(now, tz);
}
- private static String buildCommitMessage(
- final List<ObjectId> bannedCommits, final String reason) {
+ private static String buildCommitMessage(List<ObjectId> bannedCommits, String reason) {
final StringBuilder commitMsg = new StringBuilder();
commitMsg.append("Banning ");
commitMsg.append(bannedCommits.size());
@@ -161,7 +160,7 @@
}
commitMsg.append("The following commits are banned:\n");
final StringBuilder commitList = new StringBuilder();
- for (final ObjectId c : bannedCommits) {
+ for (ObjectId c : bannedCommits) {
if (commitList.length() > 0) {
commitList.append(",\n");
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommitResult.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommitResult.java
index baa6013..9fadae2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommitResult.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommitResult.java
@@ -23,15 +23,15 @@
private final List<ObjectId> alreadyBannedCommits = new ArrayList<>(4);
private final List<ObjectId> ignoredObjectIds = new ArrayList<>(4);
- public void commitBanned(final ObjectId commitId) {
+ public void commitBanned(ObjectId commitId) {
newlyBannedCommits.add(commitId);
}
- public void commitAlreadyBanned(final ObjectId commitId) {
+ public void commitAlreadyBanned(ObjectId commitId) {
alreadyBannedCommits.add(commitId);
}
- public void notACommit(final ObjectId id) {
+ public void notACommit(ObjectId id) {
ignoredObjectIds.add(id);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java
index 80c705e..83a552c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java
@@ -84,7 +84,7 @@
}
@Override
- public void markUninteresting(final RevCommit c)
+ public void markUninteresting(RevCommit c)
throws MissingObjectException, IncorrectObjectTypeException, IOException {
checkArgument(c instanceof CodeReviewCommit);
super.markUninteresting(c);
@@ -120,7 +120,7 @@
*/
private CommitMergeStatus statusCode;
- public CodeReviewCommit(final AnyObjectId id) {
+ public CodeReviewCommit(AnyObjectId id) {
super(id);
}
@@ -144,7 +144,7 @@
this.patchsetId = patchsetId;
}
- public void copyFrom(final CodeReviewCommit src) {
+ public void copyFrom(CodeReviewCommit src) {
control = src.control;
patchsetId = src.patchsetId;
statusCode = src.statusCode;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java
index a9c21ff..b30acfa 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java
@@ -20,7 +20,7 @@
public abstract class DefaultQueueOp implements Runnable {
private final WorkQueue workQueue;
- protected DefaultQueueOp(final WorkQueue wq) {
+ protected DefaultQueueOp(WorkQueue wq) {
workQueue = wq;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
index 33c31fd..3bf89c7 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
@@ -112,7 +112,7 @@
return result;
}
- private void fire(final Project.NameKey p, final Properties statistics) {
+ private void fire(Project.NameKey p, Properties statistics) {
if (!listeners.iterator().hasNext()) {
return;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
index bcde7f8..04db42c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
@@ -25,8 +25,7 @@
private static final long serialVersionUID = 1L;
- public LargeObjectException(
- final String message, final org.eclipse.jgit.errors.LargeObjectException cause) {
+ public LargeObjectException(String message, org.eclipse.jgit.errors.LargeObjectException cause) {
super(message, cause);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
index ca19d47..276de9e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
@@ -66,7 +66,7 @@
private final Config serverConfig;
@Inject
- Lifecycle(@GerritServerConfig final Config cfg) {
+ Lifecycle(@GerritServerConfig Config cfg) {
this.serverConfig = cfg;
}
@@ -242,7 +242,7 @@
}
}
- private void onCreateProject(final Project.NameKey newProjectName) {
+ private void onCreateProject(Project.NameKey newProjectName) {
namesUpdateLock.lock();
try {
SortedSet<Project.NameKey> n = new TreeSet<>(names);
@@ -253,7 +253,7 @@
}
}
- private boolean isUnreasonableName(final Project.NameKey nameKey) {
+ private boolean isUnreasonableName(Project.NameKey nameKey) {
final String name = nameKey.get();
return name.length() == 0 // no empty paths
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java
index 733bf49..d547d7f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java
@@ -42,7 +42,7 @@
this.incoming = incoming;
}
- Collection<CodeReviewCommit> sort(final Collection<CodeReviewCommit> toMerge) throws IOException {
+ Collection<CodeReviewCommit> sort(Collection<CodeReviewCommit> toMerge) throws IOException {
final Set<CodeReviewCommit> heads = new HashSet<>();
final Set<CodeReviewCommit> sort = new HashSet<>(toMerge);
while (!sort.isEmpty()) {
@@ -82,7 +82,7 @@
return heads;
}
- private static <T> T removeOne(final Collection<T> c) {
+ private static <T> T removeOne(Collection<T> c) {
final Iterator<T> i = c.iterator();
final T r = i.next();
i.remove();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
index 11e3051..6e17cdf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
@@ -192,9 +192,9 @@
}
public CodeReviewCommit getFirstFastForward(
- final CodeReviewCommit mergeTip, final RevWalk rw, final List<CodeReviewCommit> toMerge)
+ CodeReviewCommit mergeTip, RevWalk rw, List<CodeReviewCommit> toMerge)
throws IntegrationException {
- for (final Iterator<CodeReviewCommit> i = toMerge.iterator(); i.hasNext(); ) {
+ for (Iterator<CodeReviewCommit> i = toMerge.iterator(); i.hasNext(); ) {
try {
final CodeReviewCommit n = i.next();
if (mergeTip == null || rw.isMergedInto(mergeTip, n)) {
@@ -354,7 +354,7 @@
PatchSetApproval submitAudit = null;
- for (final PatchSetApproval a : safeGetApprovals(ctl, psId)) {
+ for (PatchSetApproval a : safeGetApprovals(ctl, psId)) {
if (a.getValue() <= 0) {
// Negative votes aren't counted.
continue;
@@ -457,7 +457,7 @@
}
private static boolean contains(List<FooterLine> footers, FooterKey key, String val) {
- for (final FooterLine line : footers) {
+ for (FooterLine line : footers) {
if (line.matches(key) && val.equals(line.getValue())) {
return true;
}
@@ -466,7 +466,7 @@
}
private static boolean isSignedOffBy(List<FooterLine> footers, String email) {
- for (final FooterLine line : footers) {
+ for (FooterLine line : footers) {
if (line.matches(FooterKey.SIGNED_OFF_BY) && email.equals(line.getEmailAddress())) {
return true;
}
@@ -475,10 +475,7 @@
}
public boolean canMerge(
- final MergeSorter mergeSorter,
- final Repository repo,
- final CodeReviewCommit mergeTip,
- final CodeReviewCommit toMerge)
+ MergeSorter mergeSorter, Repository repo, CodeReviewCommit mergeTip, CodeReviewCommit toMerge)
throws IntegrationException {
if (hasMissingDependencies(mergeSorter, toMerge)) {
return false;
@@ -562,8 +559,8 @@
|| canMerge(mergeSorter, repo, mergeTip, toMerge);
}
- public boolean hasMissingDependencies(
- final MergeSorter mergeSorter, final CodeReviewCommit toMerge) throws IntegrationException {
+ public boolean hasMissingDependencies(MergeSorter mergeSorter, CodeReviewCommit toMerge)
+ throws IntegrationException {
try {
return !mergeSorter.sort(Collections.singleton(toMerge)).contains(toMerge);
} catch (IOException e) {
@@ -656,7 +653,7 @@
if (merged.size() > 1) {
msgbuf.append("\n\n* changes:\n");
- for (final CodeReviewCommit c : merged) {
+ for (CodeReviewCommit c : merged) {
rw.parseBody(c);
msgbuf.append(" ");
msgbuf.append(c.getShortMessage());
@@ -758,10 +755,7 @@
}
public void markCleanMerges(
- final RevWalk rw,
- final RevFlag canMergeFlag,
- final CodeReviewCommit mergeTip,
- final Set<RevCommit> alreadyAccepted)
+ RevWalk rw, RevFlag canMergeFlag, CodeReviewCommit mergeTip, Set<RevCommit> alreadyAccepted)
throws IntegrationException {
if (mergeTip == null) {
// If mergeTip is null here, branchTip was null, indicating a new branch
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java
index 9439a8b..59017e7 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java
@@ -166,7 +166,7 @@
}
@Override
- public void postUpdate(final Context ctx) {
+ public void postUpdate(Context ctx) {
if (!correctBranch) {
return;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
index 9101b44..2b9cad1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
@@ -63,7 +63,7 @@
private int count;
private int lastPercent;
- Task(final String subTaskName, final int totalWork) {
+ Task(String subTaskName, int totalWork) {
this.name = subTaskName;
this.total = totalWork;
}
@@ -76,7 +76,7 @@
* @param completed number of work units completed.
*/
@Override
- public void update(final int completed) {
+ public void update(int completed) {
boolean w = false;
synchronized (MultiProgressMonitor.this) {
count += completed;
@@ -141,7 +141,7 @@
* @param out stream for writing progress messages.
* @param taskName name of the overall task.
*/
- public MultiProgressMonitor(final OutputStream out, final String taskName) {
+ public MultiProgressMonitor(OutputStream out, String taskName) {
this(out, taskName, 500, TimeUnit.MILLISECONDS);
}
@@ -154,10 +154,7 @@
* @param maxIntervalUnit time unit for progress interval.
*/
public MultiProgressMonitor(
- final OutputStream out,
- final String taskName,
- long maxIntervalTime,
- TimeUnit maxIntervalUnit) {
+ OutputStream out, String taskName, long maxIntervalTime, TimeUnit maxIntervalUnit) {
this.out = out;
this.taskName = taskName;
maxIntervalNanos = NANOSECONDS.convert(maxIntervalTime, maxIntervalUnit);
@@ -168,7 +165,7 @@
*
* @see #waitFor(Future, long, TimeUnit)
*/
- public void waitFor(final Future<?> workerFuture) throws ExecutionException {
+ public void waitFor(Future<?> workerFuture) throws ExecutionException {
waitFor(workerFuture, 0, null);
}
@@ -186,8 +183,7 @@
* @throws ExecutionException if this thread or a worker thread was interrupted, the worker was
* cancelled, or timed out waiting for a worker to call {@link #end()}.
*/
- public void waitFor(
- final Future<?> workerFuture, final long timeoutTime, final TimeUnit timeoutUnit)
+ public void waitFor(Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
throws ExecutionException {
long overallStart = System.nanoTime();
long deadline;
@@ -268,7 +264,7 @@
* @param subTaskWork total work units in sub-task, or {@link #UNKNOWN}.
* @return sub-task handle.
*/
- public Task beginSubTask(final String subTask, final int subTaskWork) {
+ public Task beginSubTask(String subTask, int subTaskWork) {
Task task = new Task(subTask, subTaskWork);
tasks.add(task);
return task;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java
index 2020550..fe35231 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java
@@ -70,8 +70,8 @@
@Inject
public NotesBranchUtil(
- @GerritPersonIdent final PersonIdent gerritIdent,
- final GitReferenceUpdated gitRefUpdated,
+ @GerritPersonIdent PersonIdent gerritIdent,
+ GitReferenceUpdated gitRefUpdated,
@Assisted Project.NameKey project,
@Assisted Repository db,
@Assisted ObjectInserter inserter) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java
index ac031eb..a4719a9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java
@@ -91,7 +91,7 @@
public static final Scope REQUEST =
new Scope() {
@Override
- public <T> Provider<T> scope(final Key<T> key, final Provider<T> creator) {
+ public <T> Provider<T> scope(Key<T> key, Provider<T> creator) {
return new Provider<T>() {
@Override
public T get() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
index f1a35d7..130fee9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
@@ -1116,7 +1116,7 @@
return true;
}
- public static final String validMaxObjectSizeLimit(String value) throws ConfigInvalidException {
+ public static String validMaxObjectSizeLimit(String value) throws ConfigInvalidException {
if (value == null) {
return null;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java
index 28425e0..89bbf0f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java
@@ -14,11 +14,13 @@
package com.google.gerrit.server.git;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
public interface QueueProvider {
enum QueueType {
INTERACTIVE,
BATCH
}
- WorkQueue.Executor getQueue(QueueType type);
+ ScheduledThreadPoolExecutor getQueue(QueueType type);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RebaseSorter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/RebaseSorter.java
index dbfb19c..d596987 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/RebaseSorter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/RebaseSorter.java
@@ -131,7 +131,7 @@
}
}
- private static <T> T removeOne(final Collection<T> c) {
+ private static <T> T removeOne(Collection<T> c) {
final Iterator<T> i = c.iterator();
final T r = i.next();
i.remove();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index b7c017c..14042ba 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -112,7 +112,6 @@
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.permissions.RefPermission;
-import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.NoSuchChangeException;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectControl;
@@ -188,6 +187,7 @@
/** Receives change upload using the Git receive-pack protocol. */
public class ReceiveCommits {
private static final Logger log = LoggerFactory.getLogger(ReceiveCommits.class);
+ private static final String BYPASS_REVIEW = "bypass-review";
public static final Pattern NEW_PATCHSET =
Pattern.compile("^" + REFS_CHANGES + "(?:[0-9][0-9]/)?([1-9][0-9]*)(?:/new)?$");
@@ -384,7 +384,7 @@
PatchSetUtil psUtil,
ProjectCache projectCache,
TagCache tagCache,
- @Nullable SearchingChangeCacheImpl changeCache,
+ VisibleRefFilter.Factory refFilterFactory,
ChangeInserter.Factory changeInserterFactory,
CommitValidators.Factory commitValidatorsFactory,
RefOperationValidators.Factory refValidatorsFactory,
@@ -494,7 +494,7 @@
}
rp.setAdvertiseRefsHook(
- new VisibleRefFilter(tagCache, notesFactory, changeCache, repo, projectControl, db, false));
+ refFilterFactory.create(projectControl.getProjectState(), repo).setShowMetadata(false));
List<AdvertiseRefsHook> advHooks = new ArrayList<>(3);
advHooks.add(
new AdvertiseRefsHook() {
@@ -1051,7 +1051,7 @@
}
}
- private void parseCreate(ReceiveCommand cmd) {
+ private void parseCreate(ReceiveCommand cmd) throws PermissionBackendException {
RevObject obj;
try {
obj = rp.getRevWalk().parseAny(cmd.getNewId());
@@ -1069,7 +1069,14 @@
}
RefControl ctl = projectControl.controlForRef(cmd.getRefName());
- if (ctl.canCreate(db, rp.getRepository(), obj)) {
+ boolean ok;
+ try {
+ permissions.ref(cmd.getRefName()).check(RefPermission.CREATE);
+ ok = true;
+ } catch (AuthException err) {
+ ok = false;
+ }
+ if (ok && ctl.canCreate(rp.getRepository(), obj)) {
if (!validRefOperation(cmd)) {
return;
}
@@ -1202,6 +1209,7 @@
private final boolean defaultPublishComments;
Branch.NameKey dest;
RefControl ctl;
+ PermissionBackend.ForRef perm;
Set<Account.Id> reviewer = Sets.newLinkedHashSet();
Set<Account.Id> cc = Sets.newLinkedHashSet();
Map<String, Short> labels = new HashMap<>();
@@ -1319,7 +1327,7 @@
metaVar = "MESSAGE",
usage = "Comment message to apply to the review"
)
- void addMessage(final String token) {
+ void addMessage(String token) {
// git push does not allow spaces in refs.
message = token.replace("_", " ");
}
@@ -1437,7 +1445,7 @@
return ImmutableListMultimap.copyOf(pushOptions);
}
- private void parseMagicBranch(ReceiveCommand cmd) {
+ private void parseMagicBranch(ReceiveCommand cmd) throws PermissionBackendException {
// Permit exactly one new change request per push.
if (magicBranch != null) {
reject(cmd, "duplicate request");
@@ -1488,6 +1496,7 @@
magicBranch.dest = new Branch.NameKey(project.getNameKey(), ref);
magicBranch.ctl = projectControl.controlForRef(ref);
+ magicBranch.perm = permissions.ref(ref);
if (projectControl.getProject().getState()
!= com.google.gerrit.extensions.client.ProjectState.ACTIVE) {
reject(cmd, "project is read only");
@@ -1508,9 +1517,11 @@
}
}
- if (!magicBranch.ctl.canUpload()) {
+ try {
+ magicBranch.perm.check(RefPermission.CREATE_CHANGE);
+ } catch (AuthException denied) {
errors.put(Error.CODE_REVIEW, ref);
- reject(cmd, "cannot upload review");
+ reject(cmd, denied.getMessage());
return;
}
@@ -1534,10 +1545,13 @@
return;
}
- if (magicBranch.submit
- && !projectControl.controlForRef(MagicBranch.NEW_CHANGE + ref).canSubmit(true)) {
- reject(cmd, "submit not allowed");
- return;
+ if (magicBranch.submit) {
+ try {
+ permissions.ref(ref).check(RefPermission.UPDATE_BY_SUBMIT);
+ } catch (AuthException e) {
+ reject(cmd, e.getMessage());
+ return;
+ }
}
RevWalk walk = rp.getRevWalk();
@@ -1829,7 +1843,7 @@
logDebug("Creating new change for {} even though it is already tracked", name);
}
- if (!validCommit(rp.getRevWalk(), magicBranch.ctl, magicBranch.cmd, c)) {
+ if (!validCommit(rp.getRevWalk(), magicBranch.perm, magicBranch.ctl, magicBranch.cmd, c)) {
// Not a change the user can propose? Abort as early as possible.
newChanges = Collections.emptyList();
logDebug("Aborting early due to invalid commit");
@@ -2407,8 +2421,9 @@
}
}
- ChangeControl changeCtl = projectControl.controlFor(notes);
- if (!validCommit(rp.getRevWalk(), changeCtl.getRefControl(), inputCommand, newCommit)) {
+ PermissionBackend.ForRef perm = permissions.ref(change.getDest().get());
+ RefControl refctl = projectControl.controlForRef(change.getDest());
+ if (!validCommit(rp.getRevWalk(), perm, refctl, inputCommand, newCommit)) {
return false;
}
rp.getRevWalk().parseBody(priorCommit);
@@ -2704,17 +2719,22 @@
return true;
}
- private void validateNewCommits(RefControl ctl, ReceiveCommand cmd) {
- if (ctl.canForgeAuthor()
- && ctl.canForgeCommitter()
- && ctl.canForgeGerritServerIdentity()
- && ctl.canUploadMerges()
- && !projectControl.getProjectState().isUseSignedOffBy()
- && Iterables.isEmpty(rejectCommits)
- && !RefNames.REFS_CONFIG.equals(ctl.getRefName())
+ private void validateNewCommits(RefControl ctl, ReceiveCommand cmd)
+ throws PermissionBackendException {
+ PermissionBackend.ForRef perm = permissions.ref(ctl.getRefName());
+ if (!RefNames.REFS_CONFIG.equals(cmd.getRefName())
&& !(MagicBranch.isMagicBranch(cmd.getRefName())
- || NEW_PATCHSET.matcher(cmd.getRefName()).matches())) {
- logDebug("Short-circuiting new commit validation");
+ || NEW_PATCHSET.matcher(cmd.getRefName()).matches())
+ && pushOptions.containsKey(BYPASS_REVIEW)) {
+ try {
+ perm.check(RefPermission.BYPASS_REVIEW);
+ if (!Iterables.isEmpty(rejectCommits)) {
+ throw new AuthException("reject-commits prevents " + BYPASS_REVIEW);
+ }
+ logDebug("Short-circuiting new commit validation");
+ } catch (AuthException denied) {
+ reject(cmd, denied.getMessage());
+ }
return;
}
@@ -2735,7 +2755,7 @@
i++;
if (existing.keySet().contains(c)) {
continue;
- } else if (!validCommit(walk, ctl, cmd, c)) {
+ } else if (!validCommit(walk, perm, ctl, cmd, c)) {
break;
}
@@ -2761,7 +2781,8 @@
}
}
- private boolean validCommit(RevWalk rw, RefControl ctl, ReceiveCommand cmd, ObjectId id)
+ private boolean validCommit(
+ RevWalk rw, PermissionBackend.ForRef perm, RefControl ctl, ReceiveCommand cmd, ObjectId id)
throws IOException {
if (validCommits.contains(id)) {
@@ -2779,8 +2800,8 @@
&& magicBranch.merged;
CommitValidators validators =
isMerged
- ? commitValidatorsFactory.forMergedCommits(ctl)
- : commitValidatorsFactory.forReceiveCommits(ctl, sshInfo, repo, rw);
+ ? commitValidatorsFactory.forMergedCommits(perm, ctl)
+ : commitValidatorsFactory.forReceiveCommits(perm, ctl, sshInfo, repo, rw);
messages.addAll(validators.validate(receiveEvent));
} catch (CommitValidationException e) {
logDebug("Commit validation failed on {}", c.name());
@@ -2792,7 +2813,7 @@
return true;
}
- private void autoCloseChanges(final ReceiveCommand cmd) {
+ private void autoCloseChanges(ReceiveCommand cmd) {
logDebug("Starting auto-closing of changes");
String refName = cmd.getRefName();
checkState(
@@ -2857,7 +2878,7 @@
}
}
- for (final ReplaceRequest req : replaceAndClose) {
+ for (ReplaceRequest req : replaceAndClose) {
Change.Id id = req.notes.getChangeId();
if (!req.validate(true)) {
logDebug("Not closing {} because validation failed", id);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutor.java
index ddf24cde..a582564 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutor.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutor.java
@@ -18,8 +18,9 @@
import com.google.inject.BindingAnnotation;
import java.lang.annotation.Retention;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
-/** Marker on the global {@link WorkQueue.Executor} used by {@link ReceiveCommits}. */
+/** Marker on the global {@link ScheduledThreadPoolExecutor} used by {@link ReceiveCommits}. */
@Retention(RUNTIME)
@BindingAnnotation
public @interface ReceiveCommitsExecutor {}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
index affa44a..55707bd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
@@ -24,6 +24,7 @@
import com.google.inject.Singleton;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.lib.Config;
@@ -36,7 +37,7 @@
@Provides
@Singleton
@ReceiveCommitsExecutor
- public WorkQueue.Executor createReceiveCommitsExecutor(
+ public ScheduledThreadPoolExecutor createReceiveCommitsExecutor(
@GerritServerConfig Config config, WorkQueue queues) {
int poolSize =
config.getInt(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java
index 45ec769..3a7a125 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java
@@ -28,7 +28,7 @@
private static final long serialVersionUID = 1L;
/** @param projectName name of the project that cannot be created */
- public RepositoryCaseMismatchException(final Project.NameKey projectName) {
+ public RepositoryCaseMismatchException(Project.NameKey projectName) {
super("Name occupied in other case. Project " + projectName.get() + " cannot be created.");
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SendEmailExecutor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/SendEmailExecutor.java
index feb32fa..7d37e5a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/SendEmailExecutor.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/SendEmailExecutor.java
@@ -18,8 +18,9 @@
import com.google.inject.BindingAnnotation;
import java.lang.annotation.Retention;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
-/** Marker on the global {@link WorkQueue.Executor} used to send email. */
+/** Marker on the global {@link ScheduledThreadPoolExecutor} used to send email. */
@Retention(RUNTIME)
@BindingAnnotation
public @interface SendEmailExecutor {}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
index 1f93fc8..69909eb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
@@ -385,7 +385,7 @@
}
/** Create a separate gitlink commit */
- public CodeReviewCommit composeGitlinksCommit(final Branch.NameKey subscriber)
+ public CodeReviewCommit composeGitlinksCommit(Branch.NameKey subscriber)
throws IOException, SubmoduleException {
OpenRepo or;
try {
@@ -444,7 +444,7 @@
/** Amend an existing commit with gitlink updates */
public CodeReviewCommit composeGitlinksCommit(
- final Branch.NameKey subscriber, CodeReviewCommit currentCommit)
+ Branch.NameKey subscriber, CodeReviewCommit currentCommit)
throws IOException, SubmoduleException {
OpenRepo or;
try {
@@ -485,7 +485,7 @@
}
private RevCommit updateSubmodule(
- DirCache dc, DirCacheEditor ed, StringBuilder msgbuf, final SubmoduleSubscription s)
+ DirCache dc, DirCacheEditor ed, StringBuilder msgbuf, SubmoduleSubscription s)
throws SubmoduleException, IOException {
OpenRepo subOr;
try {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java
index 4ac9071..204a0d5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java
@@ -31,7 +31,7 @@
private final String maxObjectSizeLimitFormatted;
@Inject
- TransferConfig(@GerritServerConfig final Config cfg) {
+ TransferConfig(@GerritServerConfig Config cfg) {
timeout =
(int)
ConfigUtil.getTimeUnit(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ValidationError.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ValidationError.java
index 4185141..448ab15 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ValidationError.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ValidationError.java
@@ -45,7 +45,7 @@
void error(ValidationError error);
}
- public static Sink createLoggerSink(final String message, final Logger log) {
+ public static Sink createLoggerSink(String message, Logger log) {
return new ValidationError.Sink() {
@Override
public void error(ValidationError error) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
index 536858b..6b6d97f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
@@ -155,7 +155,7 @@
public void load(RevWalk walk, ObjectId id) throws IOException, ConfigInvalidException {
this.reader = walk.getObjectReader();
try {
- revision = id != null ? new RevWalk(reader).parseCommit(id) : null;
+ revision = id != null ? walk.parseCommit(id) : null;
onLoad();
} finally {
reader = null;
@@ -238,7 +238,7 @@
* @param update helper info about the update.
* @throws IOException if the update failed.
*/
- public BatchMetaDataUpdate openUpdate(final MetaDataUpdate update) throws IOException {
+ public BatchMetaDataUpdate openUpdate(MetaDataUpdate update) throws IOException {
final Repository db = update.getRepository();
reader = db.newObjectReader();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java
index 3756d73..e4d78c4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java
@@ -27,11 +27,16 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.project.ProjectControl;
+import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gwtorm.server.OrmException;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -52,50 +57,62 @@
public class VisibleRefFilter extends AbstractAdvertiseRefsHook {
private static final Logger log = LoggerFactory.getLogger(VisibleRefFilter.class);
+ public interface Factory {
+ VisibleRefFilter create(ProjectState projectState, Repository git);
+ }
+
private final TagCache tagCache;
private final ChangeNotes.Factory changeNotesFactory;
@Nullable private final SearchingChangeCacheImpl changeCache;
- private final Repository db;
- private final Project.NameKey projectName;
- private final ProjectControl projectCtl;
- private final ReviewDb reviewDb;
- private final boolean showMetadata;
+ private final Provider<ReviewDb> db;
+ private final Provider<CurrentUser> user;
+ private final ProjectState projectState;
+ private final Repository git;
+ private ProjectControl projectCtl;
+ private boolean showMetadata = true;
private String userEditPrefix;
private Map<Change.Id, Branch.NameKey> visibleChanges;
- public VisibleRefFilter(
+ @Inject
+ VisibleRefFilter(
TagCache tagCache,
ChangeNotes.Factory changeNotesFactory,
@Nullable SearchingChangeCacheImpl changeCache,
- Repository db,
- ProjectControl projectControl,
- ReviewDb reviewDb,
- boolean showMetadata) {
+ Provider<ReviewDb> db,
+ Provider<CurrentUser> user,
+ @Assisted ProjectState projectState,
+ @Assisted Repository git) {
this.tagCache = tagCache;
this.changeNotesFactory = changeNotesFactory;
this.changeCache = changeCache;
this.db = db;
- this.projectName = projectControl.getProject().getNameKey();
- this.projectCtl = projectControl;
- this.reviewDb = reviewDb;
- this.showMetadata = showMetadata;
+ this.user = user;
+ this.projectState = projectState;
+ this.git = git;
+ }
+
+ /** Show change references. Default is {@code true}. */
+ public VisibleRefFilter setShowMetadata(boolean show) {
+ showMetadata = show;
+ return this;
}
public Map<String, Ref> filter(Map<String, Ref> refs, boolean filterTagsSeparately) {
- if (projectCtl.getProjectState().isAllUsers()) {
+ if (projectState.isAllUsers()) {
refs = addUsersSelfSymref(refs);
}
+ projectCtl = projectState.controlFor(user.get());
if (projectCtl.allRefsAreVisible(ImmutableSet.of(REFS_CONFIG))) {
return fastHideRefsMetaConfig(refs);
}
Account.Id userId;
boolean viewMetadata;
- if (projectCtl.getUser().isIdentifiedUser()) {
- IdentifiedUser user = projectCtl.getUser().asIdentifiedUser();
- userId = user.getAccountId();
- viewMetadata = user.getCapabilities().canAccessDatabase();
+ if (user.get().isIdentifiedUser()) {
+ IdentifiedUser u = user.get().asIdentifiedUser();
+ userId = u.getAccountId();
+ viewMetadata = u.getCapabilities().canAccessDatabase();
userEditPrefix = RefNames.refsEditPrefix(userId);
} else {
userId = null;
@@ -109,8 +126,7 @@
String name = ref.getName();
Change.Id changeId;
Account.Id accountId;
- if (name.startsWith(REFS_CACHE_AUTOMERGE)
- || (!showMetadata && isMetadata(projectCtl, name))) {
+ if (name.startsWith(REFS_CACHE_AUTOMERGE) || (!showMetadata && isMetadata(name))) {
continue;
} else if (RefNames.isRefsEdit(name)) {
// Edits are visible only to the owning user, if change is visible.
@@ -138,8 +154,7 @@
if (viewMetadata) {
result.put(name, ref);
}
- } else if (projectCtl.getProjectState().isAllUsers()
- && name.equals(RefNames.REFS_EXTERNAL_IDS)) {
+ } else if (projectState.isAllUsers() && name.equals(RefNames.REFS_EXTERNAL_IDS)) {
// The notes branch with the external IDs of all users must not be exposed to normal users.
if (viewMetadata) {
result.put(name, ref);
@@ -158,11 +173,11 @@
if (!deferredTags.isEmpty() && (!result.isEmpty() || filterTagsSeparately)) {
TagMatcher tags =
tagCache
- .get(projectName)
+ .get(projectState.getProject().getNameKey())
.matcher(
tagCache,
- db,
- filterTagsSeparately ? filter(db.getAllRefs()).values() : result.values());
+ git,
+ filterTagsSeparately ? filter(git.getAllRefs()).values() : result.values());
for (Ref tag : deferredTags) {
if (tags.isReachable(tag)) {
result.put(tag.getName(), tag);
@@ -183,8 +198,8 @@
}
private Map<String, Ref> addUsersSelfSymref(Map<String, Ref> refs) {
- if (projectCtl.getUser().isIdentifiedUser()) {
- Ref r = refs.get(RefNames.refsUsers(projectCtl.getUser().getAccountId()));
+ if (user.get().isIdentifiedUser()) {
+ Ref r = refs.get(RefNames.refsUsers(user.get().getAccountId()));
if (r != null) {
SymbolicRef s = new SymbolicRef(REFS_USERS_SELF, r);
refs = new HashMap<>(refs);
@@ -241,8 +256,8 @@
Project project = projectCtl.getProject();
try {
Map<Change.Id, Branch.NameKey> visibleChanges = new HashMap<>();
- for (ChangeData cd : changeCache.getChangeData(reviewDb, project.getNameKey())) {
- if (projectCtl.controlForIndexedChange(cd.change()).isVisible(reviewDb, cd)) {
+ for (ChangeData cd : changeCache.getChangeData(db.get(), project.getNameKey())) {
+ if (projectCtl.controlForIndexedChange(cd.change()).isVisible(db.get(), cd)) {
visibleChanges.put(cd.getId(), cd.change().getDest());
}
}
@@ -261,8 +276,8 @@
Project.NameKey project = projectCtl.getProject().getNameKey();
try {
Map<Change.Id, Branch.NameKey> visibleChanges = new HashMap<>();
- for (ChangeNotes cn : changeNotesFactory.scan(db, reviewDb, project)) {
- if (projectCtl.controlFor(cn).isVisible(reviewDb)) {
+ for (ChangeNotes cn : changeNotesFactory.scan(git, db.get(), project)) {
+ if (projectCtl.controlFor(cn).isVisible(db.get())) {
visibleChanges.put(cn.getChangeId(), cn.getChange().getDest());
}
}
@@ -274,10 +289,10 @@
}
}
- private static boolean isMetadata(ProjectControl projectCtl, String name) {
+ private boolean isMetadata(String name) {
return name.startsWith(REFS_CHANGES)
|| RefNames.isRefsEdit(name)
- || (projectCtl.getProjectState().isAllUsers() && name.equals(RefNames.REFS_EXTERNAL_IDS));
+ || (projectState.isAllUsers() && name.equals(RefNames.REFS_EXTERNAL_IDS));
}
private static boolean isTag(Ref ref) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
index 9c08f4e..b5659ac 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
@@ -52,7 +52,7 @@
private final WorkQueue workQueue;
@Inject
- Lifecycle(final WorkQueue workQeueue) {
+ Lifecycle(WorkQueue workQeueue) {
this.workQueue = workQeueue;
}
@@ -82,7 +82,7 @@
}
};
- private Executor defaultQueue;
+ private ScheduledThreadPoolExecutor defaultQueue;
private int defaultQueueSize;
private final IdGenerator idGenerator;
private final CopyOnWriteArrayList<Executor> queues;
@@ -99,7 +99,7 @@
}
/** Get the default work queue, for miscellaneous tasks. */
- public synchronized Executor getDefaultQueue() {
+ public synchronized ScheduledThreadPoolExecutor getDefaultQueue() {
if (defaultQueue == null) {
defaultQueue = createQueue(defaultQueueSize, "WorkQueue");
}
@@ -107,7 +107,7 @@
}
/** Create a new executor queue. */
- public Executor createQueue(int poolsize, String prefix) {
+ public ScheduledThreadPoolExecutor createQueue(int poolsize, String prefix) {
final Executor r = new Executor(poolsize, prefix);
r.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
r.setExecuteExistingDelayedTasksAfterShutdownPolicy(true);
@@ -118,7 +118,7 @@
/** Get all of the tasks currently scheduled in any work queue. */
public List<Task<?>> getTasks() {
final List<Task<?>> r = new ArrayList<>();
- for (final Executor e : queues) {
+ for (Executor e : queues) {
e.addAllTo(r);
}
return r;
@@ -135,9 +135,9 @@
}
/** Locate a task by its unique id, null if no task matches. */
- public Task<?> getTask(final int id) {
+ public Task<?> getTask(int id) {
Task<?> result = null;
- for (final Executor e : queues) {
+ for (Executor e : queues) {
final Task<?> t = e.getTask(id);
if (t != null) {
if (result != null) {
@@ -150,7 +150,7 @@
return result;
}
- public Executor getExecutor(String queueName) {
+ public ScheduledThreadPoolExecutor getExecutor(String queueName) {
for (Executor e : queues) {
if (e.queueName.equals(queueName)) {
return e;
@@ -160,7 +160,7 @@
}
private void stop() {
- for (final Executor p : queues) {
+ for (Executor p : queues) {
p.shutdown();
boolean isTerminated;
do {
@@ -175,11 +175,11 @@
}
/** An isolated queue. */
- public class Executor extends ScheduledThreadPoolExecutor {
+ private class Executor extends ScheduledThreadPoolExecutor {
private final ConcurrentHashMap<Integer, Task<?>> all;
private final String queueName;
- Executor(int corePoolSize, final String prefix) {
+ Executor(int corePoolSize, String prefix) {
super(
corePoolSize,
new ThreadFactory() {
@@ -187,7 +187,7 @@
private final AtomicInteger tid = new AtomicInteger(1);
@Override
- public Thread newThread(final Runnable task) {
+ public Thread newThread(Runnable task) {
final Thread t = parent.newThread(task);
t.setName(prefix + "-" + tid.getAndIncrement());
t.setUncaughtExceptionHandler(LOG_UNCAUGHT_EXCEPTION);
@@ -212,7 +212,7 @@
@Override
protected <V> RunnableScheduledFuture<V> decorateTask(
- final Runnable runnable, RunnableScheduledFuture<V> r) {
+ Runnable runnable, RunnableScheduledFuture<V> r) {
r = super.decorateTask(runnable, r);
for (; ; ) {
final int id = idGenerator.next();
@@ -233,19 +233,19 @@
@Override
protected <V> RunnableScheduledFuture<V> decorateTask(
- final Callable<V> callable, final RunnableScheduledFuture<V> task) {
+ Callable<V> callable, RunnableScheduledFuture<V> task) {
throw new UnsupportedOperationException("Callable not implemented");
}
- void remove(final Task<?> task) {
+ void remove(Task<?> task) {
all.remove(task.getTaskId(), task);
}
- Task<?> getTask(final int id) {
+ Task<?> getTask(int id) {
return all.get(id);
}
- void addAllTo(final List<Task<?>> list) {
+ void addAllTo(List<Task<?>> list) {
list.addAll(all.values()); // iterator is thread safe
}
@@ -430,8 +430,8 @@
@Override
public String toString() {
- //This is a workaround to be able to print a proper name when the task
- //is wrapped into a TrustedListenableFutureTask.
+ // This is a workaround to be able to print a proper name when the task
+ // is wrapped into a TrustedListenableFutureTask.
try {
if (runnable
.getClass()
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationException.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationException.java
index 07f3b21..bffe382 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationException.java
@@ -22,6 +22,11 @@
private static final long serialVersionUID = 1L;
private final ImmutableList<CommitValidationMessage> messages;
+ public CommitValidationException(String reason, CommitValidationMessage message) {
+ super(reason);
+ this.messages = ImmutableList.of(message);
+ }
+
public CommitValidationException(String reason, List<CommitValidationMessage> messages) {
super(reason);
this.messages = ImmutableList.copyOf(messages);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
index c086f1c..ff755ea 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
@@ -26,6 +26,7 @@
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo.ConsistencyProblemInfo;
import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.GerritPersonIdent;
@@ -39,7 +40,11 @@
import com.google.gerrit.server.git.BanCommit;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.git.ValidationError;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.ProjectControl;
+import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.ssh.SshInfo;
import com.google.gerrit.server.util.MagicBranch;
@@ -96,38 +101,45 @@
}
public CommitValidators forReceiveCommits(
- RefControl refControl, SshInfo sshInfo, Repository repo, RevWalk rw) throws IOException {
+ PermissionBackend.ForRef perm,
+ RefControl refctl,
+ SshInfo sshInfo,
+ Repository repo,
+ RevWalk rw)
+ throws IOException {
NoteMap rejectCommits = BanCommit.loadRejectCommitsMap(repo, rw);
+ IdentifiedUser user = refctl.getUser().asIdentifiedUser();
return new CommitValidators(
ImmutableList.of(
- new UploadMergesPermissionValidator(refControl),
- new AmendedGerritMergeCommitValidationListener(refControl, gerritIdent),
- new AuthorUploaderValidator(refControl, canonicalWebUrl),
- new CommitterUploaderValidator(refControl, canonicalWebUrl),
- new SignedOffByValidator(refControl),
- new ChangeIdValidator(
- refControl, canonicalWebUrl, installCommitMsgHookCommand, sshInfo),
- new ConfigValidator(refControl, rw, allUsers),
+ new UploadMergesPermissionValidator(perm),
+ new AmendedGerritMergeCommitValidationListener(perm, gerritIdent),
+ new AuthorUploaderValidator(user, perm, canonicalWebUrl),
+ new CommitterUploaderValidator(user, perm, canonicalWebUrl),
+ new SignedOffByValidator(user, perm, refctl.getProjectControl().getProjectState()),
+ new ChangeIdValidator(refctl, canonicalWebUrl, installCommitMsgHookCommand, sshInfo),
+ new ConfigValidator(refctl, rw, allUsers),
new BannedCommitsValidator(rejectCommits),
new PluginCommitValidationListener(pluginValidators),
new ExternalIdUpdateListener(allUsers, externalIdsConsistencyChecker)));
}
- public CommitValidators forGerritCommits(RefControl refControl, SshInfo sshInfo, RevWalk rw) {
+ public CommitValidators forGerritCommits(
+ PermissionBackend.ForRef perm, RefControl refctl, SshInfo sshInfo, RevWalk rw) {
+ IdentifiedUser user = refctl.getUser().asIdentifiedUser();
return new CommitValidators(
ImmutableList.of(
- new UploadMergesPermissionValidator(refControl),
- new AmendedGerritMergeCommitValidationListener(refControl, gerritIdent),
- new AuthorUploaderValidator(refControl, canonicalWebUrl),
- new SignedOffByValidator(refControl),
- new ChangeIdValidator(
- refControl, canonicalWebUrl, installCommitMsgHookCommand, sshInfo),
- new ConfigValidator(refControl, rw, allUsers),
+ new UploadMergesPermissionValidator(perm),
+ new AmendedGerritMergeCommitValidationListener(perm, gerritIdent),
+ new AuthorUploaderValidator(user, perm, canonicalWebUrl),
+ new SignedOffByValidator(user, perm, refctl.getProjectControl().getProjectState()),
+ new ChangeIdValidator(refctl, canonicalWebUrl, installCommitMsgHookCommand, sshInfo),
+ new ConfigValidator(refctl, rw, allUsers),
new PluginCommitValidationListener(pluginValidators),
new ExternalIdUpdateListener(allUsers, externalIdsConsistencyChecker)));
}
- public CommitValidators forMergedCommits(RefControl refControl) {
+ public CommitValidators forMergedCommits(PermissionBackend.ForRef perm, RefControl refControl) {
+ IdentifiedUser user = refControl.getUser().asIdentifiedUser();
// Generally only include validators that are based on permissions of the
// user creating a change for a merged commit; generally exclude
// validators that would require amending the change in order to correct.
@@ -143,9 +155,9 @@
// formats, so we play it safe and exclude them.
return new CommitValidators(
ImmutableList.of(
- new UploadMergesPermissionValidator(refControl),
- new AuthorUploaderValidator(refControl, canonicalWebUrl),
- new CommitterUploaderValidator(refControl, canonicalWebUrl)));
+ new UploadMergesPermissionValidator(perm),
+ new AuthorUploaderValidator(user, perm, canonicalWebUrl),
+ new CommitterUploaderValidator(user, perm, canonicalWebUrl)));
}
}
@@ -251,8 +263,7 @@
|| NEW_PATCHSET.matcher(event.command.getRefName()).matches();
}
- private CommitValidationMessage getMissingChangeIdErrorMsg(
- final String errMsg, final RevCommit c) {
+ private CommitValidationMessage getMissingChangeIdErrorMsg(String errMsg, RevCommit c) {
StringBuilder sb = new StringBuilder();
sb.append("ERROR: ").append(errMsg);
@@ -396,21 +407,29 @@
}
}
- /** Require permission to upload merges. */
+ /** Require permission to upload merge commits. */
public static class UploadMergesPermissionValidator implements CommitValidationListener {
- private final RefControl refControl;
+ private final PermissionBackend.ForRef perm;
- public UploadMergesPermissionValidator(RefControl refControl) {
- this.refControl = refControl;
+ public UploadMergesPermissionValidator(PermissionBackend.ForRef perm) {
+ this.perm = perm;
}
@Override
public List<CommitValidationMessage> onCommitReceived(CommitReceivedEvent receiveEvent)
throws CommitValidationException {
- if (receiveEvent.commit.getParentCount() > 1 && !refControl.canUploadMerges()) {
- throw new CommitValidationException("you are not allowed to upload merges");
+ if (receiveEvent.commit.getParentCount() <= 1) {
+ return Collections.emptyList();
}
- return Collections.emptyList();
+ try {
+ perm.check(RefPermission.MERGE);
+ return Collections.emptyList();
+ } catch (AuthException e) {
+ throw new CommitValidationException("you are not allowed to upload merges");
+ } catch (PermissionBackendException e) {
+ log.error("cannot check MERGE", e);
+ throw new CommitValidationException("internal auth error");
+ }
}
}
@@ -441,37 +460,50 @@
}
public static class SignedOffByValidator implements CommitValidationListener {
- private final RefControl refControl;
+ private final IdentifiedUser user;
+ private final PermissionBackend.ForRef perm;
+ private final ProjectState state;
- public SignedOffByValidator(RefControl refControl) {
- this.refControl = refControl;
+ public SignedOffByValidator(
+ IdentifiedUser user, PermissionBackend.ForRef perm, ProjectState state) {
+ this.user = user;
+ this.perm = perm;
+ this.state = state;
}
@Override
public List<CommitValidationMessage> onCommitReceived(CommitReceivedEvent receiveEvent)
throws CommitValidationException {
- IdentifiedUser currentUser = refControl.getUser().asIdentifiedUser();
- final PersonIdent committer = receiveEvent.commit.getCommitterIdent();
- final PersonIdent author = receiveEvent.commit.getAuthorIdent();
- final ProjectControl projectControl = refControl.getProjectControl();
+ if (!state.isUseSignedOffBy()) {
+ return Collections.emptyList();
+ }
- if (projectControl.getProjectState().isUseSignedOffBy()) {
- boolean sboAuthor = false;
- boolean sboCommitter = false;
- boolean sboMe = false;
- for (final FooterLine footer : receiveEvent.commit.getFooterLines()) {
- if (footer.matches(FooterKey.SIGNED_OFF_BY)) {
- final String e = footer.getEmailAddress();
- if (e != null) {
- sboAuthor |= author.getEmailAddress().equals(e);
- sboCommitter |= committer.getEmailAddress().equals(e);
- sboMe |= currentUser.hasEmailAddress(e);
- }
+ RevCommit commit = receiveEvent.commit;
+ PersonIdent committer = commit.getCommitterIdent();
+ PersonIdent author = commit.getAuthorIdent();
+
+ boolean sboAuthor = false;
+ boolean sboCommitter = false;
+ boolean sboMe = false;
+ for (FooterLine footer : commit.getFooterLines()) {
+ if (footer.matches(FooterKey.SIGNED_OFF_BY)) {
+ String e = footer.getEmailAddress();
+ if (e != null) {
+ sboAuthor |= author.getEmailAddress().equals(e);
+ sboCommitter |= committer.getEmailAddress().equals(e);
+ sboMe |= user.hasEmailAddress(e);
}
}
- if (!sboAuthor && !sboCommitter && !sboMe && !refControl.canForgeCommitter()) {
+ }
+ if (!sboAuthor && !sboCommitter && !sboMe) {
+ try {
+ perm.check(RefPermission.FORGE_COMMITTER);
+ } catch (AuthException denied) {
throw new CommitValidationException(
"not Signed-off-by author/committer/uploader in commit message footer");
+ } catch (PermissionBackendException e) {
+ log.error("cannot check FORGE_COMMITTER", e);
+ throw new CommitValidationException("internal auth error");
}
}
return Collections.emptyList();
@@ -480,56 +512,69 @@
/** Require that author matches the uploader. */
public static class AuthorUploaderValidator implements CommitValidationListener {
- private final RefControl refControl;
+ private final IdentifiedUser user;
+ private final PermissionBackend.ForRef perm;
private final String canonicalWebUrl;
- public AuthorUploaderValidator(RefControl refControl, String canonicalWebUrl) {
- this.refControl = refControl;
+ public AuthorUploaderValidator(
+ IdentifiedUser user, PermissionBackend.ForRef perm, String canonicalWebUrl) {
+ this.user = user;
+ this.perm = perm;
this.canonicalWebUrl = canonicalWebUrl;
}
@Override
public List<CommitValidationMessage> onCommitReceived(CommitReceivedEvent receiveEvent)
throws CommitValidationException {
- IdentifiedUser currentUser = refControl.getUser().asIdentifiedUser();
- final PersonIdent author = receiveEvent.commit.getAuthorIdent();
-
- if (!currentUser.hasEmailAddress(author.getEmailAddress()) && !refControl.canForgeAuthor()) {
- List<CommitValidationMessage> messages = new ArrayList<>();
-
- messages.add(
- getInvalidEmailError(
- receiveEvent.commit, "author", author, currentUser, canonicalWebUrl));
- throw new CommitValidationException("invalid author", messages);
+ PersonIdent author = receiveEvent.commit.getAuthorIdent();
+ if (user.hasEmailAddress(author.getEmailAddress())) {
+ return Collections.emptyList();
}
- return Collections.emptyList();
+ try {
+ perm.check(RefPermission.FORGE_AUTHOR);
+ return Collections.emptyList();
+ } catch (AuthException e) {
+ throw new CommitValidationException(
+ "invalid author",
+ invalidEmail(receiveEvent.commit, "author", author, user, canonicalWebUrl));
+ } catch (PermissionBackendException e) {
+ log.error("cannot check FORGE_AUTHOR", e);
+ throw new CommitValidationException("internal auth error");
+ }
}
}
/** Require that committer matches the uploader. */
public static class CommitterUploaderValidator implements CommitValidationListener {
- private final RefControl refControl;
+ private final IdentifiedUser user;
+ private final PermissionBackend.ForRef perm;
private final String canonicalWebUrl;
- public CommitterUploaderValidator(RefControl refControl, String canonicalWebUrl) {
- this.refControl = refControl;
+ public CommitterUploaderValidator(
+ IdentifiedUser user, PermissionBackend.ForRef perm, String canonicalWebUrl) {
+ this.user = user;
+ this.perm = perm;
this.canonicalWebUrl = canonicalWebUrl;
}
@Override
public List<CommitValidationMessage> onCommitReceived(CommitReceivedEvent receiveEvent)
throws CommitValidationException {
- IdentifiedUser currentUser = refControl.getUser().asIdentifiedUser();
- final PersonIdent committer = receiveEvent.commit.getCommitterIdent();
- if (!currentUser.hasEmailAddress(committer.getEmailAddress())
- && !refControl.canForgeCommitter()) {
- List<CommitValidationMessage> messages = new ArrayList<>();
- messages.add(
- getInvalidEmailError(
- receiveEvent.commit, "committer", committer, currentUser, canonicalWebUrl));
- throw new CommitValidationException("invalid committer", messages);
+ PersonIdent committer = receiveEvent.commit.getCommitterIdent();
+ if (user.hasEmailAddress(committer.getEmailAddress())) {
+ return Collections.emptyList();
}
- return Collections.emptyList();
+ try {
+ perm.check(RefPermission.FORGE_COMMITTER);
+ return Collections.emptyList();
+ } catch (AuthException e) {
+ throw new CommitValidationException(
+ "invalid committer",
+ invalidEmail(receiveEvent.commit, "committer", committer, user, canonicalWebUrl));
+ } catch (PermissionBackendException e) {
+ log.error("cannot check FORGE_COMMITTER", e);
+ throw new CommitValidationException("internal auth error");
+ }
}
}
@@ -539,25 +584,30 @@
*/
public static class AmendedGerritMergeCommitValidationListener
implements CommitValidationListener {
+ private final PermissionBackend.ForRef perm;
private final PersonIdent gerritIdent;
- private final RefControl refControl;
public AmendedGerritMergeCommitValidationListener(
- final RefControl refControl, final PersonIdent gerritIdent) {
- this.refControl = refControl;
+ PermissionBackend.ForRef perm, PersonIdent gerritIdent) {
+ this.perm = perm;
this.gerritIdent = gerritIdent;
}
@Override
public List<CommitValidationMessage> onCommitReceived(CommitReceivedEvent receiveEvent)
throws CommitValidationException {
- final PersonIdent author = receiveEvent.commit.getAuthorIdent();
-
+ PersonIdent author = receiveEvent.commit.getAuthorIdent();
if (receiveEvent.commit.getParentCount() > 1
&& author.getName().equals(gerritIdent.getName())
- && author.getEmailAddress().equals(gerritIdent.getEmailAddress())
- && !refControl.canForgeGerritServerIdentity()) {
- throw new CommitValidationException("do not amend merges not made by you");
+ && author.getEmailAddress().equals(gerritIdent.getEmailAddress())) {
+ try {
+ perm.check(RefPermission.FORGE_SERVER);
+ } catch (AuthException denied) {
+ throw new CommitValidationException("do not amend merges not made by you");
+ } catch (PermissionBackendException e) {
+ log.error("cannot check FORGE_SERVER", e);
+ throw new CommitValidationException("internal auth error");
+ }
}
return Collections.emptyList();
}
@@ -629,7 +679,7 @@
}
}
- private static CommitValidationMessage getInvalidEmailError(
+ private static CommitValidationMessage invalidEmail(
RevCommit c,
String type,
PersonIdent who,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
index f88460b..ce287d0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
@@ -123,7 +123,7 @@
public void onDeleteGroupsFromGroup(Account.Id me, Collection<AccountGroupById> removed) {
final List<AccountGroupByIdAud> auditUpdates = new ArrayList<>();
try (ReviewDb db = schema.open()) {
- for (final AccountGroupById g : removed) {
+ for (AccountGroupById g : removed) {
AccountGroupByIdAud audit = null;
for (AccountGroupByIdAud a :
db.accountGroupByIdAud().byGroupInclude(g.getGroupId(), g.getIncludeUUID())) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java
index 9f612bf..1e1008c7a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java
@@ -75,7 +75,7 @@
getIncludedGroups(internalGroup.getId());
final List<AccountGroupById> toRemove = new ArrayList<>();
- for (final String includedGroup : input.groups) {
+ for (String includedGroup : input.groups) {
GroupDescription.Basic d = groupsCollection.parse(includedGroup);
if (!control.canRemoveGroup()) {
throw new AuthException(String.format("Cannot delete group: %s", d.getName()));
@@ -90,7 +90,7 @@
if (!toRemove.isEmpty()) {
writeAudits(toRemove);
db.get().accountGroupById().delete(toRemove);
- for (final AccountGroupById g : toRemove) {
+ for (AccountGroupById g : toRemove) {
groupIncludeCache.evictParentGroupsOf(g.getIncludeUUID());
}
groupIncludeCache.evictSubgroupsOf(internalGroup.getGroupUUID());
@@ -99,7 +99,7 @@
return Response.none();
}
- private Map<AccountGroup.UUID, AccountGroupById> getIncludedGroups(final AccountGroup.Id groupId)
+ private Map<AccountGroup.UUID, AccountGroupById> getIncludedGroups(AccountGroup.Id groupId)
throws OrmException {
final Map<AccountGroup.UUID, AccountGroupById> groups = new HashMap<>();
for (AccountGroupById g : db.get().accountGroupById().byGroup(groupId)) {
@@ -108,7 +108,7 @@
return groups;
}
- private void writeAudits(final List<AccountGroupById> toRemoved) {
+ private void writeAudits(List<AccountGroupById> toRemoved) {
final Account.Id me = self.get().getAccountId();
auditService.dispatchDeleteGroupsFromGroup(me, toRemoved);
}
@@ -121,7 +121,7 @@
private final Provider<DeleteIncludedGroups> delete;
@Inject
- DeleteIncludedGroup(final Provider<DeleteIncludedGroups> delete) {
+ DeleteIncludedGroup(Provider<DeleteIncludedGroups> delete) {
this.delete = delete;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java
index e365ce3..d9b1c3d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java
@@ -75,7 +75,7 @@
final Map<Account.Id, AccountGroupMember> members = getMembers(internalGroup.getId());
final List<AccountGroupMember> toRemove = new ArrayList<>();
- for (final String nameOrEmail : input.members) {
+ for (String nameOrEmail : input.members) {
Account a = accounts.parse(nameOrEmail).getAccount();
if (!control.canRemoveMember()) {
@@ -90,22 +90,22 @@
writeAudits(toRemove);
db.get().accountGroupMembers().delete(toRemove);
- for (final AccountGroupMember m : toRemove) {
+ for (AccountGroupMember m : toRemove) {
accountCache.evict(m.getAccountId());
}
return Response.none();
}
- private void writeAudits(final List<AccountGroupMember> toRemove) {
+ private void writeAudits(List<AccountGroupMember> toRemove) {
final Account.Id me = self.get().getAccountId();
auditService.dispatchDeleteAccountsFromGroup(me, toRemove);
}
- private Map<Account.Id, AccountGroupMember> getMembers(final AccountGroup.Id groupId)
+ private Map<Account.Id, AccountGroupMember> getMembers(AccountGroup.Id groupId)
throws OrmException {
final Map<Account.Id, AccountGroupMember> members = new HashMap<>();
- for (final AccountGroupMember m : db.get().accountGroupMembers().byGroup(groupId)) {
+ for (AccountGroupMember m : db.get().accountGroupMembers().byGroup(groupId)) {
members.put(m.getAccountId(), m);
}
return members;
@@ -118,7 +118,7 @@
private final Provider<DeleteMembers> delete;
@Inject
- DeleteMember(final Provider<DeleteMembers> delete) {
+ DeleteMember(Provider<DeleteMembers> delete) {
this.delete = delete;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
index 5e3110c..d32afa2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
@@ -253,9 +253,9 @@
List<AccountGroup> groupList;
if (!projects.isEmpty()) {
Map<AccountGroup.UUID, AccountGroup> groups = new HashMap<>();
- for (final ProjectControl projectControl : projects) {
+ for (ProjectControl projectControl : projects) {
final Set<GroupReference> groupsRefs = projectControl.getAllGroups();
- for (final GroupReference groupRef : groupsRefs) {
+ for (GroupReference groupRef : groupsRefs) {
final AccountGroup group = groupCache.get(groupRef.getUUID());
if (group != null) {
groups.put(group.getGroupUUID(), group);
@@ -294,7 +294,7 @@
limit <= 0 ? 10 : Math.min(limit, 10)));
List<GroupInfo> groupInfos = Lists.newArrayListWithCapacity(groupRefs.size());
- for (final GroupReference ref : groupRefs) {
+ for (GroupReference ref : groupRefs) {
GroupDescription.Basic desc = groupBackend.get(ref.getUUID());
if (desc != null) {
groupInfos.add(json.addOptions(options).format(desc));
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java
index 8e2c925..b24d094 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java
@@ -61,7 +61,7 @@
}
@Override
- public List<AccountInfo> apply(final GroupResource resource)
+ public List<AccountInfo> apply(GroupResource resource)
throws MethodNotAllowedException, OrmException {
if (resource.toAccountGroup() == null) {
throw new MethodNotAllowedException();
@@ -83,7 +83,7 @@
}
private Map<Account.Id, AccountInfo> getMembers(
- final AccountGroup.UUID groupUUID, final HashSet<AccountGroup.UUID> seenGroups)
+ final AccountGroup.UUID groupUUID, HashSet<AccountGroup.UUID> seenGroups)
throws OrmException {
seenGroups.add(groupUUID);
@@ -103,7 +103,7 @@
}
if (groupDetail.members != null) {
- for (final AccountGroupMember m : groupDetail.members) {
+ for (AccountGroupMember m : groupDetail.members) {
if (!members.containsKey(m.getAccountId())) {
members.put(m.getAccountId(), accountLoader.get(m.getAccountId()));
}
@@ -112,7 +112,7 @@
if (recursive) {
if (groupDetail.includes != null) {
- for (final AccountGroupById includedGroup : groupDetail.includes) {
+ for (AccountGroupById includedGroup : groupDetail.includes) {
if (!seenGroups.contains(includedGroup.getIncludeUUID())) {
members.putAll(getMembers(includedGroup.getIncludeUUID(), seenGroups));
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java
index 5e06242..0fae9c9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java
@@ -176,7 +176,7 @@
* @param fillArgs arguments for filling fields.
* @return all non-null field values from the object.
*/
- public final Iterable<Values<T>> buildFields(final T obj, final FillArgs fillArgs) {
+ public final Iterable<Values<T>> buildFields(T obj, FillArgs fillArgs) {
return FluentIterable.from(fields.values())
.transform(
new Function<FieldDef<T, ?>, Values<T>>() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java
index 47a8cad..a8cc8aa 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java
@@ -59,7 +59,7 @@
}
@Override
- public SiteIndexer.Result indexAll(final AccountIndex index) {
+ public SiteIndexer.Result indexAll(AccountIndex index) {
ProgressMonitor progress = new TextProgressMonitor(new PrintWriter(progressOut));
progress.start(2);
Stopwatch sw = Stopwatch.createStarted();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
index 638ff4c..40c37d19 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
@@ -152,7 +152,7 @@
final List<ListenableFuture<?>> futures = new ArrayList<>();
final AtomicBoolean ok = new AtomicBoolean(true);
- for (final ProjectHolder project : projects) {
+ for (ProjectHolder project : projects) {
ListenableFuture<?> future =
executor.submit(
reindexProject(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java
index 5f77877..c7f2ecd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java
@@ -41,7 +41,7 @@
public class BasicSerialization {
private static final byte[] NO_BYTES = {};
- private static int safeRead(final InputStream input) throws IOException {
+ private static int safeRead(InputStream input) throws IOException {
final int b = input.read();
if (b == -1) {
throw new EOFException();
@@ -50,20 +50,20 @@
}
/** Read a fixed-width 64 bit integer in network byte order (big-endian). */
- public static long readFixInt64(final InputStream input) throws IOException {
+ public static long readFixInt64(InputStream input) throws IOException {
final long h = readFixInt32(input);
final long l = readFixInt32(input) & 0xFFFFFFFFL;
return (h << 32) | l;
}
/** Write a fixed-width 64 bit integer in network byte order (big-endian). */
- public static void writeFixInt64(final OutputStream output, final long val) throws IOException {
+ public static void writeFixInt64(OutputStream output, long val) throws IOException {
writeFixInt32(output, (int) (val >>> 32));
writeFixInt32(output, (int) (val & 0xFFFFFFFFL));
}
/** Read a fixed-width 32 bit integer in network byte order (big-endian). */
- public static int readFixInt32(final InputStream input) throws IOException {
+ public static int readFixInt32(InputStream input) throws IOException {
final int b1 = safeRead(input);
final int b2 = safeRead(input);
final int b3 = safeRead(input);
@@ -72,7 +72,7 @@
}
/** Write a fixed-width 32 bit integer in network byte order (big-endian). */
- public static void writeFixInt32(final OutputStream output, final int val) throws IOException {
+ public static void writeFixInt32(OutputStream output, int val) throws IOException {
output.write((val >>> 24) & 0xFF);
output.write((val >>> 16) & 0xFF);
output.write((val >>> 8) & 0xFF);
@@ -80,7 +80,7 @@
}
/** Read a varint from the input, one byte at a time. */
- public static int readVarInt32(final InputStream input) throws IOException {
+ public static int readVarInt32(InputStream input) throws IOException {
int result = 0;
int offset = 0;
for (; offset < 32; offset += 7) {
@@ -94,7 +94,7 @@
}
/** Write a varint; value is treated as an unsigned value. */
- public static void writeVarInt32(final OutputStream output, int value) throws IOException {
+ public static void writeVarInt32(OutputStream output, int value) throws IOException {
while (true) {
if ((value & ~0x7F) == 0) {
output.write(value);
@@ -106,7 +106,7 @@
}
/** Read a fixed length byte array whose length is specified as a varint. */
- public static byte[] readBytes(final InputStream input) throws IOException {
+ public static byte[] readBytes(InputStream input) throws IOException {
final int len = readVarInt32(input);
if (len == 0) {
return NO_BYTES;
@@ -117,20 +117,19 @@
}
/** Write a byte array prefixed by its length in a varint. */
- public static void writeBytes(final OutputStream output, final byte[] data) throws IOException {
+ public static void writeBytes(OutputStream output, byte[] data) throws IOException {
writeBytes(output, data, 0, data.length);
}
/** Write a byte array prefixed by its length in a varint. */
- public static void writeBytes(
- final OutputStream output, final byte[] data, final int offset, final int len)
+ public static void writeBytes(final OutputStream output, byte[] data, int offset, int len)
throws IOException {
writeVarInt32(output, len);
output.write(data, offset, len);
}
/** Read a UTF-8 string, prefixed by its byte length in a varint. */
- public static String readString(final InputStream input) throws IOException {
+ public static String readString(InputStream input) throws IOException {
final byte[] bin = readBytes(input);
if (bin.length == 0) {
return null;
@@ -139,7 +138,7 @@
}
/** Write a UTF-8 string, prefixed by its byte length in a varint. */
- public static void writeString(final OutputStream output, final String s) throws IOException {
+ public static void writeString(OutputStream output, String s) throws IOException {
if (s == null) {
writeVarInt32(output, 0);
} else {
@@ -148,8 +147,7 @@
}
/** Read an enum whose code is stored as a varint. */
- public static <T extends CodedEnum> T readEnum(final InputStream input, final T[] all)
- throws IOException {
+ public static <T extends CodedEnum> T readEnum(InputStream input, T[] all) throws IOException {
final int val = readVarInt32(input);
for (T t : all) {
if (t.getCode() == val) {
@@ -160,8 +158,7 @@
}
/** Write an enum whose code is stored as a varint. */
- public static <T extends CodedEnum> void writeEnum(final OutputStream output, final T e)
- throws IOException {
+ public static <T extends CodedEnum> void writeEnum(OutputStream output, T e) throws IOException {
writeVarInt32(output, e.getCode());
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
index c96e808..10ad33b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
@@ -33,7 +33,7 @@
* output. As only non-printable characters in the column text are ever escaped, the column
* separator must be a non-printable character if the output needs to be unambiguously parsed.
*/
- public ColumnFormatter(final PrintWriter out, final char columnSeparator) {
+ public ColumnFormatter(PrintWriter out, char columnSeparator) {
this.out = out;
this.columnSeparator = columnSeparator;
this.firstColumn = true;
@@ -45,7 +45,7 @@
*
* @param content the string to add.
*/
- public void addColumn(final String content) {
+ public void addColumn(String content) {
if (!firstColumn) {
out.print(columnSeparator);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java
index 7f3ac01..e91f3f3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java
@@ -17,7 +17,7 @@
import com.google.gerrit.server.mail.send.EmailHeader;
public class Address {
- public static Address parse(final String in) {
+ public static Address parse(String in) {
final int lt = in.indexOf('<');
final int gt = in.indexOf('>');
final int at = in.indexOf("@");
@@ -110,7 +110,7 @@
return true;
}
- private static String quotedPhrase(final String name) {
+ private static String quotedPhrase(String name) {
if (EmailHeader.needsQuotedPrintable(name)) {
return EmailHeader.quotedPrintable(name);
}
@@ -123,7 +123,7 @@
return name;
}
- private static String wrapInQuotes(final String name) {
+ private static String wrapInQuotes(String name) {
final StringBuilder r = new StringBuilder(2 + name.length());
r.append('"');
for (int i = 0; i < name.length(); i++) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java
index b6d7fa8..5dae659 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java
@@ -78,7 +78,7 @@
return a.getId();
}
- private static boolean isReviewer(final FooterLine candidateFooterLine) {
+ private static boolean isReviewer(FooterLine candidateFooterLine) {
return candidateFooterLine.matches(FooterKey.SIGNED_OFF_BY)
|| candidateFooterLine.matches(FooterKey.ACKED_BY)
|| candidateFooterLine.matches(FooterConstants.REVIEWED_BY)
@@ -94,17 +94,17 @@
this.cc = new HashSet<>();
}
- public MailRecipients(final Set<Account.Id> reviewers, final Set<Account.Id> cc) {
+ public MailRecipients(Set<Account.Id> reviewers, Set<Account.Id> cc) {
this.reviewers = new HashSet<>(reviewers);
this.cc = new HashSet<>(cc);
}
- public void add(final MailRecipients recipients) {
+ public void add(MailRecipients recipients) {
reviewers.addAll(recipients.reviewers);
cc.addAll(recipients.cc);
}
- public void remove(final Account.Id toRemove) {
+ public void remove(Account.Id toRemove) {
reviewers.remove(toRemove);
cc.remove(toRemove);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java
index b9ade64..f0ff6c3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java
@@ -90,7 +90,7 @@
}
@Override
- public void setFrom(final Account.Id id) {
+ public void setFrom(Account.Id id) {
super.setFrom(id);
/** Is the from user in an email squelching group? */
@@ -98,17 +98,17 @@
emailOnlyAuthors = !user.getCapabilities().canEmailReviewers();
}
- public void setPatchSet(final PatchSet ps) {
+ public void setPatchSet(PatchSet ps) {
patchSet = ps;
}
- public void setPatchSet(final PatchSet ps, final PatchSetInfo psi) {
+ public void setPatchSet(PatchSet ps, PatchSetInfo psi) {
patchSet = ps;
patchSetInfo = psi;
}
@Deprecated
- public void setChangeMessage(final ChangeMessage cm) {
+ public void setChangeMessage(ChangeMessage cm) {
setChangeMessage(cm.getMessage(), cm.getWrittenOn());
}
@@ -319,8 +319,8 @@
}
/** TO or CC all vested parties (change owner, patch set uploader, author). */
- protected void rcptToAuthors(final RecipientType rt) {
- for (final Account.Id id : authors) {
+ protected void rcptToAuthors(RecipientType rt) {
+ for (Account.Id id : authors) {
add(rt, id);
}
}
@@ -391,14 +391,14 @@
}
@Override
- protected void add(final RecipientType rt, final Account.Id to) {
+ protected void add(RecipientType rt, Account.Id to) {
if (!emailOnlyAuthors || authors.contains(to)) {
super.add(rt, to);
}
}
@Override
- protected boolean isVisibleTo(final Account.Id to) throws OrmException {
+ protected boolean isVisibleTo(Account.Id to) throws OrmException {
return projectState == null
|| projectState
.controlFor(args.identifiedUserFactory.create(to))
@@ -426,7 +426,7 @@
authors.add(patchSetInfo.getCommitter().getAccount());
}
}
- //$FALL-THROUGH$
+ // $FALL-THROUGH$
case OWNER_REVIEWERS:
case OWNER:
authors.add(change.getOwner());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java
index e2b5894..0bfe428 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java
@@ -83,7 +83,7 @@
return false;
}
- static boolean needsQuotedPrintableWithinPhrase(final int cp) {
+ static boolean needsQuotedPrintableWithinPhrase(int cp) {
switch (cp) {
case '!':
case '*':
@@ -202,7 +202,7 @@
int len = 8;
boolean firstAddress = true;
boolean needComma = false;
- for (final Address addr : list) {
+ for (Address addr : list) {
java.lang.String s = addr.toHeaderString();
if (firstAddress) {
firstAddress = false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java
index db52626..c2c6834 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java
@@ -41,11 +41,10 @@
@Inject
FromAddressGeneratorProvider(
- @GerritServerConfig final Config cfg,
- @AnonymousCowardName final String anonymousCowardName,
- @GerritPersonIdent final PersonIdent myIdent,
- final AccountCache accountCache) {
-
+ @GerritServerConfig Config cfg,
+ @AnonymousCowardName String anonymousCowardName,
+ @GerritPersonIdent PersonIdent myIdent,
+ AccountCache accountCache) {
final String from = cfg.getString("sendemail", null, "from");
final Address srvAddr = toAddress(myIdent);
@@ -73,7 +72,7 @@
}
}
- private static Address toAddress(final PersonIdent myIdent) {
+ private static Address toAddress(PersonIdent myIdent) {
return new Address(myIdent.getName(), myIdent.getEmailAddress());
}
@@ -119,7 +118,7 @@
}
@Override
- public Address from(final Account.Id fromId) {
+ public Address from(Account.Id fromId) {
String senderName;
if (fromId != null) {
Account a = accountCache.get(fromId).getAccount();
@@ -172,7 +171,7 @@
}
@Override
- public Address from(final Account.Id fromId) {
+ public Address from(Account.Id fromId) {
return srvAddr;
}
}
@@ -203,7 +202,7 @@
}
@Override
- public Address from(final Account.Id fromId) {
+ public Address from(Account.Id fromId) {
final String senderName;
if (fromId != null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NewChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NewChangeSender.java
index 3f6d991..9c559bf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NewChangeSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NewChangeSender.java
@@ -37,19 +37,19 @@
super(ea, "newchange", cd);
}
- public void addReviewers(final Collection<Account.Id> cc) {
+ public void addReviewers(Collection<Account.Id> cc) {
reviewers.addAll(cc);
}
- public void addReviewersByEmail(final Collection<Address> cc) {
+ public void addReviewersByEmail(Collection<Address> cc) {
reviewersByEmail.addAll(cc);
}
- public void addExtraCC(final Collection<Account.Id> cc) {
+ public void addExtraCC(Collection<Account.Id> cc) {
extraCC.addAll(cc);
}
- public void addExtraCCByEmail(final Collection<Address> cc) {
+ public void addExtraCCByEmail(Collection<Address> cc) {
extraCCByEmail.addAll(cc);
}
@@ -67,7 +67,7 @@
default:
add(RecipientType.CC, extraCC);
extraCCByEmail.stream().forEach(cc -> add(RecipientType.CC, cc));
- //$FALL-THROUGH$
+ // $FALL-THROUGH$
case OWNER_REVIEWERS:
add(RecipientType.TO, reviewers);
addByEmail(RecipientType.TO, reviewersByEmail);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
index c2ae0bc..7931ab5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
@@ -91,7 +91,7 @@
headers = new LinkedHashMap<>();
}
- public void setFrom(final Account.Id id) {
+ public void setFrom(Account.Id id) {
fromId = id;
}
@@ -309,26 +309,26 @@
}
/** Set a header in the outgoing message using a template. */
- protected void setVHeader(final String name, final String value) throws EmailException {
+ protected void setVHeader(String name, String value) throws EmailException {
setHeader(name, velocify(value));
}
/** Set a header in the outgoing message. */
- protected void setHeader(final String name, final String value) {
+ protected void setHeader(String name, String value) {
headers.put(name, new EmailHeader.String(value));
}
/** Remove a header from the outgoing message. */
- protected void removeHeader(final String name) {
+ protected void removeHeader(String name) {
headers.remove(name);
}
- protected void setHeader(final String name, final Date date) {
+ protected void setHeader(String name, Date date) {
headers.put(name, new EmailHeader.Date(date));
}
/** Append text to the outgoing email body. */
- protected void appendText(final String text) {
+ protected void appendText(String text) {
if (text != null) {
textBody.append(text);
}
@@ -342,7 +342,7 @@
}
/** Lookup a human readable name for an account, usually the "full name". */
- protected String getNameFor(final Account.Id accountId) {
+ protected String getNameFor(Account.Id accountId) {
if (accountId == null) {
return args.gerritPersonIdent.getName();
}
@@ -435,27 +435,27 @@
}
/** Schedule this message for delivery to the listed accounts. */
- protected void add(final RecipientType rt, final Collection<Account.Id> list) {
- for (final Account.Id id : list) {
+ protected void add(RecipientType rt, Collection<Account.Id> list) {
+ for (Account.Id id : list) {
add(rt, id);
}
}
/** Schedule this message for delivery to the listed address. */
- protected void addByEmail(final RecipientType rt, final Collection<Address> list) {
- for (final Address id : list) {
+ protected void addByEmail(RecipientType rt, Collection<Address> list) {
+ for (Address id : list) {
add(rt, id);
}
}
- protected void add(final RecipientType rt, final UserIdentity who) {
+ protected void add(RecipientType rt, UserIdentity who) {
if (who != null && who.getAccount() != null) {
add(rt, who.getAccount());
}
}
/** Schedule delivery of this message to the given account. */
- protected void add(final RecipientType rt, final Account.Id to) {
+ protected void add(RecipientType rt, Account.Id to) {
try {
if (!rcptTo.contains(to) && isVisibleTo(to)) {
rcptTo.add(to);
@@ -471,12 +471,12 @@
* @throws OrmException
* @return whether this email is visible to the given account.
*/
- protected boolean isVisibleTo(final Account.Id to) throws OrmException {
+ protected boolean isVisibleTo(Account.Id to) throws OrmException {
return true;
}
/** Schedule delivery of this message to the given account. */
- protected void add(final RecipientType rt, final Address addr) {
+ protected void add(RecipientType rt, Address addr) {
if (addr != null && addr.getEmail() != null && addr.getEmail().length() > 0) {
if (!args.validator.isValid(addr.getEmail())) {
log.warn("Not emailing " + addr.getEmail() + " (invalid email address)");
@@ -497,7 +497,7 @@
}
}
- private Address toAddress(final Account.Id id) {
+ private Address toAddress(Account.Id id) {
final Account a = args.accountCache.get(id).getAccount();
final String e = a.getPreferredEmail();
if (!a.isActive() || e == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java
index 1483e21..f0b61db 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java
@@ -45,11 +45,11 @@
super(ea, "newpatchset", newChangeData(ea, project, id));
}
- public void addReviewers(final Collection<Account.Id> cc) {
+ public void addReviewers(Collection<Account.Id> cc) {
reviewers.addAll(cc);
}
- public void addExtraCC(final Collection<Account.Id> cc) {
+ public void addExtraCC(Collection<Account.Id> cc) {
extraCC.addAll(cc);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java
index 80e6bb8..912b598 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java
@@ -74,7 +74,7 @@
private int expiryDays;
@Inject
- SmtpEmailSender(@GerritServerConfig final Config cfg) {
+ SmtpEmailSender(@GerritServerConfig Config cfg) {
enabled = cfg.getBoolean("sendemail", null, "enable", true);
connectTimeout =
Ints.checkedCast(
@@ -320,8 +320,7 @@
+ "--\r\n";
}
- private void setMissingHeader(
- final Map<String, EmailHeader> hdrs, final String name, final String value) {
+ private void setMissingHeader(final Map<String, EmailHeader> hdrs, String name, String value) {
if (!hdrs.containsKey(name) || hdrs.get(name).isEmpty()) {
hdrs.put(name, new EmailHeader.String(value));
}
@@ -365,7 +364,7 @@
try {
client.disconnect();
} catch (IOException e2) {
- //Ignored
+ // Ignored
}
}
if (e instanceof EmailException) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java
index 77ba79d..7cb34e2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java
@@ -79,7 +79,7 @@
@Override
@SuppressWarnings("unchecked")
- public MimeType getMimeType(final String path, final byte[] content) {
+ public MimeType getMimeType(String path, byte[] content) {
Set<MimeType> mimeTypes = new HashSet<>();
if (content != null && content.length > 0) {
try {
@@ -93,7 +93,7 @@
@Override
@SuppressWarnings("unchecked")
- public MimeType getMimeType(final String path, final InputStream is) {
+ public MimeType getMimeType(String path, InputStream is) {
Set<MimeType> mimeTypes = new HashSet<>();
try {
mimeTypes.addAll(mimeUtil.getMimeTypes(is));
@@ -104,7 +104,7 @@
}
@SuppressWarnings("unchecked")
- private MimeType getMimeType(Set<MimeType> mimeTypes, final String path) {
+ private MimeType getMimeType(Set<MimeType> mimeTypes, String path) {
try {
mimeTypes.addAll(mimeUtil.getMimeTypes(path));
} catch (MimeException e) {
@@ -128,7 +128,7 @@
}
@Override
- public boolean isSafeInline(final MimeType type) {
+ public boolean isSafeInline(MimeType type) {
if (MimeUtil2.UNKNOWN_MIME_TYPE.equals(type)) {
// Most browsers perform content type sniffing when they get told
// a generic content type. This is bad, so assume we cannot send
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java
index 74a3132..19568cf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java
@@ -77,7 +77,7 @@
public RevCommit merge(
Repository repo,
RevWalk rw,
- final ObjectInserter ins,
+ ObjectInserter ins,
RevCommit merge,
ThreeWayMergeStrategy mergeStrategy)
throws IOException {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryKey.java
index bfa7ec3..0a02e36 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryKey.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryKey.java
@@ -19,6 +19,7 @@
import static org.eclipse.jgit.lib.ObjectIdSerialization.writeCanBeNull;
import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull;
+import com.google.common.base.Preconditions;
import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -40,6 +41,7 @@
private transient Whitespace whitespace;
public static DiffSummaryKey fromPatchListKey(PatchListKey plk) {
+ Preconditions.checkArgument(plk.getAlgorithm() == PatchListKey.Algorithm.OPTIMIZED_DIFF);
return new DiffSummaryKey(
plk.getOldId(), plk.getParentNum(), plk.getNewId(), plk.getWhitespace());
}
@@ -52,7 +54,8 @@
}
PatchListKey toPatchListKey() {
- return new PatchListKey(oldId, parentNum, newId, whitespace);
+ return new PatchListKey(
+ oldId, parentNum, newId, whitespace, PatchListKey.Algorithm.OPTIMIZED_DIFF);
}
@Override
@@ -61,7 +64,7 @@
}
@Override
- public boolean equals(final Object o) {
+ public boolean equals(Object o) {
if (o instanceof DiffSummaryKey) {
DiffSummaryKey k = (DiffSummaryKey) o;
return Objects.equals(oldId, k.oldId)
@@ -89,7 +92,7 @@
return n.toString();
}
- private void writeObject(final ObjectOutputStream out) throws IOException {
+ private void writeObject(ObjectOutputStream out) throws IOException {
writeCanBeNull(out, oldId);
out.writeInt(parentNum == null ? 0 : parentNum);
writeNotNull(out, newId);
@@ -100,7 +103,7 @@
out.writeChar(c);
}
- private void readObject(final ObjectInputStream in) throws IOException {
+ private void readObject(ObjectInputStream in) throws IOException {
oldId = readCanBeNull(in);
int n = in.readInt();
parentNum = n == 0 ? null : Integer.valueOf(n);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
index 87fdd2a..ee8b88b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
@@ -78,7 +78,7 @@
return deepCopyEdits(edits);
}
- private void writeObject(final ObjectOutputStream out) throws IOException {
+ private void writeObject(ObjectOutputStream out) throws IOException {
writeEnum(out, status);
writeVarInt32(out, edits.size());
for (Edit e : edits) {
@@ -96,7 +96,7 @@
}
}
- private void readObject(final ObjectInputStream in) throws IOException {
+ private void readObject(ObjectInputStream in) throws IOException {
status = readEnum(in, Status.values());
int editCount = readVarInt32(in);
Edit[] editArray = new Edit[editCount];
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java
index b4c2fbe..aff519a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java
@@ -96,7 +96,7 @@
* @throws IOException the patch or complete file content cannot be read.
* @throws NoSuchEntityException
*/
- public String getLine(final int file, final int line) throws IOException, NoSuchEntityException {
+ public String getLine(int file, int line) throws IOException, NoSuchEntityException {
switch (file) {
case 0:
if (a == null) {
@@ -123,7 +123,7 @@
* @throws IOException the patch or complete file content cannot be read.
* @throws NoSuchEntityException the file is not exist.
*/
- public int getLineCount(final int file) throws IOException, NoSuchEntityException {
+ public int getLineCount(int file) throws IOException, NoSuchEntityException {
switch (file) {
case 0:
if (a == null) {
@@ -142,7 +142,7 @@
}
}
- private Text load(final ObjectId tree, final String path)
+ private Text load(ObjectId tree, String path)
throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException,
IOException {
if (path == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java
index 020c354..16ede58 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java
@@ -49,7 +49,7 @@
private static final Comparator<PatchListEntry> PATCH_CMP =
new Comparator<PatchListEntry>() {
@Override
- public int compare(final PatchListEntry a, final PatchListEntry b) {
+ public int compare(PatchListEntry a, PatchListEntry b) {
return comparePaths(a.getNewName(), b.getNewName());
}
};
@@ -151,26 +151,26 @@
* specified, but is a current legacy artifact of how the cache is keyed versus how the
* database is keyed.
*/
- public List<Patch> toPatchList(final PatchSet.Id setId) {
+ public List<Patch> toPatchList(PatchSet.Id setId) {
final ArrayList<Patch> r = new ArrayList<>(patches.length);
- for (final PatchListEntry e : patches) {
+ for (PatchListEntry e : patches) {
r.add(e.toPatch(setId));
}
return r;
}
/** Find an entry by name, returning an empty entry if not present. */
- public PatchListEntry get(final String fileName) {
+ public PatchListEntry get(String fileName) {
final int index = search(fileName);
return 0 <= index ? patches[index] : PatchListEntry.empty(fileName);
}
- private int search(final String fileName) {
+ private int search(String fileName) {
PatchListEntry want = PatchListEntry.empty(fileName);
return Arrays.binarySearch(patches, 0, patches.length, want, PATCH_CMP);
}
- private void writeObject(final ObjectOutputStream output) throws IOException {
+ private void writeObject(ObjectOutputStream output) throws IOException {
final ByteArrayOutputStream buf = new ByteArrayOutputStream();
try (DeflaterOutputStream out = new DeflaterOutputStream(buf)) {
writeCanBeNull(out, oldId);
@@ -187,7 +187,7 @@
writeBytes(output, buf.toByteArray());
}
- private void readObject(final ObjectInputStream input) throws IOException {
+ private void readObject(ObjectInputStream input) throws IOException {
final ByteArrayInputStream buf = new ByteArrayInputStream(readBytes(input));
try (InflaterInputStream in = new InflaterInputStream(buf)) {
oldId = readCanBeNull(in);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
index edff293..4a6e01f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
@@ -101,7 +101,9 @@
throws PatchListNotAvailableException {
try {
PatchList pl = fileCache.get(key, fileLoaderFactory.create(key, project));
- diffSummaryCache.put(DiffSummaryKey.fromPatchListKey(key), toDiffSummary(pl));
+ if (key.getAlgorithm() == PatchListKey.Algorithm.OPTIMIZED_DIFF) {
+ diffSummaryCache.put(DiffSummaryKey.fromPatchListKey(key), toDiffSummary(pl));
+ }
return pl;
} catch (ExecutionException e) {
PatchListLoader.log.warn("Error computing " + key, e);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java
index c1e45bd..96f66f6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java
@@ -48,7 +48,7 @@
public class PatchListEntry {
private static final byte[] EMPTY_HEADER = {};
- static PatchListEntry empty(final String fileName) {
+ static PatchListEntry empty(String fileName) {
return new PatchListEntry(
ChangeType.MODIFIED,
PatchType.UNIFIED,
@@ -159,6 +159,7 @@
size += stringSize(newName);
size += header.length;
size += (8 + 16 + 4 * 4) * edits.size();
+ size += (8 + 16 + 4 * 4) * editsDueToRebase.size();
return size;
}
@@ -223,7 +224,7 @@
return headerLines;
}
- Patch toPatch(final PatchSet.Id setId) {
+ Patch toPatch(PatchSet.Id setId) {
final Patch p = new Patch(new Patch.Key(setId, getNewName()));
p.setChangeType(getChangeType());
p.setPatchType(getPatchType());
@@ -299,7 +300,7 @@
return edits;
}
- private static byte[] compact(final FileHeader h) {
+ private static byte[] compact(FileHeader h) {
final int end = end(h);
if (h.getStartOffset() == 0 && end == h.getBuffer().length) {
return h.getBuffer();
@@ -310,7 +311,7 @@
return buf;
}
- private static int end(final FileHeader h) {
+ private static int end(FileHeader h) {
if (h instanceof CombinedFileHeader) {
return h.getEndOffset();
}
@@ -320,7 +321,7 @@
return h.getEndOffset();
}
- private static ChangeType toChangeType(final FileHeader hdr) {
+ private static ChangeType toChangeType(FileHeader hdr) {
switch (hdr.getChangeType()) {
case ADD:
return Patch.ChangeType.ADDED;
@@ -337,7 +338,7 @@
}
}
- private static PatchType toPatchType(final FileHeader hdr) {
+ private static PatchType toPatchType(FileHeader hdr) {
PatchType pt;
switch (hdr.getPatchType()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java
index a459c98..abf4d76 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java
@@ -32,7 +32,17 @@
import org.eclipse.jgit.lib.ObjectId;
public class PatchListKey implements Serializable {
- public static final long serialVersionUID = 25L;
+ public static final long serialVersionUID = 26L;
+
+ public enum Algorithm {
+ PURE_TREE_DIFF,
+ OPTIMIZED_DIFF
+ }
+
+ private static final ImmutableBiMap<Algorithm, Character> ALGORITHM_TYPES =
+ ImmutableBiMap.of(
+ Algorithm.PURE_TREE_DIFF, 'T',
+ Algorithm.OPTIMIZED_DIFF, 'O');
public static final ImmutableBiMap<Whitespace, Character> WHITESPACE_TYPES =
ImmutableBiMap.of(
@@ -43,14 +53,25 @@
static {
checkState(WHITESPACE_TYPES.size() == Whitespace.values().length);
+ checkState(ALGORITHM_TYPES.size() == Algorithm.values().length);
}
public static PatchListKey againstDefaultBase(AnyObjectId newId, Whitespace ws) {
- return new PatchListKey(null, newId, ws);
+ return new PatchListKey(null, newId, ws, Algorithm.OPTIMIZED_DIFF);
}
public static PatchListKey againstParentNum(int parentNum, AnyObjectId newId, Whitespace ws) {
- return new PatchListKey(parentNum, newId, ws);
+ return new PatchListKey(parentNum, newId, ws, Algorithm.OPTIMIZED_DIFF);
+ }
+
+ public static PatchListKey againstCommit(
+ AnyObjectId otherCommitId, AnyObjectId newId, Whitespace whitespace) {
+ return new PatchListKey(otherCommitId, newId, whitespace, Algorithm.OPTIMIZED_DIFF);
+ }
+
+ public static PatchListKey againstCommitWithPureTreeDiff(
+ AnyObjectId otherCommitId, AnyObjectId newId, Whitespace whitespace) {
+ return new PatchListKey(otherCommitId, newId, whitespace, Algorithm.PURE_TREE_DIFF);
}
/**
@@ -75,25 +96,34 @@
private transient ObjectId newId;
private transient Whitespace whitespace;
+ private transient Algorithm algorithm;
- public PatchListKey(AnyObjectId a, AnyObjectId b, Whitespace ws) {
+ private PatchListKey(AnyObjectId a, AnyObjectId b, Whitespace ws, Algorithm algorithm) {
oldId = a != null ? a.copy() : null;
newId = b.copy();
whitespace = ws;
+ this.algorithm = algorithm;
}
- private PatchListKey(int parentNum, AnyObjectId b, Whitespace ws) {
+ private PatchListKey(int parentNum, AnyObjectId b, Whitespace ws, Algorithm algorithm) {
this.parentNum = Integer.valueOf(parentNum);
newId = b.copy();
whitespace = ws;
+ this.algorithm = algorithm;
}
/** For use only by DiffSummaryKey. */
- PatchListKey(ObjectId oldId, Integer parentNum, ObjectId newId, Whitespace whitespace) {
+ PatchListKey(
+ ObjectId oldId,
+ Integer parentNum,
+ ObjectId newId,
+ Whitespace whitespace,
+ Algorithm algorithm) {
this.oldId = oldId;
this.parentNum = parentNum;
this.newId = newId;
this.whitespace = whitespace;
+ this.algorithm = algorithm;
}
/** Old side commit, or null to assume ancestor or combined merge. */
@@ -117,19 +147,24 @@
return whitespace;
}
- @Override
- public int hashCode() {
- return Objects.hash(oldId, parentNum, newId, whitespace);
+ public Algorithm getAlgorithm() {
+ return algorithm;
}
@Override
- public boolean equals(final Object o) {
+ public int hashCode() {
+ return Objects.hash(oldId, parentNum, newId, whitespace, algorithm);
+ }
+
+ @Override
+ public boolean equals(Object o) {
if (o instanceof PatchListKey) {
PatchListKey k = (PatchListKey) o;
return Objects.equals(oldId, k.oldId)
&& Objects.equals(parentNum, k.parentNum)
&& Objects.equals(newId, k.newId)
- && whitespace == k.whitespace;
+ && whitespace == k.whitespace
+ && algorithm == k.algorithm;
}
return false;
}
@@ -147,11 +182,13 @@
n.append(" ");
}
n.append(whitespace.name());
+ n.append(" ");
+ n.append(algorithm.name());
n.append("]");
return n.toString();
}
- private void writeObject(final ObjectOutputStream out) throws IOException {
+ private void writeObject(ObjectOutputStream out) throws IOException {
writeCanBeNull(out, oldId);
out.writeInt(parentNum == null ? 0 : parentNum);
writeNotNull(out, newId);
@@ -160,9 +197,10 @@
throw new IOException("Invalid whitespace type: " + whitespace);
}
out.writeChar(c);
+ out.writeChar(ALGORITHM_TYPES.get(algorithm));
}
- private void readObject(final ObjectInputStream in) throws IOException {
+ private void readObject(ObjectInputStream in) throws IOException {
oldId = readCanBeNull(in);
int n = in.readInt();
parentNum = n == 0 ? null : Integer.valueOf(n);
@@ -172,5 +210,7 @@
if (whitespace == null) {
throw new IOException("Invalid whitespace type code: " + t);
}
+ char algorithmCharacter = in.readChar();
+ algorithm = ALGORITHM_TYPES.inverse().get(algorithmCharacter);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
index 25325b7..b178165 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
@@ -147,15 +147,6 @@
return save ? repo.newObjectInserter() : new InMemoryInserter(repo);
}
- /**
- * Computes the {@code PatchList} for a given {@code PatchListKey}.
- *
- * <p><b>Warning:</b> This method may reset the specified {@code RevWalk}. Don't call it in the
- * middle of a walk.
- *
- * @throws IOException if the repository can't be accessed
- * @throws PatchListNotAvailableException if the {@code PatchList} can't be computed
- */
private PatchList readPatchList(Repository repo, RevWalk rw, ObjectInserter ins)
throws IOException, PatchListNotAvailableException {
ObjectReader reader = rw.getObjectReader();
@@ -205,13 +196,11 @@
comparisonType));
}
Multimap<String, Edit> editsDueToRebasePerFilePath =
- getEditsDueToRebasePerFilePath(rw, b, aCommit);
+ key.getAlgorithm() == PatchListKey.Algorithm.OPTIMIZED_DIFF
+ ? getEditsDueToRebasePerFilePath(aCommit, b)
+ : ImmutableMultimap.of();
for (DiffEntry diffEntry : diffEntries) {
- String filePath = diffEntry.getNewPath();
- if (diffEntry.getChangeType() == ChangeType.DELETE) {
- filePath = diffEntry.getOldPath();
- }
- Set<Edit> editsDueToRebase = ImmutableSet.copyOf(editsDueToRebasePerFilePath.get(filePath));
+ Set<Edit> editsDueToRebase = getEditsDueToRebase(editsDueToRebasePerFilePath, diffEntry);
Optional<PatchListEntry> patchListEntry =
getPatchListEntry(reader, df, diffEntry, aTree, bTree, editsDueToRebase);
patchListEntry.ifPresent(entries::add);
@@ -240,16 +229,7 @@
*
* <ul>
* <li>If {@code commitA} is an ancestor of {@code commitB} (or the other way around), {@code
- * commitA} (or {@code commitB}) is used instead of its parent in {@link
- * #getEditsDueToRebasePerFilePath(RevCommit, RevCommit)}.
- * <li>The method {@link #arePatchSetCommitsWithRebaseInBetween(RevWalk, RevCommit, RevCommit)}
- * is adjusted to only short-circuit this method if {@code commitA} is the parent of {@code
- * commitB} (or the other way around).
- * <li>A flag is added to {@link PatchListKey} indicating whether this method should be called.
- * As this method calls {@link PatchListCache#get(PatchListKey, Project.NameKey)} (which
- * will end up in this method again), we have to make sure that this method doesn't recurse
- * until a parent/child pair of commits (or the root of the history) is reached. Introducing
- * a flag would be the simplest approach but there certainly are other ways, too.
+ * commitA} (or {@code commitB}) is used instead of its parent in this method.
* <li>Special handling for merge commits is added. If only one of them is a merge commit, the
* whole computation has to be done between the single parent and all parents of the merge
* commit. If both of them are merge commits, all combinations of parents have to be
@@ -257,56 +237,24 @@
* (or just for specific types of merge commits).
* </ul>
*
- * @param revWalk a {@code RevWalk} for the repository
* @param commitA the commit defining {@code treeA}
* @param commitB the commit defining {@code treeB}
* @return the {@code Edit}s per file path they modify in {@code treeB}
- * @throws IOException if the repository can't be accessed
* @throws PatchListNotAvailableException if the {@code Edit}s can't be identified
*/
private Multimap<String, Edit> getEditsDueToRebasePerFilePath(
- RevWalk revWalk, RevCommit commitB, RevCommit commitA)
- throws IOException, PatchListNotAvailableException {
- if (!arePatchSetCommitsWithRebaseInBetween(revWalk, commitA, commitB)) {
+ RevCommit commitA, RevCommit commitB) throws PatchListNotAvailableException {
+ if (commitA == null
+ || isRootOrMergeCommit(commitA)
+ || isRootOrMergeCommit(commitB)
+ || areParentChild(commitA, commitB)
+ || haveCommonParent(commitA, commitB)) {
return ImmutableMultimap.of();
}
- return getEditsDueToRebasePerFilePath(commitA, commitB);
- }
- /**
- * Indicates whether {@code commitA} and {@code commitB} represent two patch sets separated by a
- * rebase provided the below-mentioned assumption is met.
- *
- * <p><b>Warning:</b> This method assumes that commitA and commitB are either a parent and child
- * commit or represent two patch sets which belong to the same change. No checks are made to
- * confirm this assumption!
- *
- * @throws IOException if the repository can't be accessed
- */
- private boolean arePatchSetCommitsWithRebaseInBetween(
- RevWalk revWalk, RevCommit commitA, RevCommit commitB) throws IOException {
- return key.getOldId() != null
- && commitB.getParentCount() == 1
- && commitA != null
- && commitA.getParentCount() == 1
- && !ObjectId.equals(commitB.getParent(0), commitA.getParent(0))
- && !revWalk.isMergedInto(commitA, commitB)
- && !revWalk.isMergedInto(commitB, commitA);
- }
-
- /**
- * Determines all {@code Edit}s which were introduced by a rebase. The {@code Edit}s are expressed
- * as differences between {@code treeA} of {@code commitA} and {@code treeB} of {@code commitB}.
- *
- * @param commitA the commit defining {@code treeA}
- * @param commitB the commit defining {@code treeB}
- * @return the {@code Edit}s per file path they modify in {@code treeB}
- * @throws PatchListNotAvailableException if the {@code Edit}s can't be determined
- */
- private Multimap<String, Edit> getEditsDueToRebasePerFilePath(
- RevCommit commitA, RevCommit commitB) throws PatchListNotAvailableException {
PatchListKey parentDiffKey =
- new PatchListKey(commitA.getParent(0), commitB.getParent(0), key.getWhitespace());
+ PatchListKey.againstCommitWithPureTreeDiff(
+ commitA.getParent(0), commitB.getParent(0), key.getWhitespace());
PatchList parentPatchList = patchListCache.get(parentDiffKey, project);
PatchListKey oldKey = PatchListKey.againstDefaultBase(key.getOldId(), key.getWhitespace());
PatchList oldPatchList = patchListCache.get(oldKey, project);
@@ -319,6 +267,32 @@
return editTransformer.getEditsPerFilePath();
}
+ private static boolean isRootOrMergeCommit(RevCommit commit) {
+ return commit.getParentCount() != 1;
+ }
+
+ private static boolean areParentChild(RevCommit commitA, RevCommit commitB) {
+ return ObjectId.equals(commitA.getParent(0), commitB)
+ || ObjectId.equals(commitB.getParent(0), commitA);
+ }
+
+ private static boolean haveCommonParent(RevCommit commitA, RevCommit commitB) {
+ return ObjectId.equals(commitA.getParent(0), commitB.getParent(0));
+ }
+
+ private static Set<Edit> getEditsDueToRebase(
+ Multimap<String, Edit> editsDueToRebasePerFilePath, DiffEntry diffEntry) {
+ if (editsDueToRebasePerFilePath.isEmpty()) {
+ return ImmutableSet.of();
+ }
+
+ String filePath = diffEntry.getNewPath();
+ if (diffEntry.getChangeType() == ChangeType.DELETE) {
+ filePath = diffEntry.getOldPath();
+ }
+ return ImmutableSet.copyOf(editsDueToRebasePerFilePath.get(filePath));
+ }
+
private Optional<PatchListEntry> getPatchListEntry(
ObjectReader objectReader,
DiffFormatter diffFormatter,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListWeigher.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListWeigher.java
index f40eac6..942d0e0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListWeigher.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListWeigher.java
@@ -23,7 +23,8 @@
int size =
16
+ 4 * 8
- + 2 * 36 // Size of PatchListKey, 64 bit JVM
+ + 2 * 36
+ + 8 // Size of PatchListKey, 64 bit JVM
+ 16
+ 3 * 8
+ 3 * 4
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
index 803ccec8..8b86be2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
@@ -56,7 +56,7 @@
private static final Comparator<Edit> EDIT_SORT =
new Comparator<Edit>() {
@Override
- public int compare(final Edit o1, final Edit o2) {
+ public int compare(Edit o1, Edit o2) {
return o1.getBeginA() - o2.getBeginA();
}
};
@@ -91,11 +91,11 @@
this.projectKey = projectKey;
}
- void setChange(final Change c) {
+ void setChange(Change c) {
this.change = c;
}
- void setDiffPrefs(final DiffPreferencesInfo dp) {
+ void setDiffPrefs(DiffPreferencesInfo dp) {
diffPrefs = dp;
context = diffPrefs.context;
@@ -106,14 +106,13 @@
}
}
- void setTrees(final ComparisonType ct, final ObjectId a, final ObjectId b) {
+ void setTrees(ComparisonType ct, ObjectId a, ObjectId b) {
comparisonType = ct;
aId = a;
bId = b;
}
- PatchScript toPatchScript(
- final PatchListEntry content, final CommentDetail comments, final List<Patch> history)
+ PatchScript toPatchScript(PatchListEntry content, CommentDetail comments, List<Patch> history)
throws IOException {
reader = db.newObjectReader();
try {
@@ -123,8 +122,7 @@
}
}
- private PatchScript build(
- final PatchListEntry content, final CommentDetail comments, final List<Patch> history)
+ private PatchScript build(PatchListEntry content, CommentDetail comments, List<Patch> history)
throws IOException {
boolean intralineDifferenceIsPossible = true;
boolean intralineFailure = false;
@@ -247,7 +245,7 @@
}
}
- private static String oldName(final PatchListEntry entry) {
+ private static String oldName(PatchListEntry entry) {
switch (entry.getChangeType()) {
case ADDED:
return null;
@@ -262,7 +260,7 @@
}
}
- private static String newName(final PatchListEntry entry) {
+ private static String newName(PatchListEntry entry) {
switch (entry.getChangeType()) {
case DELETED:
return null;
@@ -276,7 +274,7 @@
}
}
- private void ensureCommentsVisible(final CommentDetail comments) {
+ private void ensureCommentsVisible(CommentDetail comments) {
if (comments.getCommentsA().isEmpty() && comments.getCommentsB().isEmpty()) {
// No comments, no additional dummy edits are required.
//
@@ -324,10 +322,10 @@
Collections.sort(edits, EDIT_SORT);
}
- private void safeAdd(final List<Edit> empty, final Edit toAdd) {
+ private void safeAdd(List<Edit> empty, Edit toAdd) {
final int a = toAdd.getBeginA();
final int b = toAdd.getBeginB();
- for (final Edit e : edits) {
+ for (Edit e : edits) {
if (e.getBeginA() <= a && a <= e.getEndA()) {
return;
}
@@ -338,7 +336,7 @@
empty.add(toAdd);
}
- private int mapA2B(final int a) {
+ private int mapA2B(int a) {
if (edits.isEmpty()) {
// Magic special case of an unmodified file.
//
@@ -364,7 +362,7 @@
return last.getEndB() + (a - last.getEndA());
}
- private int mapB2A(final int b) {
+ private int mapB2A(int b) {
if (edits.isEmpty()) {
// Magic special case of an unmodified file.
//
@@ -392,7 +390,7 @@
private void packContent(boolean ignoredWhitespace) {
EditList list = new EditList(edits, context, a.size(), b.size());
- for (final EditList.Hunk hunk : list.getHunks()) {
+ for (EditList.Hunk hunk : list.getHunks()) {
while (hunk.next()) {
if (hunk.isContextLine()) {
final String lineA = a.src.getString(hunk.getCurA());
@@ -443,7 +441,7 @@
dst.addLine(line, src.getString(line));
}
- void resolve(final Side other, final ObjectId within) throws IOException {
+ void resolve(Side other, ObjectId within) throws IOException {
try {
final boolean reuse;
if (Patch.COMMIT_MSG.equals(path)) {
@@ -547,7 +545,7 @@
}
}
- private TreeWalk find(final ObjectId within)
+ private TreeWalk find(ObjectId within)
throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException,
IOException {
if (path == null || within == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java
index 9e80f38..081ba7a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java
@@ -114,9 +114,9 @@
CommentsUtil commentsUtil,
ChangeEditUtil editReader,
@Assisted ChangeControl control,
- @Assisted final String fileName,
- @Assisted("patchSetA") @Nullable final PatchSet.Id patchSetA,
- @Assisted("patchSetB") final PatchSet.Id patchSetB,
+ @Assisted String fileName,
+ @Assisted("patchSetA") @Nullable PatchSet.Id patchSetA,
+ @Assisted("patchSetB") PatchSet.Id patchSetB,
@Assisted DiffPreferencesInfo diffPrefs) {
this.repoManager = grm;
this.psUtil = psUtil;
@@ -233,18 +233,18 @@
}
}
- private PatchListKey keyFor(final Whitespace whitespace) {
+ private PatchListKey keyFor(Whitespace whitespace) {
if (parentNum < 0) {
- return new PatchListKey(aId, bId, whitespace);
+ return PatchListKey.againstCommit(aId, bId, whitespace);
}
return PatchListKey.againstParentNum(parentNum + 1, bId, whitespace);
}
- private PatchList listFor(final PatchListKey key) throws PatchListNotAvailableException {
+ private PatchList listFor(PatchListKey key) throws PatchListNotAvailableException {
return patchListCache.get(key, project);
}
- private PatchScriptBuilder newBuilder(final PatchList list, Repository git) {
+ private PatchScriptBuilder newBuilder(PatchList list, Repository git) {
final PatchScriptBuilder b = builderFactory.get();
b.setRepository(git, project);
b.setChange(change);
@@ -277,7 +277,7 @@
throw new NoSuchChangeException(change.getId());
}
- private void validatePatchSetId(final PatchSet.Id psId) throws NoSuchChangeException {
+ private void validatePatchSetId(PatchSet.Id psId) throws NoSuchChangeException {
if (psId == null) { // OK, means use base;
} else if (changeId.equals(psId.getParentKey())) { // OK, same change;
} else {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
index 3fc6ba6..cd9c4c3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
@@ -90,7 +90,7 @@
}
// TODO: The same method exists in EventFactory, find a common place for it
- private UserIdentity toUserIdentity(final PersonIdent who) {
+ private UserIdentity toUserIdentity(PersonIdent who) {
final UserIdentity u = new UserIdentity();
u.setName(who.getName());
u.setEmail(who.getEmailAddress());
@@ -108,7 +108,7 @@
return u;
}
- private List<PatchSetInfo.ParentInfo> toParentInfos(final RevCommit[] parents, final RevWalk walk)
+ private List<PatchSetInfo.ParentInfo> toParentInfos(RevCommit[] parents, RevWalk walk)
throws IOException, MissingObjectException {
List<PatchSetInfo.ParentInfo> pInfos = new ArrayList<>(parents.length);
for (RevCommit parent : parents) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java
index f001591..90141715 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java
@@ -168,7 +168,7 @@
private Charset charset;
- public Text(final byte[] r) {
+ public Text(byte[] r) {
super(r);
}
@@ -181,7 +181,7 @@
}
@Override
- protected String decode(final int s, int e) {
+ protected String decode(int s, int e) {
if (charset == null) {
charset = charset(content, null);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ProjectPermission.java b/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ProjectPermission.java
index 85b66c4..3078437 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ProjectPermission.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ProjectPermission.java
@@ -32,7 +32,37 @@
*
* <p>This is a stronger form of {@link #ACCESS} where no filtering is required.
*/
- READ(Permission.READ);
+ READ(Permission.READ),
+
+ /**
+ * Can create at least one reference in the project.
+ *
+ * <p>This project level permission only validates the user may create some type of reference
+ * within the project. The exact reference name must be checked at creation:
+ *
+ * <pre>permissionBackend
+ * .user(user)
+ * .project(proj)
+ * .ref(ref)
+ * .check(RefPermission.CREATE);
+ * </pre>
+ */
+ CREATE_REF,
+
+ /**
+ * Can create at least one change in the project.
+ *
+ * <p>This project level permission only validates the user may create a change for some branch
+ * within the project. The exact reference name must be checked at creation:
+ *
+ * <pre>permissionBackend
+ * .user(user)
+ * .project(proj)
+ * .ref(ref)
+ * .check(RefPermission.CREATE_CHANGE);
+ * </pre>
+ */
+ CREATE_CHANGE;
private final String name;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/RefPermission.java b/gerrit-server/src/main/java/com/google/gerrit/server/permissions/RefPermission.java
index 37744b0..e03272b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/RefPermission.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/permissions/RefPermission.java
@@ -28,8 +28,20 @@
FORGE_AUTHOR(Permission.FORGE_AUTHOR),
FORGE_COMMITTER(Permission.FORGE_COMMITTER),
FORGE_SERVER(Permission.FORGE_SERVER),
+ MERGE,
+ BYPASS_REVIEW,
- CREATE_CHANGE;
+ /** Create a change to code review a commit. */
+ CREATE_CHANGE,
+
+ /**
+ * Creates changes, then also immediately submits them during {@code push}.
+ *
+ * <p>This is similar to {@link #UPDATE} except it constructs changes first, then submits them
+ * according to the submit strategy, which may include cherry-pick or rebase. By creating changes
+ * for each commit, automatic server side rebase, and post-update review are enabled.
+ */
+ UPDATE_BY_SUBMIT;
private final String name;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
index e0afc08..3ed8b37 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
@@ -139,7 +139,7 @@
}
}
- public static List<Path> listPlugins(Path pluginsDir, final String suffix) throws IOException {
+ public static List<Path> listPlugins(Path pluginsDir, String suffix) throws IOException {
if (pluginsDir == null || !Files.exists(pluginsDir)) {
return ImmutableList.of();
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java
index 36b0631..ff48a7d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java
@@ -247,7 +247,7 @@
serverManager.start();
}
- private Injector newRootInjector(final PluginGuiceEnvironment env) {
+ private Injector newRootInjector(PluginGuiceEnvironment env) {
List<Module> modules = Lists.newArrayListWithCapacity(2);
if (getApiType() == ApiType.PLUGIN) {
modules.add(env.getSysModule());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java
index 91441d8..50b8752 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java
@@ -78,7 +78,7 @@
}
}
- private List<ServerPluginProvider> providersForHandlingPlugin(final Path srcPath) {
+ private List<ServerPluginProvider> providersForHandlingPlugin(Path srcPath) {
List<ServerPluginProvider> providers = new ArrayList<>();
for (ServerPluginProvider serverPluginProvider : serverPluginProviders) {
boolean handles = serverPluginProvider.handles(srcPath);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
index 2cb8d96..f4ca925 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
@@ -42,6 +42,7 @@
import com.google.gerrit.server.permissions.LabelPermission;
import com.google.gerrit.server.permissions.PermissionBackend.ForChange;
import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -171,7 +172,7 @@
this.patchSetUtil = patchSetUtil;
}
- public ChangeControl forUser(final CurrentUser who) {
+ public ChangeControl forUser(CurrentUser who) {
if (getUser().equals(who)) {
return this;
}
@@ -253,7 +254,7 @@
}
/** Can this user publish this draft change or any draft patch set of this change? */
- public boolean canPublish(final ReviewDb db) throws OrmException {
+ public boolean canPublish(ReviewDb db) throws OrmException {
return (isOwner() || getRefControl().canPublishDrafts()) && isVisible(db);
}
@@ -281,14 +282,14 @@
/** Can this user rebase this change? */
private boolean canRebase(ReviewDb db) throws OrmException {
return (isOwner() || getRefControl().canSubmit(isOwner()) || getRefControl().canRebase())
- && getRefControl().canUpload()
+ && refControl.asForRef().testOrFalse(RefPermission.CREATE_CHANGE)
&& !isPatchSetLocked(db);
}
/** Can this user restore this change? */
private boolean canRestore(ReviewDb db) throws OrmException {
- return canAbandon(db) // Anyone who can abandon the change can restore it back
- && getRefControl().canUpload(); // as long as you can upload too
+ // Anyone who can abandon the change can restore it, as long as they can create changes.
+ return canAbandon(db) && refControl.asForRef().testOrFalse(RefPermission.CREATE_CHANGE);
}
/** All available label types for this change. */
@@ -326,7 +327,7 @@
/** Can this user add a patch set to this change? */
private boolean canAddPatchSet(ReviewDb db) throws OrmException {
- if (!getRefControl().canUpload()
+ if (!refControl.asForRef().testOrFalse(RefPermission.CREATE_CHANGE)
|| isPatchSetLocked(db)
|| !isPatchVisible(patchSetUtil.current(db, notes), db)) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java
index 0598d75..e42a1cf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java
@@ -22,7 +22,6 @@
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;
@@ -54,7 +53,6 @@
private final Provider<IdentifiedUser> identifiedUser;
private final PermissionBackend permissionBackend;
private final GitRepositoryManager repoManager;
- private final Provider<ReviewDb> db;
private final GitReferenceUpdated referenceUpdated;
private final RefValidationHelper refCreationValidator;
private String ref;
@@ -64,14 +62,12 @@
Provider<IdentifiedUser> identifiedUser,
PermissionBackend permissionBackend,
GitRepositoryManager repoManager,
- Provider<ReviewDb> db,
GitReferenceUpdated referenceUpdated,
RefValidationHelper.Factory refHelperFactory,
@Assisted String ref) {
this.identifiedUser = identifiedUser;
this.permissionBackend = permissionBackend;
this.repoManager = repoManager;
- this.db = db;
this.referenceUpdated = referenceUpdated;
this.refCreationValidator = refHelperFactory.create(ReceiveCommand.Type.CREATE);
this.ref = ref;
@@ -121,7 +117,7 @@
}
}
- if (!refControl.canCreate(db.get(), repo, object)) {
+ if (!refControl.canCreate(repo, object)) {
throw new AuthException("Cannot create \"" + ref + "\"");
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java
index 654ce69..f81a0f3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java
@@ -76,7 +76,7 @@
return applySync(project, input);
}
- private Response.Accepted applyAsync(final Project.NameKey project, final Input input) {
+ private Response.Accepted applyAsync(Project.NameKey project, Input input) {
Runnable job =
new Runnable() {
@Override
@@ -103,7 +103,7 @@
}
@SuppressWarnings("resource")
- private BinaryResult applySync(final Project.NameKey project, final Input input) {
+ private BinaryResult applySync(Project.NameKey project, Input input) {
return new BinaryResult() {
@Override
public void writeTo(OutputStream out) throws IOException {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
index 997239d..7c0795e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
@@ -14,6 +14,11 @@
package com.google.gerrit.server.project;
+import static com.google.gerrit.server.permissions.GlobalPermission.ADMINISTRATE_SERVER;
+import static com.google.gerrit.server.permissions.ProjectPermission.CREATE_REF;
+import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE;
+import static com.google.gerrit.server.permissions.RefPermission.READ;
+
import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.Iterables;
import com.google.gerrit.common.data.AccessSection;
@@ -25,6 +30,7 @@
import com.google.gerrit.extensions.api.access.PermissionInfo;
import com.google.gerrit.extensions.api.access.PermissionRuleInfo;
import com.google.gerrit.extensions.api.access.ProjectAccessInfo;
+import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
@@ -37,6 +43,9 @@
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.permissions.RefPermission;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -63,7 +72,8 @@
PermissionRule.Action.INTERACTIVE,
PermissionRuleInfo.Action.INTERACTIVE);
- private final Provider<CurrentUser> self;
+ private final Provider<CurrentUser> user;
+ private final PermissionBackend permissionBackend;
private final GroupControl.Factory groupControlFactory;
private final AllProjectsName allProjectsName;
private final ProjectJson projectJson;
@@ -75,6 +85,7 @@
@Inject
public GetAccess(
Provider<CurrentUser> self,
+ PermissionBackend permissionBackend,
GroupControl.Factory groupControlFactory,
AllProjectsName allProjectsName,
ProjectCache projectCache,
@@ -82,7 +93,8 @@
ProjectJson projectJson,
ProjectControl.GenericFactory projectControlFactory,
GroupBackend groupBackend) {
- this.self = self;
+ this.user = self;
+ this.permissionBackend = permissionBackend;
this.groupControlFactory = groupControlFactory;
this.allProjectsName = allProjectsName;
this.projectJson = projectJson;
@@ -93,9 +105,10 @@
}
public ProjectAccessInfo apply(Project.NameKey nameKey)
- throws ResourceNotFoundException, ResourceConflictException, IOException {
+ throws ResourceNotFoundException, ResourceConflictException, IOException,
+ PermissionBackendException {
try {
- return apply(new ProjectResource(projectControlFactory.controlFor(nameKey, self.get())));
+ return apply(new ProjectResource(projectControlFactory.controlFor(nameKey, user.get())));
} catch (NoSuchProjectException e) {
throw new ResourceNotFoundException(nameKey.get());
}
@@ -103,16 +116,18 @@
@Override
public ProjectAccessInfo apply(ProjectResource rsrc)
- throws ResourceNotFoundException, ResourceConflictException, IOException {
+ throws ResourceNotFoundException, ResourceConflictException, IOException,
+ PermissionBackendException {
// Load the current configuration from the repository, ensuring it's the most
// recent version available. If it differs from what was in the project
// state, force a cache flush now.
- //
+
Project.NameKey projectName = rsrc.getNameKey();
ProjectAccessInfo info = new ProjectAccessInfo();
- ProjectConfig config;
ProjectControl pc = createProjectControl(projectName);
- RefControl metaConfigControl = pc.controlForRef(RefNames.REFS_CONFIG);
+ PermissionBackend.ForProject perm = permissionBackend.user(user).project(projectName);
+
+ ProjectConfig config;
try (MetaDataUpdate md = metaDataUpdateFactory.create(projectName)) {
config = ProjectConfig.read(md);
@@ -121,10 +136,12 @@
config.commit(md);
projectCache.evict(config.getProject());
pc = createProjectControl(projectName);
+ perm = permissionBackend.user(user).project(projectName);
} else if (config.getRevision() != null
&& !config.getRevision().equals(pc.getProjectState().getConfig().getRevision())) {
projectCache.evict(config.getProject());
pc = createProjectControl(projectName);
+ perm = permissionBackend.user(user).project(projectName);
}
} catch (ConfigInvalidException e) {
throw new ResourceConflictException(e.getMessage());
@@ -135,6 +152,7 @@
info.local = new HashMap<>();
info.ownerOf = new HashSet<>();
Map<AccountGroup.UUID, Boolean> visibleGroups = new HashMap<>();
+ boolean checkReadConfig = check(perm, RefNames.REFS_CONFIG, READ);
for (AccessSection section : config.getAccessSections()) {
String name = section.getName();
@@ -143,20 +161,19 @@
info.local.put(name, createAccessSection(section));
info.ownerOf.add(name);
- } else if (metaConfigControl.isVisible()) {
+ } else if (checkReadConfig) {
info.local.put(section.getName(), createAccessSection(section));
}
} else if (RefConfigSection.isValid(name)) {
- RefControl rc = pc.controlForRef(name);
- if (rc.isOwner()) {
+ if (pc.controlForRef(name).isOwner()) {
info.local.put(name, createAccessSection(section));
info.ownerOf.add(name);
- } else if (metaConfigControl.isVisible()) {
+ } else if (checkReadConfig) {
info.local.put(name, createAccessSection(section));
- } else if (rc.isVisible()) {
+ } else if (check(perm, name, READ)) {
// Filter the section to only add rules describing groups that
// are visible to the current-user. This includes any group the
// user is a member of, as well as groups they own or that
@@ -214,21 +231,32 @@
info.inheritsFrom = projectJson.format(parent.getProject());
}
- if (pc.getProject().getNameKey().equals(allProjectsName)) {
- if (pc.isOwner()) {
- info.ownerOf.add(AccessSection.GLOBAL_CAPABILITIES);
- }
+ if (projectName.equals(allProjectsName)
+ && permissionBackend.user(user).testOrFalse(ADMINISTRATE_SERVER)) {
+ info.ownerOf.add(AccessSection.GLOBAL_CAPABILITIES);
}
info.isOwner = toBoolean(pc.isOwner());
info.canUpload =
- toBoolean(pc.isOwner() || (metaConfigControl.isVisible() && metaConfigControl.canUpload()));
- info.canAdd = toBoolean(pc.canAddRefs());
- info.configVisible = pc.isOwner() || metaConfigControl.isVisible();
+ toBoolean(
+ pc.isOwner()
+ || (checkReadConfig && perm.ref(RefNames.REFS_CONFIG).testOrFalse(CREATE_CHANGE)));
+ info.canAdd = toBoolean(perm.testOrFalse(CREATE_REF));
+ info.configVisible = checkReadConfig || pc.isOwner();
return info;
}
+ private static boolean check(PermissionBackend.ForProject ctx, String ref, RefPermission perm)
+ throws PermissionBackendException {
+ try {
+ ctx.ref(ref).check(perm);
+ return true;
+ } catch (AuthException denied) {
+ return false;
+ }
+ }
+
private AccessSectionInfo createAccessSection(AccessSection section) {
AccessSectionInfo accessSectionInfo = new AccessSectionInfo();
accessSectionInfo.permissions = new HashMap<>();
@@ -255,7 +283,7 @@
private ProjectControl createProjectControl(Project.NameKey projectName)
throws IOException, ResourceNotFoundException {
try {
- return projectControlFactory.controlFor(projectName, self.get());
+ return projectControlFactory.controlFor(projectName, user.get());
} catch (NoSuchProjectException e) {
throw new ResourceNotFoundException(projectName.get());
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
index 5d0afea..44d6a4f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
@@ -15,9 +15,11 @@
package com.google.gerrit.server.project;
import com.google.common.collect.Lists;
-import com.google.gerrit.extensions.common.GitPerson;
+import com.google.gerrit.extensions.api.projects.ReflogEntryInfo;
import com.google.gerrit.extensions.restapi.AuthException;
+import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
+import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.CommonConverters;
import com.google.gerrit.server.args4j.TimestampHandler;
@@ -27,13 +29,16 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.ReflogEntry;
import org.eclipse.jgit.lib.ReflogReader;
import org.eclipse.jgit.lib.Repository;
import org.kohsuke.args4j.Option;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GetReflog implements RestReadView<BranchResource> {
+ private static final Logger log = LoggerFactory.getLogger(GetReflog.class);
+
private final GitRepositoryManager repoManager;
@Option(
@@ -83,14 +88,20 @@
}
@Override
- public List<ReflogEntryInfo> apply(BranchResource rsrc)
- throws AuthException, ResourceNotFoundException, RepositoryNotFoundException, IOException {
+ public List<ReflogEntryInfo> apply(BranchResource rsrc) throws RestApiException, IOException {
if (!rsrc.getControl().isOwner()) {
throw new AuthException("not project owner");
}
try (Repository repo = repoManager.openRepository(rsrc.getNameKey())) {
- ReflogReader r = repo.getReflogReader(rsrc.getRef());
+ ReflogReader r;
+ try {
+ r = repo.getReflogReader(rsrc.getRef());
+ } catch (UnsupportedOperationException e) {
+ String msg = "reflog not supported on repo " + rsrc.getNameKey().get();
+ log.error(msg);
+ throw new MethodNotAllowedException(msg);
+ }
if (r == null) {
throw new ResourceNotFoundException(rsrc.getRef());
}
@@ -109,21 +120,15 @@
}
}
}
- return Lists.transform(entries, ReflogEntryInfo::new);
+ return Lists.transform(entries, e -> newReflogEntryInfo(e));
}
}
- public static class ReflogEntryInfo {
- public String oldId;
- public String newId;
- public GitPerson who;
- public String comment;
-
- public ReflogEntryInfo(ReflogEntry e) {
- oldId = e.getOldId().getName();
- newId = e.getNewId().getName();
- who = CommonConverters.toGitPerson(e.getWho());
- comment = e.getComment();
- }
+ private ReflogEntryInfo newReflogEntryInfo(ReflogEntry e) {
+ return new ReflogEntryInfo(
+ e.getOldId().getName(),
+ e.getNewId().getName(),
+ CommonConverters.toGitPerson(e.getWho()),
+ e.getComment());
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
index 7018097..986b4ad 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
@@ -346,7 +346,7 @@
PermissionBackend.WithUser perm = permissionBackend.user(currentUser);
final TreeMap<Project.NameKey, ProjectNode> treeMap = new TreeMap<>();
try {
- for (final Project.NameKey projectName : filter(perm)) {
+ for (Project.NameKey projectName : filter(perm)) {
final ProjectState e = projectCache.get(projectName);
if (e == null || (!all && e.getProject().getState() == HIDDEN)) {
// If we can't get it from the cache, pretend its not present.
@@ -567,12 +567,12 @@
}
private void printProjectTree(
- final PrintWriter stdout, final TreeMap<Project.NameKey, ProjectNode> treeMap) {
+ final PrintWriter stdout, TreeMap<Project.NameKey, ProjectNode> treeMap) {
final SortedSet<ProjectNode> sortedNodes = new TreeSet<>();
// Builds the inheritance tree using a list.
//
- for (final ProjectNode key : treeMap.values()) {
+ for (ProjectNode key : treeMap.values()) {
if (key.isAllProjects()) {
sortedNodes.add(key);
continue;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java
index 7cbea47..d5a8573 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java
@@ -22,14 +22,11 @@
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CommonConverters;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.VisibleRefFilter;
-import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.inject.Inject;
@@ -55,9 +52,7 @@
private final GitRepositoryManager repoManager;
private final PermissionBackend permissionBackend;
private final Provider<CurrentUser> user;
- private final Provider<ReviewDb> dbProvider;
- private final TagCache tagCache;
- private final ChangeNotes.Factory changeNotesFactory;
+ private final VisibleRefFilter.Factory refFilterFactory;
@Nullable private final SearchingChangeCacheImpl changeCache;
@Option(
@@ -110,16 +105,12 @@
GitRepositoryManager repoManager,
PermissionBackend permissionBackend,
Provider<CurrentUser> user,
- Provider<ReviewDb> dbProvider,
- TagCache tagCache,
- ChangeNotes.Factory changeNotesFactory,
+ VisibleRefFilter.Factory refFilterFactory,
@Nullable SearchingChangeCacheImpl changeCache) {
this.repoManager = repoManager;
this.permissionBackend = permissionBackend;
this.user = user;
- this.dbProvider = dbProvider;
- this.tagCache = tagCache;
- this.changeNotesFactory = changeNotesFactory;
+ this.refFilterFactory = refFilterFactory;
this.changeCache = changeCache;
}
@@ -211,8 +202,9 @@
private Map<String, Ref> visibleTags(
ProjectControl control, Repository repo, Map<String, Ref> tags) {
- return new VisibleRefFilter(
- tagCache, changeNotesFactory, changeCache, repo, control, dbProvider.get(), false)
+ return refFilterFactory
+ .create(control.getProjectState(), repo)
+ .setShowMetadata(false)
.filter(tags, true);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java
index 61b5c05..23d8d80 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java
@@ -23,11 +23,11 @@
private static final String MESSAGE = "Project not found: ";
private final Project.NameKey project;
- public NoSuchProjectException(final Project.NameKey key) {
+ public NoSuchProjectException(Project.NameKey key) {
this(key, null);
}
- public NoSuchProjectException(final Project.NameKey key, final Throwable why) {
+ public NoSuchProjectException(Project.NameKey key, Throwable why) {
super(MESSAGE + key.toString(), why);
project = key;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java
index 2c90ce86..59debde 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java
@@ -18,11 +18,11 @@
public class NoSuchRefException extends Exception {
private static final long serialVersionUID = 1L;
- public NoSuchRefException(final String ref) {
+ public NoSuchRefException(String ref) {
this(ref, null);
}
- public NoSuchRefException(final String ref, final Throwable why) {
+ public NoSuchRefException(String ref, Throwable why) {
super(ref, why);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java
index 3ca7bd8..6ee143c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java
@@ -120,7 +120,7 @@
}
@Override
- public ProjectState get(final Project.NameKey projectName) {
+ public ProjectState get(Project.NameKey projectName) {
try {
return checkedGet(projectName);
} catch (IOException e) {
@@ -151,7 +151,7 @@
}
@Override
- public void evict(final Project p) {
+ public void evict(Project p) {
if (p != null) {
byName.invalidate(p.getNameKey().get());
}
@@ -159,14 +159,14 @@
/** Invalidate the cached information about the given project. */
@Override
- public void evict(final Project.NameKey p) {
+ public void evict(Project.NameKey p) {
if (p != null) {
byName.invalidate(p.get());
}
}
@Override
- public void remove(final Project p) {
+ public void remove(Project p) {
listLock.lock();
try {
SortedSet<Project.NameKey> n = Sets.newTreeSet(list.get(ListKey.ALL));
@@ -218,7 +218,7 @@
}
@Override
- public Iterable<Project.NameKey> byName(final String pfx) {
+ public Iterable<Project.NameKey> byName(String pfx) {
final Iterable<Project.NameKey> src;
try {
src = list.get(ListKey.ALL).tailSet(new Project.NameKey(pfx));
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java
index 16a3b6b..66bbcca 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java
@@ -55,7 +55,7 @@
log.info("Loading project cache");
scheduler.execute(
() -> {
- for (final Project.NameKey name : cache.all()) {
+ for (Project.NameKey name : cache.all()) {
pool.execute(
() -> {
cache.get(name);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
index 8773bad..d328f87 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
@@ -43,8 +43,6 @@
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.gerrit.server.config.GitReceivePackGroups;
import com.google.gerrit.server.config.GitUploadPackGroups;
-import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.notedb.ChangeNotes;
@@ -86,7 +84,7 @@
private final ProjectCache projectCache;
@Inject
- GenericFactory(final ProjectCache pc) {
+ GenericFactory(ProjectCache pc) {
projectCache = pc;
}
@@ -108,7 +106,7 @@
userCache = uc;
}
- public ProjectControl controlFor(final Project.NameKey nameKey) throws NoSuchProjectException {
+ public ProjectControl controlFor(Project.NameKey nameKey) throws NoSuchProjectException {
return userCache.get().get(nameKey);
}
}
@@ -136,12 +134,10 @@
private final String canonicalWebUrl;
private final CurrentUser user;
private final ProjectState state;
- private final ChangeNotes.Factory changeNotesFactory;
private final ChangeControl.Factory changeControlFactory;
private final PermissionCollection.Factory permissionFilter;
+ private final VisibleRefFilter.Factory refFilter;
private final Collection<ContributorAgreement> contributorAgreements;
- private final TagCache tagCache;
- @Nullable private final SearchingChangeCacheImpl changeCache;
private final Provider<InternalChangeQuery> queryProvider;
private final Metrics metrics;
@@ -157,19 +153,15 @@
@GitReceivePackGroups Set<AccountGroup.UUID> receiveGroups,
ProjectCache pc,
PermissionCollection.Factory permissionFilter,
- ChangeNotes.Factory changeNotesFactory,
ChangeControl.Factory changeControlFactory,
- TagCache tagCache,
+ VisibleRefFilter.Factory refFilter,
Provider<InternalChangeQuery> queryProvider,
- @Nullable SearchingChangeCacheImpl changeCache,
@CanonicalWebUrl @Nullable String canonicalWebUrl,
@Assisted CurrentUser who,
@Assisted ProjectState ps,
Metrics metrics) {
- this.changeNotesFactory = changeNotesFactory;
this.changeControlFactory = changeControlFactory;
- this.tagCache = tagCache;
- this.changeCache = changeCache;
+ this.refFilter = refFilter;
this.uploadGroups = uploadGroups;
this.receiveGroups = receiveGroups;
this.permissionFilter = permissionFilter;
@@ -245,15 +237,15 @@
}
/** Returns whether the project is hidden. */
- public boolean isHidden() {
+ private boolean isHidden() {
return getProject().getState().equals(com.google.gerrit.extensions.client.ProjectState.HIDDEN);
}
- public boolean canAddRefs() {
+ private boolean canAddRefs() {
return (canPerformOnAnyRef(Permission.CREATE) || isOwnerAnyRef());
}
- public boolean canUpload() {
+ private boolean canCreateChanges() {
for (SectionMatcher matcher : access()) {
AccessSection section = matcher.section;
if (section.getName().startsWith("refs/for/")) {
@@ -309,12 +301,12 @@
return getGroups(localAccess());
}
- private static Set<GroupReference> getGroups(final List<SectionMatcher> sectionMatcherList) {
+ private static Set<GroupReference> getGroups(List<SectionMatcher> sectionMatcherList) {
final Set<GroupReference> all = new HashSet<>();
- for (final SectionMatcher matcher : sectionMatcherList) {
+ for (SectionMatcher matcher : sectionMatcherList) {
final AccessSection section = matcher.section;
- for (final Permission permission : section.getPermissions()) {
- for (final PermissionRule rule : permission.getRules()) {
+ for (Permission permission : section.getPermissions()) {
+ for (PermissionRule rule : permission.getRules()) {
all.add(rule.getGroup());
}
}
@@ -397,7 +389,7 @@
// matches every possible reference. Check all
// patterns also have the permission.
//
- for (final String pattern : patterns) {
+ for (String pattern : patterns) {
if (controlForRef(pattern).canPerform(permission)) {
canPerform = true;
} else if (ignore.contains(pattern)) {
@@ -492,12 +484,12 @@
"Cannot look up change for commit " + commit.name() + " in " + getProject().getName(), e);
}
// Scan all visible refs.
- return canReadCommitFromVisibleRef(db, repo, commit);
+ return canReadCommitFromVisibleRef(repo, commit);
}
- private boolean canReadCommitFromVisibleRef(ReviewDb db, Repository repo, RevCommit commit) {
+ private boolean canReadCommitFromVisibleRef(Repository repo, RevCommit commit) {
try (RevWalk rw = new RevWalk(repo)) {
- return isMergedIntoVisibleRef(repo, db, rw, commit, repo.getAllRefs().values());
+ return isMergedIntoVisibleRef(repo, rw, commit, repo.getAllRefs().values());
} catch (IOException e) {
String msg =
String.format(
@@ -509,10 +501,9 @@
}
boolean isMergedIntoVisibleRef(
- Repository repo, ReviewDb db, RevWalk rw, RevCommit commit, Collection<Ref> unfilteredRefs)
+ Repository repo, RevWalk rw, RevCommit commit, Collection<Ref> unfilteredRefs)
throws IOException {
- VisibleRefFilter filter =
- new VisibleRefFilter(tagCache, changeNotesFactory, changeCache, repo, this, db, true);
+ VisibleRefFilter filter = refFilter.create(state, repo);
Map<String, Ref> m = Maps.newHashMapWithExpectedSize(unfilteredRefs.size());
for (Ref r : unfilteredRefs) {
m.put(r.getName(), r);
@@ -588,6 +579,11 @@
case READ:
return !isHidden() && allRefsAreVisible(Collections.emptySet());
+
+ case CREATE_REF:
+ return canAddRefs();
+ case CREATE_CHANGE:
+ return canCreateChanges();
}
throw new PermissionBackendException(perm + " unsupported");
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java
index 403efd2..e1ba692 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java
@@ -76,12 +76,12 @@
return children;
}
- public void addChild(final ProjectNode child) {
+ public void addChild(ProjectNode child) {
children.add(child);
}
@Override
- public int compareTo(final ProjectNode o) {
+ public int compareTo(ProjectNode o) {
return project.getNameKey().compareTo(o.project.getNameKey());
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java
index 32dc41f..15984d8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java
@@ -319,7 +319,7 @@
return result;
}
- public ProjectControl controlFor(final CurrentUser user) {
+ public ProjectControl controlFor(CurrentUser user) {
return projectControlFactory.create(user, this);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java
index bf53ab1..cf67474 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java
@@ -24,7 +24,6 @@
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.notedb.ChangeNotes;
@@ -151,12 +150,7 @@
return blocks.isEmpty() && !allows.isEmpty();
}
- /**
- * Determines whether the user can upload a change to the ref controlled by this object.
- *
- * @return {@code true} if the user specified can upload a change to the Git ref
- */
- public boolean canUpload() {
+ private boolean canUpload() {
return projectControl.controlForRef("refs/for/" + getRefName()).canPerform(Permission.PUSH)
&& isProjectStatePermittingWrite();
}
@@ -170,7 +164,7 @@
}
/** @return true if this user can submit merge patch sets to this ref */
- public boolean canUploadMerges() {
+ private boolean canUploadMerges() {
return projectControl
.controlForRef("refs/for/" + getRefName())
.canPerform(Permission.PUSH_MERGE)
@@ -183,7 +177,7 @@
}
/** @return true if this user can submit patch sets to this ref */
- public boolean canSubmit(boolean isChangeOwner) {
+ boolean canSubmit(boolean isChangeOwner) {
if (RefNames.REFS_CONFIG.equals(refName)) {
// Always allow project owners to submit configuration changes.
// Submitting configuration changes modifies the access control
@@ -265,12 +259,11 @@
/**
* Determines whether the user can create a new Git ref.
*
- * @param db db for checking change visibility.
* @param repo repository on which user want to create
* @param object the object the user will start the reference with.
* @return {@code true} if the user specified can create a new Git ref
*/
- public boolean canCreate(ReviewDb db, Repository repo, RevObject object) {
+ public boolean canCreate(Repository repo, RevObject object) {
if (!isProjectStatePermittingWrite()) {
return false;
}
@@ -280,7 +273,7 @@
// No create permissions.
return false;
}
- return canCreateCommit(db, repo, (RevCommit) object);
+ return canCreateCommit(repo, (RevCommit) object);
} else if (object instanceof RevTag) {
final RevTag tag = (RevTag) object;
try (RevWalk rw = new RevWalk(repo)) {
@@ -307,11 +300,11 @@
RevObject tagObject = tag.getObject();
if (tagObject instanceof RevCommit) {
- if (!canCreateCommit(db, repo, (RevCommit) tagObject)) {
+ if (!canCreateCommit(repo, (RevCommit) tagObject)) {
return false;
}
} else {
- if (!canCreate(db, repo, tagObject)) {
+ if (!canCreate(repo, tagObject)) {
return false;
}
}
@@ -328,12 +321,12 @@
}
}
- private boolean canCreateCommit(ReviewDb db, Repository repo, RevCommit commit) {
+ private boolean canCreateCommit(Repository repo, RevCommit commit) {
if (canUpdate()) {
// If the user has push permissions, they can create the ref regardless
// of whether they are pushing any new objects along with the create.
return true;
- } else if (isMergedIntoBranchOrTag(db, repo, commit)) {
+ } else if (isMergedIntoBranchOrTag(repo, commit)) {
// If the user has no push permissions, check whether the object is
// merged into a branch or tag readable by this user. If so, they are
// not effectively "pushing" more objects, so they can create the ref
@@ -343,11 +336,11 @@
return false;
}
- private boolean isMergedIntoBranchOrTag(ReviewDb db, Repository repo, RevCommit commit) {
+ private boolean isMergedIntoBranchOrTag(Repository repo, RevCommit commit) {
try (RevWalk rw = new RevWalk(repo)) {
List<Ref> refs = new ArrayList<>(repo.getRefDatabase().getRefs(Constants.R_HEADS).values());
refs.addAll(repo.getRefDatabase().getRefs(Constants.R_TAGS).values());
- return projectControl.isMergedIntoVisibleRef(repo, db, rw, commit, refs);
+ return projectControl.isMergedIntoVisibleRef(repo, rw, commit, refs);
} catch (IOException e) {
String msg =
String.format(
@@ -391,7 +384,7 @@
}
/** @return true if this user can forge the author line in a commit. */
- public boolean canForgeAuthor() {
+ private boolean canForgeAuthor() {
if (canForgeAuthor == null) {
canForgeAuthor = canPerform(Permission.FORGE_AUTHOR);
}
@@ -399,7 +392,7 @@
}
/** @return true if this user can forge the committer line in a commit. */
- public boolean canForgeCommitter() {
+ private boolean canForgeCommitter() {
if (canForgeCommitter == null) {
canForgeCommitter = canPerform(Permission.FORGE_COMMITTER);
}
@@ -407,7 +400,7 @@
}
/** @return true if this user can forge the server on the committer line. */
- public boolean canForgeGerritServerIdentity() {
+ private boolean canForgeGerritServerIdentity() {
return canPerform(Permission.FORGE_SERVER);
}
@@ -730,14 +723,28 @@
return canUpdate();
case FORCE_UPDATE:
return canForceUpdate();
+
case FORGE_AUTHOR:
return canForgeAuthor();
case FORGE_COMMITTER:
return canForgeCommitter();
case FORGE_SERVER:
return canForgeGerritServerIdentity();
+ case MERGE:
+ return canUploadMerges();
+
case CREATE_CHANGE:
return canUpload();
+
+ case UPDATE_BY_SUBMIT:
+ return projectControl.controlForRef("refs/for/" + getRefName()).canSubmit(true);
+
+ case BYPASS_REVIEW:
+ return canForgeAuthor()
+ && canForgeCommitter()
+ && canForgeGerritServerIdentity()
+ && canUploadMerges()
+ && !projectControl.getProjectState().isUseSignedOffBy();
}
throw new PermissionBackendException(perm + " unsupported");
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java
index 6c45bc3..90d083b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java
@@ -65,7 +65,7 @@
}
@Override
- public String apply(final ProjectResource rsrc, Input input)
+ public String apply(ProjectResource rsrc, Input input)
throws AuthException, ResourceNotFoundException, BadRequestException,
UnprocessableEntityException, IOException {
if (!rsrc.getControl().isOwner()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java
index 7ec8706..56e3273 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java
@@ -105,7 +105,7 @@
}
}
- public void validateParentUpdate(final ProjectControl ctl, String newParent, boolean checkIfAdmin)
+ public void validateParentUpdate(ProjectControl ctl, String newParent, boolean checkIfAdmin)
throws AuthException, ResourceConflictException, UnprocessableEntityException,
PermissionBackendException {
IdentifiedUser user = ctl.getUser().asIdentifiedUser();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java
index 1bf6d8b..7d99052 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java
@@ -29,11 +29,11 @@
private final int cost;
@SafeVarargs
- protected AndPredicate(final Predicate<T>... that) {
+ protected AndPredicate(Predicate<T>... that) {
this(Arrays.asList(that));
}
- protected AndPredicate(final Collection<? extends Predicate<T>> that) {
+ protected AndPredicate(Collection<? extends Predicate<T>> that) {
List<Predicate<T>> t = new ArrayList<>(that.size());
int c = 0;
for (Predicate<T> p : that) {
@@ -62,12 +62,12 @@
}
@Override
- public final Predicate<T> getChild(final int i) {
+ public final Predicate<T> getChild(int i) {
return children.get(i);
}
@Override
- public Predicate<T> copy(final Collection<? extends Predicate<T>> children) {
+ public Predicate<T> copy(Collection<? extends Predicate<T>> children) {
return new AndPredicate<>(children);
}
@@ -82,7 +82,7 @@
}
@Override
- public boolean match(final T object) throws OrmException {
+ public boolean match(T object) throws OrmException {
for (Predicate<T> c : children) {
checkState(
c.isMatchable(),
@@ -107,7 +107,7 @@
}
@Override
- public boolean equals(final Object other) {
+ public boolean equals(Object other) {
if (other == null) {
return false;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java
index 2abcd58..42dcff8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java
@@ -18,12 +18,12 @@
public abstract class IntPredicate<T> extends OperatorPredicate<T> {
private final int intValue;
- public IntPredicate(final String name, final String value) {
+ public IntPredicate(String name, String value) {
super(name, value);
this.intValue = Integer.parseInt(value);
}
- public IntPredicate(final String name, final int intValue) {
+ public IntPredicate(String name, int intValue) {
super(name, String.valueOf(intValue));
this.intValue = intValue;
}
@@ -38,7 +38,7 @@
}
@Override
- public boolean equals(final Object other) {
+ public boolean equals(Object other) {
if (other == null) {
return false;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java
index 3716ec1..306b4cb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java
@@ -25,7 +25,7 @@
public class NotPredicate<T> extends Predicate<T> implements Matchable<T> {
private final Predicate<T> that;
- protected NotPredicate(final Predicate<T> that) {
+ protected NotPredicate(Predicate<T> that) {
if (that instanceof NotPredicate) {
throw new IllegalArgumentException("Double negation unsupported");
}
@@ -43,7 +43,7 @@
}
@Override
- public final Predicate<T> getChild(final int i) {
+ public final Predicate<T> getChild(int i) {
if (i != 0) {
throw new ArrayIndexOutOfBoundsException(i);
}
@@ -51,7 +51,7 @@
}
@Override
- public Predicate<T> copy(final Collection<? extends Predicate<T>> children) {
+ public Predicate<T> copy(Collection<? extends Predicate<T>> children) {
if (children.size() != 1) {
throw new IllegalArgumentException("Expected exactly one child");
}
@@ -64,7 +64,7 @@
}
@Override
- public boolean match(final T object) throws OrmException {
+ public boolean match(T object) throws OrmException {
checkState(
that.isMatchable(),
"match invoked, but child predicate %s doesn't implement %s",
@@ -84,7 +84,7 @@
}
@Override
- public boolean equals(final Object other) {
+ public boolean equals(Object other) {
if (other == null) {
return false;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java
index 9413c5d..254aa99 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java
@@ -21,7 +21,7 @@
protected final String name;
protected final String value;
- public OperatorPredicate(final String name, final String value) {
+ public OperatorPredicate(String name, String value) {
this.name = name;
this.value = value;
}
@@ -35,7 +35,7 @@
}
@Override
- public Predicate<T> copy(final Collection<? extends Predicate<T>> children) {
+ public Predicate<T> copy(Collection<? extends Predicate<T>> children) {
if (!children.isEmpty()) {
throw new IllegalArgumentException("Expected 0 children");
}
@@ -48,7 +48,7 @@
}
@Override
- public boolean equals(final Object other) {
+ public boolean equals(Object other) {
if (other == null) {
return false;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java
index 4845a86..f357344 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java
@@ -29,11 +29,11 @@
private final int cost;
@SafeVarargs
- protected OrPredicate(final Predicate<T>... that) {
+ protected OrPredicate(Predicate<T>... that) {
this(Arrays.asList(that));
}
- protected OrPredicate(final Collection<? extends Predicate<T>> that) {
+ protected OrPredicate(Collection<? extends Predicate<T>> that) {
List<Predicate<T>> t = new ArrayList<>(that.size());
int c = 0;
for (Predicate<T> p : that) {
@@ -62,12 +62,12 @@
}
@Override
- public final Predicate<T> getChild(final int i) {
+ public final Predicate<T> getChild(int i) {
return children.get(i);
}
@Override
- public Predicate<T> copy(final Collection<? extends Predicate<T>> children) {
+ public Predicate<T> copy(Collection<? extends Predicate<T>> children) {
return new OrPredicate<>(children);
}
@@ -82,8 +82,8 @@
}
@Override
- public boolean match(final T object) throws OrmException {
- for (final Predicate<T> c : children) {
+ public boolean match(T object) throws OrmException {
+ for (Predicate<T> c : children) {
checkState(
c.isMatchable(),
"match invoked, but child predicate %s doesn't implement %s",
@@ -107,7 +107,7 @@
}
@Override
- public boolean equals(final Object other) {
+ public boolean equals(Object other) {
if (other == null) {
return false;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java
index aabc066..c5b2b96 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java
@@ -48,7 +48,7 @@
/** Combine the passed predicates into a single AND node. */
@SafeVarargs
- public static <T> Predicate<T> and(final Predicate<T>... that) {
+ public static <T> Predicate<T> and(Predicate<T>... that) {
if (that.length == 1) {
return that[0];
}
@@ -56,7 +56,7 @@
}
/** Combine the passed predicates into a single AND node. */
- public static <T> Predicate<T> and(final Collection<? extends Predicate<T>> that) {
+ public static <T> Predicate<T> and(Collection<? extends Predicate<T>> that) {
if (that.size() == 1) {
return Iterables.getOnlyElement(that);
}
@@ -65,7 +65,7 @@
/** Combine the passed predicates into a single OR node. */
@SafeVarargs
- public static <T> Predicate<T> or(final Predicate<T>... that) {
+ public static <T> Predicate<T> or(Predicate<T>... that) {
if (that.length == 1) {
return that[0];
}
@@ -73,7 +73,7 @@
}
/** Combine the passed predicates into a single OR node. */
- public static <T> Predicate<T> or(final Collection<? extends Predicate<T>> that) {
+ public static <T> Predicate<T> or(Collection<? extends Predicate<T>> that) {
if (that.size() == 1) {
return Iterables.getOnlyElement(that);
}
@@ -81,7 +81,7 @@
}
/** Invert the passed node. */
- public static <T> Predicate<T> not(final Predicate<T> that) {
+ public static <T> Predicate<T> not(Predicate<T> that) {
if (that instanceof NotPredicate) {
// Negate of a negate is the original predicate.
//
@@ -101,7 +101,7 @@
}
/** Same as {@code getChildren().get(i)} */
- public Predicate<T> getChild(final int i) {
+ public Predicate<T> getChild(int i) {
return getChildren().get(i);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java
index 62144ec..c1fecba 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java
@@ -48,7 +48,7 @@
*
* <pre>
* @Operator
- * public Predicate is(final String value) {
+ * public Predicate is(String value) {
* if ("starred".equals(value)) {
* return new StarredPredicate();
* }
@@ -92,7 +92,7 @@
//
Class<?> c = clazz;
while (c != QueryBuilder.class) {
- for (final Method method : c.getDeclaredMethods()) {
+ for (Method method : c.getDeclaredMethods()) {
if (method.getAnnotation(Operator.class) != null
&& Predicate.class.isAssignableFrom(method.getReturnType())
&& method.getParameterTypes().length == 1
@@ -180,7 +180,7 @@
* This may be due to a syntax error, may be due to an operator not being supported, or due to
* an invalid value being passed to a recognized operator.
*/
- public Predicate<T> parse(final String query) throws QueryParseException {
+ public Predicate<T> parse(String query) throws QueryParseException {
if (Strings.isNullOrEmpty(query)) {
throw new QueryParseException("query is empty");
}
@@ -196,7 +196,7 @@
* parser. This may be due to a syntax error, may be due to an operator not being supported,
* or due to an invalid value being passed to a recognized operator.
*/
- public List<Predicate<T>> parse(final List<String> queries) throws QueryParseException {
+ public List<Predicate<T>> parse(List<String> queries) throws QueryParseException {
List<Predicate<T>> predicates = new ArrayList<>(queries.size());
for (String query : queries) {
predicates.add(parse(query));
@@ -204,8 +204,7 @@
return predicates;
}
- private Predicate<T> toPredicate(final Tree r)
- throws QueryParseException, IllegalArgumentException {
+ private Predicate<T> toPredicate(Tree r) throws QueryParseException, IllegalArgumentException {
switch (r.getType()) {
case AND:
return and(children(r));
@@ -225,7 +224,7 @@
}
}
- private Predicate<T> operator(final String name, final Tree val) throws QueryParseException {
+ private Predicate<T> operator(String name, Tree val) throws QueryParseException {
switch (val.getType()) {
// Expand multiple values, "foo:(a b c)", as though they were written
// out with the longer form, "foo:a foo:b foo:c".
@@ -257,7 +256,7 @@
}
@SuppressWarnings("unchecked")
- private Predicate<T> operator(final String name, final String value) throws QueryParseException {
+ private Predicate<T> operator(String name, String value) throws QueryParseException {
@SuppressWarnings("rawtypes")
OperatorFactory f = opFactories.get(name);
if (f == null) {
@@ -266,7 +265,7 @@
return f.create(this, value);
}
- private Predicate<T> defaultField(final Tree r) throws QueryParseException {
+ private Predicate<T> defaultField(Tree r) throws QueryParseException {
switch (r.getType()) {
case SINGLE_WORD:
case EXACT_PHRASE:
@@ -291,12 +290,11 @@
* @return predicate representing this value.
* @throws QueryParseException the parser does not recognize this value.
*/
- protected Predicate<T> defaultField(final String value) throws QueryParseException {
+ protected Predicate<T> defaultField(String value) throws QueryParseException {
throw error("Unsupported query:" + value);
}
- private List<Predicate<T>> children(final Tree r)
- throws QueryParseException, IllegalArgumentException {
+ private List<Predicate<T>> children(Tree r) throws QueryParseException, IllegalArgumentException {
List<Predicate<T>> p = new ArrayList<>(r.getChildCount());
for (int i = 0; i < r.getChildCount(); i++) {
p.add(toPredicate(r.getChild(i)));
@@ -304,7 +302,7 @@
return p;
}
- private Tree onlyChildOf(final Tree r) throws QueryParseException {
+ private Tree onlyChildOf(Tree r) throws QueryParseException {
if (r.getChildCount() != 1) {
throw error("Expected exactly one child: " + r);
}
@@ -329,7 +327,7 @@
private final String name;
private final Method method;
- ReflectionFactory(final String name, final Method method) {
+ ReflectionFactory(String name, Method method) {
this.name = name;
this.method = method;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AgePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AgePredicate.java
index a5f4965..6310665 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AgePredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AgePredicate.java
@@ -46,7 +46,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
return change != null && change.getLastUpdatedOn().getTime() <= cut;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AssigneePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AssigneePredicate.java
index 848fd09..63f7467 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AssigneePredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AssigneePredicate.java
@@ -27,7 +27,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
if (id.get() == ChangeField.NO_ASSIGNEE) {
Account.Id assignee = object.change().getAssignee();
return assignee == null;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
index 632ec04..fa08f53 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
@@ -43,7 +43,7 @@
}
@Override
- public boolean match(final ChangeData cd) throws OrmException {
+ public boolean match(ChangeData cd) throws OrmException {
if (cd.fastIsVisibleTo(user)) {
return true;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java
index 562608e..e9564bd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java
@@ -96,7 +96,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
return change != null && status.equals(change.getStatus());
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java
index 3fac217..d2537ca 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java
@@ -35,7 +35,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
String id = getValue().toLowerCase();
for (PatchSet p : object.patchSets()) {
if (equals(p, id)) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
index 4d8c6a1..9e8f77b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
@@ -64,7 +64,7 @@
List<Predicate<ChangeData>> changePredicates = Lists.newArrayListWithCapacity(changes.size());
final Provider<ReviewDb> db = args.db;
- for (final Change c : changes) {
+ for (Change c : changes) {
final ChangeDataCache changeDataCache =
new ChangeDataCache(c, db, args.changeDataFactory, args.projectCache);
List<String> files = listFiles(c, args, changeDataCache);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DestinationPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DestinationPredicate.java
index 4e8d30d..7f969e1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DestinationPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DestinationPredicate.java
@@ -28,7 +28,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java
index dc85ece..138cce5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java
@@ -25,7 +25,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java
index 5f3b621..c6908dc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java
@@ -33,7 +33,7 @@
}
@Override
- public boolean match(final ChangeData cd) throws OrmException {
+ public boolean match(ChangeData cd) throws OrmException {
Change change = cd.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
index a348d48..bea5688 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
@@ -24,7 +24,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
for (String hashtag : object.notes().load().getHashtags()) {
if (hashtag.equalsIgnoreCase(getValue())) {
return true;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
index fa2f5fe..42e60a4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
@@ -169,7 +169,7 @@
}
private Iterable<ChangeData> byCommitsOnBranchNotMergedFromDatabase(
- Repository repo, final ReviewDb db, final Branch.NameKey branch, Collection<String> hashes)
+ Repository repo, ReviewDb db, Branch.NameKey branch, Collection<String> hashes)
throws OrmException, IOException {
Set<Change.Id> changeIds = Sets.newHashSetWithExpectedSize(hashes.size());
String lastPrefix = null;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
index 7cc8b31..fe4d4e1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
@@ -28,7 +28,7 @@
}
@Override
- public boolean match(final ChangeData object) {
+ public boolean match(ChangeData object) {
return id.equals(object.getId());
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerPredicate.java
index 5fd1ca0..ff494fc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerPredicate.java
@@ -32,7 +32,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
return change != null && id.equals(change.getOwner());
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java
index f828970..fec7f26 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java
@@ -34,7 +34,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
final Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPredicate.java
index ef25ddb..09a46a4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPredicate.java
@@ -29,7 +29,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RefPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RefPredicate.java
index b8bece9..c9314e4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RefPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RefPredicate.java
@@ -24,7 +24,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java
index cf78c57..1efc77d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java
@@ -39,7 +39,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexRefPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexRefPredicate.java
index ac7af9b..92abafb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexRefPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexRefPredicate.java
@@ -38,7 +38,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java
index 8a9f8cd..2b58c88 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java
@@ -39,7 +39,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
Change change = object.change();
if (change == null || change.getTopic() == null) {
return false;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
index df28de3..11f9d89 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
@@ -34,7 +34,7 @@
}
@Override
- public boolean match(final ChangeData object) throws OrmException {
+ public boolean match(ChangeData object) throws OrmException {
for (Account.Id accountId : object.reviewers().all()) {
IdentifiedUser reviewer = userFactory.create(accountId);
if (reviewer.getEffectiveGroups().contains(uuid)) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java
index 9b8b736..fcf8c1f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java
@@ -26,7 +26,7 @@
private Config cfg;
@Inject
- public DB2(@GerritServerConfig final Config cfg) {
+ public DB2(@GerritServerConfig Config cfg) {
super("com.ibm.db2.jcc.DB2Driver");
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java
index c5bd140..67f6894 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java
@@ -92,7 +92,7 @@
MULTI_USER
}
- private DataSource open(final Config cfg, final Context context, final DataSourceType dst) {
+ private DataSource open(Config cfg, Context context, DataSourceType dst) {
ConfigSection dbs = new ConfigSection(cfg, "database");
String driver = dbs.optional("driver");
if (Strings.isNullOrEmpty(driver)) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java
index 3cffdb1..840eaf0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java
@@ -26,7 +26,7 @@
private final SitePaths site;
@Inject
- H2(final SitePaths site, @GerritServerConfig final Config cfg) {
+ H2(SitePaths site, @GerritServerConfig Config cfg) {
super("org.h2.Driver");
this.cfg = cfg;
this.site = site;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
index 26c94e0..08bf5d8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
@@ -28,7 +28,7 @@
private Config cfg;
@Inject
- HANA(@GerritServerConfig final Config cfg) {
+ HANA(@GerritServerConfig Config cfg) {
super("com.sap.db.jdbc.Driver");
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java
index a1df850..d188df4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java
@@ -24,7 +24,7 @@
protected final Config cfg;
@Inject
- JDBC(@GerritServerConfig final Config cfg) {
+ JDBC(@GerritServerConfig Config cfg) {
super(ConfigUtil.getRequired(cfg, "database", "driver"));
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java
index ca5a60d..d552eb65 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java
@@ -27,7 +27,7 @@
private Config cfg;
@Inject
- MaxDb(@GerritServerConfig final Config cfg) {
+ MaxDb(@GerritServerConfig Config cfg) {
super("com.sap.dbtech.jdbc.DriverSapDB");
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
index fc8e176..9fc6896 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
@@ -27,7 +27,7 @@
private Config cfg;
@Inject
- MySql(@GerritServerConfig final Config cfg) {
+ MySql(@GerritServerConfig Config cfg) {
super("com.mysql.jdbc.Driver");
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java
index e86f788..4ff7243 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java
@@ -26,7 +26,7 @@
private Config cfg;
@Inject
- public Oracle(@GerritServerConfig final Config cfg) {
+ public Oracle(@GerritServerConfig Config cfg) {
super("oracle.jdbc.driver.OracleDriver");
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java
index 23e7625..d6aee94 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java
@@ -28,7 +28,7 @@
private Config cfg;
@Inject
- PostgreSQL(@GerritServerConfig final Config cfg) {
+ PostgreSQL(@GerritServerConfig Config cfg) {
super("org.postgresql.Driver");
this.cfg = cfg;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
index 26ff0d4..48ff646 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
@@ -76,7 +76,7 @@
indexCollection = ic;
}
- public void create(final ReviewDb db) throws OrmException, IOException, ConfigInvalidException {
+ public void create(ReviewDb db) throws OrmException, IOException, ConfigInvalidException {
final JdbcSchema jdbc = (JdbcSchema) db;
try (JdbcExecutor e = new JdbcExecutor(jdbc)) {
jdbc.updateSchema(e);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java
index 084d63b..266fbaa 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java
@@ -62,7 +62,7 @@
this.updater = buildInjector(parent).getProvider(SchemaVersion.class);
}
- private static Injector buildInjector(final Injector parent) {
+ private static Injector buildInjector(Injector parent) {
// Use DEVELOPMENT mode to allow lazy initialization of the
// graph. This avoids touching ancient schema versions that
// are behind this installation's current version.
@@ -101,7 +101,7 @@
});
}
- public void update(final UpdateUI ui) throws OrmException {
+ public void update(UpdateUI ui) throws OrmException {
try (ReviewDb db = ReviewDbUtil.unwrapDb(schema.open())) {
final SchemaVersion u = updater.get();
@@ -130,7 +130,7 @@
return updater.get();
}
- private CurrentSchemaVersion getSchemaVersion(final ReviewDb db) {
+ private CurrentSchemaVersion getSchemaVersion(ReviewDb db) {
try {
return db.schemaVersion().get(new CurrentSchemaVersion.Key());
} catch (OrmException e) {
@@ -138,7 +138,7 @@
}
}
- private void updateSystemConfig(final ReviewDb db) throws OrmException {
+ private void updateSystemConfig(ReviewDb db) throws OrmException {
final SystemConfig sc = db.systemConfig().get(new SystemConfig.Key());
if (sc == null) {
throw new OrmException("No record in system_config table");
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
index 7fe89cd..93aaf68 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
@@ -44,7 +44,7 @@
private final Provider<? extends SchemaVersion> prior;
private final int versionNbr;
- protected SchemaVersion(final Provider<? extends SchemaVersion> prior) {
+ protected SchemaVersion(Provider<? extends SchemaVersion> prior) {
this.prior = prior;
this.versionNbr = guessVersion(getClass());
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java
index 2f3d09f..bdc15f4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java
@@ -85,7 +85,7 @@
@Override
public void stop() {}
- private CurrentSchemaVersion getSchemaVersion(final ReviewDb db) {
+ private CurrentSchemaVersion getSchemaVersion(ReviewDb db) {
try {
return db.schemaVersion().get(new CurrentSchemaVersion.Key());
} catch (OrmException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java
index adee5fc..f4cba98 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java
@@ -39,10 +39,10 @@
static final ScriptRunner NOOP =
new ScriptRunner(null, null) {
@Override
- void run(final ReviewDb db) {}
+ void run(ReviewDb db) {}
};
- ScriptRunner(final String scriptName, final InputStream script) {
+ ScriptRunner(String scriptName, InputStream script) {
this.name = scriptName;
try {
this.commands = script != null ? parse(script) : null;
@@ -51,7 +51,7 @@
}
}
- void run(final ReviewDb db) throws OrmException {
+ void run(ReviewDb db) throws OrmException {
try {
final JdbcSchema schema = (JdbcSchema) db;
final Connection c = schema.getConnection();
@@ -73,7 +73,7 @@
}
}
- private List<String> parse(final InputStream in) throws IOException {
+ private List<String> parse(InputStream in) throws IOException {
try (BufferedReader br = new BufferedReader(new InputStreamReader(in, UTF_8))) {
String delimiter = ";";
List<String> commands = new ArrayList<>();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java
index b729b09..02ff159 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java
@@ -130,7 +130,7 @@
}
}
- private static void saveSecure(final FileBasedConfig sec) throws IOException {
+ private static void saveSecure(FileBasedConfig sec) throws IOException {
if (FileUtil.modified(sec)) {
final byte[] out = Constants.encode(sec.toText());
final File path = sec.getFile();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java
index 70a6fce..0e5b2f8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java
@@ -53,7 +53,7 @@
return listen;
}
- for (final String desc : want) {
+ for (String desc : want) {
try {
listen.add(SocketUtil.resolve(desc, DEFAULT_PORT));
} catch (IllegalArgumentException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java
index e4d2890..a9a22d9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java
@@ -52,7 +52,7 @@
}
/** A very simple bit permutation to mask a simple incrementer. */
- public static int mix(final int salt, final int in) {
+ public static int mix(int salt, int in) {
short v0 = hi16(in);
short v1 = lo16(in);
v0 += ((v1 << 2) + 0 ^ v1) + (salt ^ (v1 >>> 3)) + 1;
@@ -61,7 +61,7 @@
}
/* For testing only. */
- static int unmix(final int in) {
+ static int unmix(int in) {
short v0 = hi16(in);
short v1 = lo16(in);
v1 -= ((v0 << 2) + 2 ^ v0) + (salt ^ (v0 >>> 3)) + 3;
@@ -69,7 +69,7 @@
return result(v0, v1);
}
- private static short hi16(final int in) {
+ private static short hi16(int in) {
return (short)
( //
((in >>> 24 & 0xff))
@@ -78,7 +78,7 @@
);
}
- private static short lo16(final int in) {
+ private static short lo16(int in) {
return (short)
( //
((in >>> 8 & 0xff))
@@ -87,7 +87,7 @@
);
}
- private static int result(final short v0, final short v1) {
+ private static int result(short v0, short v1) {
return ((v0 & 0xff) << 24)
| //
(((v0 >>> 8) & 0xff) << 16)
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
index 4019851..f243726 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
@@ -52,7 +52,7 @@
return compare(a.getName(), b.getName());
}
- public int compare(final String pattern1, final String pattern2) {
+ public int compare(String pattern1, String pattern2) {
int cmp = distance(pattern1) - distance(pattern2);
if (cmp == 0) {
boolean p1_finite = finite(pattern1);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java
index a1333c6..9c83549 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java
@@ -29,6 +29,7 @@
import com.google.inject.servlet.ServletScopes;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
/**
* Base class for propagating request-scoped data between threads.
@@ -64,10 +65,9 @@
* request state when the returned Callable is invoked. The method must be called in a request
* scope and the returned Callable may only be invoked in a thread that is not already in a
* request scope or is in the same request scope. The returned Callable will inherit toString()
- * from the passed in Callable. A {@link com.google.gerrit.server.git.WorkQueue.Executor} does not
- * accept a Callable, so there is no ProjectCallable implementation. Implementations of this
- * method must be consistent with Guice's {@link ServletScopes#continueRequest(Callable,
- * java.util.Map)}.
+ * from the passed in Callable. A {@link ScheduledThreadPoolExecutor} does not accept a Callable,
+ * so there is no ProjectCallable implementation. Implementations of this method must be
+ * consistent with Guice's {@link ServletScopes#continueRequest(Callable, java.util.Map)}.
*
* <p>There are some limitations:
*
@@ -82,7 +82,7 @@
* @return a new Callable which will execute in the current request scope.
*/
@SuppressWarnings("javadoc") // See GuiceRequestScopePropagator#wrapImpl
- public final <T> Callable<T> wrap(final Callable<T> callable) {
+ public final <T> Callable<T> wrap(Callable<T> callable) {
final RequestContext callerContext = checkNotNull(local.getContext());
final Callable<T> wrapped = wrapImpl(context(callerContext, cleanup(callable)));
return new Callable<T>() {
@@ -114,7 +114,7 @@
* @param runnable the Runnable to wrap.
* @return a new Runnable which will execute in the current request scope.
*/
- public final Runnable wrap(final Runnable runnable) {
+ public final Runnable wrap(Runnable runnable) {
final Callable<Object> wrapped = wrap(Executors.callable(runnable));
if (runnable instanceof ProjectRunnable) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java
index 5b22f73..afa2aee 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java
@@ -22,12 +22,12 @@
public final class SocketUtil {
/** True if this InetAddress is a raw IPv6 in dotted quad notation. */
- public static boolean isIPv6(final InetAddress ip) {
+ public static boolean isIPv6(InetAddress ip) {
return ip instanceof Inet6Address && ip.getHostName().equals(ip.getHostAddress());
}
/** Get the name or IP address, or {@code *} if this address is a wildcard IP. */
- public static String hostname(final InetSocketAddress addr) {
+ public static String hostname(InetSocketAddress addr) {
if (addr.getAddress() != null) {
if (addr.getAddress().isAnyLocalAddress()) {
return "*";
@@ -38,7 +38,7 @@
}
/** Format an address string into {@code host:port} or {@code *:port} syntax. */
- public static String format(final SocketAddress s, final int defaultPort) {
+ public static String format(SocketAddress s, int defaultPort) {
if (s instanceof InetSocketAddress) {
final InetSocketAddress addr = (InetSocketAddress) s;
if (addr.getPort() == defaultPort) {
@@ -62,7 +62,7 @@
}
/** Parse an address string such as {@code host:port} or {@code *:port}. */
- public static InetSocketAddress parse(final String desc, final int defaultPort) {
+ public static InetSocketAddress parse(String desc, int defaultPort) {
String hostStr;
String portStr;
@@ -109,7 +109,7 @@
}
/** Parse and resolve an address string, looking up the IP address. */
- public static InetSocketAddress resolve(final String desc, final int defaultPort) {
+ public static InetSocketAddress resolve(String desc, int defaultPort) {
final InetSocketAddress addr = parse(desc, defaultPort);
if (addr.getAddress() != null && addr.getAddress().isAnyLocalAddress()) {
return addr;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java
index 61c863b..6de2fef 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java
@@ -56,7 +56,7 @@
public Set<SubmoduleSubscription> parseAllSections() {
Set<SubmoduleSubscription> parsedSubscriptions = new HashSet<>();
- for (final String id : bbc.getSubsections("submodule")) {
+ for (String id : bbc.getSubsections("submodule")) {
final SubmoduleSubscription subscription = parse(id);
if (subscription != null) {
parsedSubscriptions.add(subscription);
@@ -65,7 +65,7 @@
return parsedSubscriptions;
}
- private SubmoduleSubscription parse(final String id) {
+ private SubmoduleSubscription parse(String id) {
final String url = bbc.getString("submodule", id, "url");
final String path = bbc.getString("submodule", id, "path");
String branch = bbc.getString("submodule", id, "branch");
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java
index 65fbfd6..81a2df2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java
@@ -46,7 +46,7 @@
private final Config config;
@Inject
- public SystemLog(final SitePaths site, @GerritServerConfig Config config) {
+ public SystemLog(SitePaths site, @GerritServerConfig Config config) {
this.site = site;
this.config = config;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java
index 8d511f3..49d4a55 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java
@@ -36,11 +36,11 @@
private final PrintWriter stdout;
private String currentTabSeparator = " ";
- public TreeFormatter(final PrintWriter stdout) {
+ public TreeFormatter(PrintWriter stdout) {
this.stdout = stdout;
}
- public void printTree(final SortedSet<? extends TreeNode> rootNodes) {
+ public void printTree(SortedSet<? extends TreeNode> rootNodes) {
if (rootNodes.isEmpty()) {
return;
}
@@ -50,7 +50,7 @@
currentTabSeparator = DEFAULT_TAB_SEPARATOR;
int i = 0;
final int size = rootNodes.size();
- for (final TreeNode rootNode : rootNodes) {
+ for (TreeNode rootNode : rootNodes) {
final boolean isLastRoot = ++i == size;
if (isLastRoot) {
currentTabSeparator = " ";
@@ -60,28 +60,28 @@
}
}
- public void printTree(final TreeNode rootNode) {
+ public void printTree(TreeNode rootNode) {
printTree(rootNode, 0, true);
}
- private void printTree(final TreeNode node, final int level, final boolean isLast) {
+ private void printTree(TreeNode node, int level, boolean isLast) {
printNode(node, level, isLast);
final SortedSet<? extends TreeNode> childNodes = node.getChildren();
int i = 0;
final int size = childNodes.size();
- for (final TreeNode childNode : childNodes) {
+ for (TreeNode childNode : childNodes) {
final boolean isLastChild = ++i == size;
printTree(childNode, level + 1, isLastChild);
}
}
- private void printIndention(final int level) {
+ private void printIndention(int level) {
if (level > 0) {
stdout.print(String.format("%-" + 4 * level + "s", currentTabSeparator));
}
}
- private void printNode(final TreeNode node, final int level, final boolean isLast) {
+ private void printNode(TreeNode node, int level, boolean isLast) {
printIndention(level);
stdout.print(isLast ? LAST_NODE_PREFIX : NODE_PREFIX);
if (node.isVisible()) {
diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java b/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java
index 95be5cb..95c4aaef 100644
--- a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java
+++ b/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java
@@ -141,7 +141,7 @@
return Pattern.compile(term.name(), Pattern.MULTILINE);
}
- private Text load(final ObjectId tree, final String path, final ObjectReader reader)
+ private Text load(ObjectId tree, String path, ObjectReader reader)
throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException,
IOException {
if (path == null) {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
index 355f775..997fda9 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
@@ -57,7 +57,7 @@
assertThat(e.submitter.get().email).isEqualTo(accountAttribute.email);
}
- private <T> Supplier<T> createSupplier(final T value) {
+ private <T> Supplier<T> createSupplier(T value) {
return Suppliers.memoize(
new Supplier<T>() {
@Override
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java
index 800413b..fae8559 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java
@@ -129,14 +129,14 @@
assertOutput(b(7, 'c', 'o', 'f', 'f', 'e', 'e', '4'), out);
}
- private static void assertOutput(final byte[] expect, final ByteArrayOutputStream out) {
+ private static void assertOutput(byte[] expect, ByteArrayOutputStream out) {
final byte[] buf = out.toByteArray();
for (int i = 0; i < expect.length; i++) {
assertEquals(expect[i], buf[i]);
}
}
- private static InputStream r(final byte[] buf) {
+ private static InputStream r(byte[] buf) {
return new ByteArrayInputStream(buf);
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
index 2909df7..42e8a8e 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
@@ -96,7 +96,7 @@
assertInvalid("a <@a>");
}
- private void assertInvalid(final String in) {
+ private void assertInvalid(String in) {
try {
Address.parse(in);
fail("Expected IllegalArgumentException for " + in);
@@ -151,7 +151,7 @@
assertThat(format(null, "a,b@a")).isEqualTo("<a,b@a>");
}
- private static String format(final String name, final String email) {
+ private static String format(String name, String email) {
return new Address(name, email).toHeaderString();
}
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
index a7b37a8..aaf723a 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
@@ -51,7 +51,7 @@
return new FromAddressGeneratorProvider(config, "Anonymous Coward", ident, accountCache).get();
}
- private void setFrom(final String newFrom) {
+ private void setFrom(String newFrom) {
config.setString("sendemail", null, "from", newFrom);
}
@@ -366,18 +366,18 @@
verify(accountCache);
}
- private Account.Id user(final String name, final String email) {
+ private Account.Id user(String name, String email) {
final AccountState s = makeUser(name, email);
expect(accountCache.get(eq(s.getAccount().getId()))).andReturn(s);
return s.getAccount().getId();
}
- private Account.Id userNoLookup(final String name, final String email) {
+ private Account.Id userNoLookup(String name, String email) {
final AccountState s = makeUser(name, email);
return s.getAccount().getId();
}
- private AccountState makeUser(final String name, final String email) {
+ private AccountState makeUser(String name, String email) {
final Account.Id userId = new Account.Id(42);
final Account account = new Account(userId, TimeUtil.nowTs());
account.setFullName(name);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
index ebd5b49..51bff6c 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
@@ -141,16 +141,18 @@
assertThat(u.canPushToAtLeastOneRef()).named("can upload").isEqualTo(Capable.OK);
}
- private void assertCanUpload(String ref, ProjectControl u) {
- assertThat(u.controlForRef(ref).canUpload()).named("can upload " + ref).isTrue();
+ private void assertCreateChange(String ref, ProjectControl u) {
+ boolean create = u.asForProject().ref(ref).testOrFalse(RefPermission.CREATE_CHANGE);
+ assertThat(create).named("can create change " + ref).isTrue();
}
private void assertCannotUpload(ProjectControl u) {
assertThat(u.canPushToAtLeastOneRef()).named("cannot upload").isNotEqualTo(Capable.OK);
}
- private void assertCannotUpload(String ref, ProjectControl u) {
- assertThat(u.controlForRef(ref).canUpload()).named("cannot upload " + ref).isFalse();
+ private void assertCannotCreateChange(String ref, ProjectControl u) {
+ boolean create = u.asForProject().ref(ref).testOrFalse(RefPermission.CREATE_CHANGE);
+ assertThat(create).named("cannot create change " + ref).isFalse();
}
private void assertBlocked(String p, String ref, ProjectControl u) {
@@ -405,8 +407,8 @@
ProjectControl u = user(local);
assertCanUpload(u);
- assertCanUpload("refs/heads/master", u);
- assertCannotUpload("refs/heads/foobar", u);
+ assertCreateChange("refs/heads/master", u);
+ assertCannotCreateChange("refs/heads/foobar", u);
}
@Test
@@ -415,7 +417,7 @@
block(parent, PUSH, ANONYMOUS_USERS, "refs/drafts/*");
ProjectControl u = user(local);
- assertCanUpload("refs/heads/master", u);
+ assertCreateChange("refs/heads/master", u);
assertBlocked(PUSH, "refs/drafts/refs/heads/master", u);
}
@@ -438,8 +440,8 @@
ProjectControl u = user(local);
assertCanUpload(u);
- assertCanUpload("refs/heads/master", u);
- assertCanUpload("refs/heads/foobar", u);
+ assertCreateChange("refs/heads/master", u);
+ assertCreateChange("refs/heads/foobar", u);
}
@Test
@@ -508,7 +510,7 @@
ProjectControl u = user(local);
assertCannotUpload(u);
- assertCannotUpload("refs/heads/master", u);
+ assertCannotCreateChange("refs/heads/master", u);
}
@Test
@@ -904,11 +906,9 @@
Collections.<AccountGroup.UUID>emptySet(),
projectCache,
sectionSorter,
- null,
changeControlFactory,
- null,
+ null, // refFilter
queryProvider,
- null,
canonicalWebUrl,
new MockUser(name, memberOf),
newProjectState(local),
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java
index 4c0bcc0..3a38a50 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java
@@ -31,7 +31,7 @@
assertSingleWord("project", "tools/*", r);
}
- private static void assertSingleWord(final String name, final String value, final Tree r) {
+ private static void assertSingleWord(String name, String value, Tree r) {
assertEquals(QueryParser.FIELD_NAME, r.getType());
assertEquals(name, r.getText());
assertEquals(1, r.getChildCount());
@@ -41,7 +41,7 @@
assertEquals(0, c.getChildCount());
}
- private static Tree parse(final String str) throws QueryParseException {
+ private static Tree parse(String str) throws QueryParseException {
return QueryParser.parse(str);
}
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
index f53a59b..98160a9 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
@@ -621,11 +621,11 @@
"RealTag: abc\n"));
}
- private void hookDoesNotModify(final String in) throws Exception {
+ private void hookDoesNotModify(String in) throws Exception {
assertEquals(in, call(in));
}
- private String call(final String body) throws Exception {
+ private String call(String body) throws Exception {
final File tmp = write(body);
try {
final File hook = getHook("commit-msg");
@@ -636,7 +636,7 @@
}
}
- private DirCacheEntry file(final String name) throws IOException {
+ private DirCacheEntry file(String name) throws IOException {
try (ObjectInserter oi = repository.newObjectInserter()) {
final DirCacheEntry e = new DirCacheEntry(name);
e.setFileMode(FileMode.REGULAR_FILE);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java
index 3d4a1a0..ec2057e 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java
@@ -94,7 +94,7 @@
cleanup.clear();
}
- protected File getHook(final String name) throws IOException {
+ protected File getHook(String name) throws IOException {
File hook = hooks.get(name);
if (hook != null) {
return hook;
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
index dd42b67..8f37c20 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
@@ -33,7 +33,7 @@
public TestRule testRunner =
new TestRule() {
@Override
- public Statement apply(final Statement base, final Description description) {
+ public Statement apply(Statement base, Description description) {
return new Statement() {
@Override
public void evaluate() throws Throwable {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java
index bff27ca..21b21ef 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java
@@ -65,7 +65,7 @@
}
/** Drop the database from memory; does nothing if the instance was null. */
- public static void drop(final InMemoryDatabase db) {
+ public static void drop(InMemoryDatabase db) {
if (db != null) {
db.drop();
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java
index 459bccd..eadbaae 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java
@@ -81,7 +81,7 @@
return ps;
}
- public static ChangeUpdate newUpdate(Injector injector, Change c, final CurrentUser user)
+ public static ChangeUpdate newUpdate(Injector injector, Change c, CurrentUser user)
throws Exception {
injector =
injector.createChildInjector(
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java
index dc96e18..318e67f 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java
@@ -48,7 +48,7 @@
protected Project project;
@Override
- public void start(final Environment env) {
+ public void start(Environment env) {
Context ctx = context.subContext(newSession(), context.getCommandLine());
final Context old = sshScope.set(ctx);
try {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
index dbf5b10..6923ad1 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
@@ -28,7 +28,6 @@
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.RequestCleanup;
import com.google.gerrit.server.git.ProjectRunnable;
-import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.CancelableRunnable;
import com.google.gerrit.server.permissions.GlobalPermission;
import com.google.gerrit.server.permissions.PermissionBackend;
@@ -50,6 +49,7 @@
import java.io.StringWriter;
import java.nio.charset.Charset;
import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.sshd.common.SshException;
import org.apache.sshd.server.Command;
@@ -85,7 +85,7 @@
@Inject private RequestCleanup cleanup;
- @Inject @CommandExecutor private WorkQueue.Executor executor;
+ @Inject @CommandExecutor private ScheduledThreadPoolExecutor executor;
@Inject private PermissionBackend permissionBackend;
@Inject private CurrentUser user;
@@ -115,22 +115,22 @@
}
@Override
- public void setInputStream(final InputStream in) {
+ public void setInputStream(InputStream in) {
this.in = in;
}
@Override
- public void setOutputStream(final OutputStream out) {
+ public void setOutputStream(OutputStream out) {
this.out = out;
}
@Override
- public void setErrorStream(final OutputStream err) {
+ public void setErrorStream(OutputStream err) {
this.err = err;
}
@Override
- public void setExitCallback(final ExitCallback callback) {
+ public void setExitCallback(ExitCallback callback) {
this.exit = callback;
}
@@ -143,7 +143,7 @@
return commandName;
}
- void setName(final String prefix) {
+ void setName(String prefix) {
this.commandName = prefix;
}
@@ -151,7 +151,7 @@
return argv;
}
- public void setArguments(final String[] argv) {
+ public void setArguments(String[] argv) {
this.argv = argv;
}
@@ -172,7 +172,7 @@
*
* @param cmd the command that will receive the current state.
*/
- protected void provideStateTo(final Command cmd) {
+ protected void provideStateTo(Command cmd) {
cmd.setInputStream(in);
cmd.setOutputStream(out);
cmd.setErrorStream(err);
@@ -253,7 +253,7 @@
*
* @param thunk the runnable to execute on the thread, performing the command's logic.
*/
- protected void startThread(final CommandRunnable thunk) {
+ protected void startThread(CommandRunnable thunk) {
final TaskThunk tt = new TaskThunk(thunk);
if (isAdminHighPriorityCommand()) {
@@ -288,7 +288,7 @@
*
* @param rc exit code for the remote client.
*/
- protected void onExit(final int rc) {
+ protected void onExit(int rc) {
exit.onExit(rc);
if (cleanup != null) {
cleanup.run();
@@ -296,11 +296,11 @@
}
/** Wrap the supplied output stream in a UTF-8 encoded PrintWriter. */
- protected static PrintWriter toPrintWriter(final OutputStream o) {
+ protected static PrintWriter toPrintWriter(OutputStream o) {
return new PrintWriter(new BufferedWriter(new OutputStreamWriter(o, ENC)));
}
- private int handleError(final Throwable e) {
+ private int handleError(Throwable e) {
if ((e.getClass() == IOException.class && "Pipe closed".equals(e.getMessage()))
|| //
(e.getClass() == SshException.class && "Already closed".equals(e.getMessage()))
@@ -374,7 +374,7 @@
private final String taskName;
private Project.NameKey projectName;
- private TaskThunk(final CommandRunnable thunk) {
+ private TaskThunk(CommandRunnable thunk) {
this.thunk = thunk;
StringBuilder m = new StringBuilder();
@@ -496,7 +496,7 @@
* command. Should be between 1 and 255, inclusive.
* @param msg message to also send to the client's stderr.
*/
- public Failure(final int exitCode, final String msg) {
+ public Failure(int exitCode, String msg) {
this(exitCode, msg, null);
}
@@ -509,7 +509,7 @@
* @param why stack trace to include in the server's log, but is not sent to the client's
* stderr.
*/
- public Failure(final int exitCode, final String msg, final Throwable why) {
+ public Failure(int exitCode, String msg, Throwable why) {
super(msg, why);
this.exitCode = exitCode;
}
@@ -524,7 +524,7 @@
*
* @param msg message to also send to the client's stderr.
*/
- public UnloggedFailure(final String msg) {
+ public UnloggedFailure(String msg) {
this(1, msg);
}
@@ -535,7 +535,7 @@
* command. Should be between 1 and 255, inclusive.
* @param msg message to also send to the client's stderr.
*/
- public UnloggedFailure(final int exitCode, final String msg) {
+ public UnloggedFailure(int exitCode, String msg) {
this(exitCode, msg, null);
}
@@ -548,7 +548,7 @@
* @param why stack trace to include in the server's log, but is not sent to the client's
* stderr.
*/
- public UnloggedFailure(final int exitCode, final String msg, final Throwable why) {
+ public UnloggedFailure(int exitCode, String msg, Throwable why) {
super(exitCode, msg, why);
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutor.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutor.java
index fa21c58..4fd55a1 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutor.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutor.java
@@ -16,11 +16,11 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import com.google.gerrit.server.git.WorkQueue.Executor;
import com.google.inject.BindingAnnotation;
import java.lang.annotation.Retention;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
-/** Marker on {@link Executor} used by SSH threads. */
+/** Marker on {@link ScheduledThreadPoolExecutor} used by SSH threads. */
@Retention(RUNTIME)
@BindingAnnotation
public @interface CommandExecutor {}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java
index 8c47144..c807acf 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java
@@ -16,11 +16,11 @@
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.git.QueueProvider;
-import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import com.google.inject.Provider;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
-class CommandExecutorProvider implements Provider<WorkQueue.Executor> {
+class CommandExecutorProvider implements Provider<ScheduledThreadPoolExecutor> {
private final QueueProvider queues;
private final CurrentUser user;
@@ -32,7 +32,7 @@
}
@Override
- public WorkQueue.Executor get() {
+ public ScheduledThreadPoolExecutor get() {
return queues.getQueue(user.getCapabilities().getQueueType());
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java
index 075dca3..5a93898 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java
@@ -19,6 +19,7 @@
import com.google.gerrit.server.git.QueueProvider;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import org.eclipse.jgit.lib.Config;
@@ -26,8 +27,8 @@
private int poolSize;
private final int batchThreads;
- private final WorkQueue.Executor interactiveExecutor;
- private final WorkQueue.Executor batchExecutor;
+ private final ScheduledThreadPoolExecutor interactiveExecutor;
+ private final ScheduledThreadPoolExecutor batchExecutor;
@Inject
public CommandExecutorQueueProvider(
@@ -51,12 +52,12 @@
setThreadFactory(interactiveExecutor);
}
- private void setThreadFactory(WorkQueue.Executor executor) {
+ private void setThreadFactory(ScheduledThreadPoolExecutor executor) {
final ThreadFactory parent = executor.getThreadFactory();
executor.setThreadFactory(
new ThreadFactory() {
@Override
- public Thread newThread(final Runnable task) {
+ public Thread newThread(Runnable task) {
final Thread t = parent.newThread(task);
t.setPriority(Thread.MIN_PRIORITY);
return t;
@@ -65,7 +66,7 @@
}
@Override
- public WorkQueue.Executor getQueue(QueueType type) {
+ public ScheduledThreadPoolExecutor getQueue(QueueType type) {
switch (type) {
case INTERACTIVE:
return interactiveExecutor;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java
index 66b8fe6..0287ceb 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java
@@ -60,11 +60,11 @@
@Inject
CommandFactoryProvider(
- @CommandName(Commands.ROOT) final DispatchCommandProvider d,
- @GerritServerConfig final Config cfg,
- final WorkQueue workQueue,
- final SshLog l,
- final SshScope s,
+ @CommandName(Commands.ROOT) DispatchCommandProvider d,
+ @GerritServerConfig Config cfg,
+ WorkQueue workQueue,
+ SshLog l,
+ SshScope s,
SchemaFactory<ReviewDb> sf) {
dispatcher = d;
log = l;
@@ -93,7 +93,7 @@
public CommandFactory get() {
return new CommandFactory() {
@Override
- public Command createCommand(final String requestCommand) {
+ public Command createCommand(String requestCommand) {
return new Trampoline(requestCommand);
}
};
@@ -112,7 +112,7 @@
private final AtomicBoolean logged;
private final AtomicReference<Future<?>> task;
- Trampoline(final String cmdLine) {
+ Trampoline(String cmdLine) {
commandLine = cmdLine;
argv = split(cmdLine);
logged = new AtomicBoolean();
@@ -120,33 +120,33 @@
}
@Override
- public void setInputStream(final InputStream in) {
+ public void setInputStream(InputStream in) {
this.in = in;
}
@Override
- public void setOutputStream(final OutputStream out) {
+ public void setOutputStream(OutputStream out) {
this.out = out;
}
@Override
- public void setErrorStream(final OutputStream err) {
+ public void setErrorStream(OutputStream err) {
this.err = err;
}
@Override
- public void setExitCallback(final ExitCallback callback) {
+ public void setExitCallback(ExitCallback callback) {
this.exit = callback;
}
@Override
- public void setSession(final ServerSession session) {
+ public void setSession(ServerSession session) {
final SshSession s = session.getAttribute(SshSession.KEY);
this.ctx = sshScope.newContext(schemaFactory, s, commandLine);
}
@Override
- public void start(final Environment env) throws IOException {
+ public void start(Environment env) throws IOException {
this.env = env;
final Context ctx = this.ctx;
task.set(
@@ -203,7 +203,7 @@
}
}
- private int translateExit(final int rc) {
+ private int translateExit(int rc) {
switch (rc) {
case BaseCommand.STATUS_NOT_ADMIN:
return 1;
@@ -219,7 +219,7 @@
}
}
- private void log(final int rc) {
+ private void log(int rc) {
if (logged.compareAndSet(false, true)) {
log.onExecute(cmd, rc, ctx.getSession());
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java
index 54ffba6..93aab0b 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java
@@ -28,7 +28,7 @@
* @param name the name of the command the client will provide in order to call the command.
* @return a binding that must be bound to a non-singleton provider for a {@link Command} object.
*/
- protected LinkedBindingBuilder<Command> command(final String name) {
+ protected LinkedBindingBuilder<Command> command(String name) {
return bind(Commands.key(name));
}
@@ -38,7 +38,7 @@
* @param name the name of the command the client will provide in order to call the command.
* @return a binding that must be bound to a non-singleton provider for a {@link Command} object.
*/
- protected LinkedBindingBuilder<Command> command(final CommandName name) {
+ protected LinkedBindingBuilder<Command> command(CommandName name) {
return bind(Commands.key(name));
}
@@ -49,7 +49,7 @@
* @param name the name of the command the client will provide in order to call the command.
* @return a binding that must be bound to a non-singleton provider for a {@link Command} object.
*/
- protected LinkedBindingBuilder<Command> command(final CommandName parent, final String name) {
+ protected LinkedBindingBuilder<Command> command(CommandName parent, String name) {
return bind(Commands.key(parent, name));
}
@@ -60,7 +60,7 @@
* @param clazz class of the command with {@link CommandMetaData} annotation to retrieve the name
* and the description from
*/
- protected void command(final CommandName parent, final Class<? extends BaseCommand> clazz) {
+ protected void command(CommandName parent, Class<? extends BaseCommand> clazz) {
CommandMetaData meta = clazz.getAnnotation(CommandMetaData.class);
if (meta == null) {
throw new IllegalStateException("no CommandMetaData annotation found");
@@ -78,8 +78,7 @@
* @param clazz class of the command with {@link CommandMetaData} annotation to retrieve the
* description from
*/
- protected void alias(
- final CommandName parent, final String name, final Class<? extends BaseCommand> clazz) {
+ protected void alias(final CommandName parent, String name, Class<? extends BaseCommand> clazz) {
CommandMetaData meta = clazz.getAnnotation(CommandMetaData.class);
if (meta == null) {
throw new IllegalStateException("no CommandMetaData annotation found");
@@ -95,7 +94,7 @@
* @param to name of an already registered command that will perform the action when {@code from}
* is invoked by a client.
*/
- protected void alias(final String from, final String to) {
+ protected void alias(String from, String to) {
bind(Commands.key(from)).to(Commands.key(to));
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java
index 200d3a0..61c36cb 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java
@@ -22,7 +22,7 @@
private final Provider<Command> provider;
private final String description;
- CommandProvider(final Provider<Command> p, final String d) {
+ CommandProvider(Provider<Command> p, String d) {
this.provider = p;
this.description = d;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java
index 620ffbe..43d2c50 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java
@@ -27,40 +27,40 @@
/** Magic value signaling the top level. */
public static final CommandName CMD_ROOT = named(ROOT);
- public static Key<Command> key(final String name) {
+ public static Key<Command> key(String name) {
return key(named(name));
}
- public static Key<Command> key(final CommandName name) {
+ public static Key<Command> key(CommandName name) {
return Key.get(Command.class, name);
}
- public static Key<Command> key(final CommandName parent, final String name) {
+ public static Key<Command> key(CommandName parent, String name) {
return Key.get(Command.class, named(parent, name));
}
- public static Key<Command> key(final CommandName parent, final String name, final String descr) {
+ public static Key<Command> key(CommandName parent, String name, String descr) {
return Key.get(Command.class, named(parent, name, descr));
}
/** Create a CommandName annotation for the supplied name. */
@AutoAnnotation
- public static CommandName named(final String value) {
+ public static CommandName named(String value) {
return new AutoAnnotation_Commands_named(value);
}
/** Create a CommandName annotation for the supplied name. */
- public static CommandName named(final CommandName parent, final String name) {
+ public static CommandName named(CommandName parent, String name) {
return new NestedCommandNameImpl(parent, name);
}
/** Create a CommandName annotation for the supplied name and description. */
- public static CommandName named(final CommandName parent, final String name, final String descr) {
+ public static CommandName named(CommandName parent, String name, String descr) {
return new NestedCommandNameImpl(parent, name, descr);
}
/** Return the name of this command, possibly including any parents. */
- public static String nameOf(final CommandName name) {
+ public static String nameOf(CommandName name) {
if (name instanceof NestedCommandNameImpl) {
return nameOf(((NestedCommandNameImpl) name).parent) + " " + name.value();
}
@@ -68,7 +68,7 @@
}
/** Is the second command a direct child of the first command? */
- public static boolean isChild(final CommandName parent, final CommandName name) {
+ public static boolean isChild(CommandName parent, CommandName name) {
if (name instanceof NestedCommandNameImpl) {
return parent.equals(((NestedCommandNameImpl) name).parent);
}
@@ -90,13 +90,13 @@
private final String name;
private final String descr;
- NestedCommandNameImpl(final CommandName parent, final String name) {
+ NestedCommandNameImpl(CommandName parent, String name) {
this.parent = parent;
this.name = name;
this.descr = "";
}
- NestedCommandNameImpl(final CommandName parent, final String name, final String descr) {
+ NestedCommandNameImpl(CommandName parent, String name, String descr) {
this.parent = parent;
this.name = name;
this.descr = descr;
@@ -122,7 +122,7 @@
}
@Override
- public boolean equals(final Object obj) {
+ public boolean equals(Object obj) {
return obj instanceof NestedCommandNameImpl
&& parent.equals(((NestedCommandNameImpl) obj).parent)
&& value().equals(((NestedCommandNameImpl) obj).value());
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
index d655500..7e0406a 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
@@ -62,14 +62,14 @@
@Inject
DatabasePubKeyAuth(
- final SshKeyCacheImpl skc,
- final SshLog l,
- final IdentifiedUser.GenericFactory uf,
- final PeerDaemonUser.Factory pf,
- final SitePaths site,
- final KeyPairProvider hostKeyProvider,
- @GerritServerConfig final Config cfg,
- final SshScope s) {
+ SshKeyCacheImpl skc,
+ SshLog l,
+ IdentifiedUser.GenericFactory uf,
+ PeerDaemonUser.Factory pf,
+ SitePaths site,
+ KeyPairProvider hostKeyProvider,
+ @GerritServerConfig Config cfg,
+ SshScope s) {
sshKeyCache = skc;
sshLog = l;
userFactory = uf;
@@ -92,7 +92,7 @@
}
private static void addPublicKey(
- final Collection<PublicKey> out, final KeyPairProvider p, final String type) {
+ final Collection<PublicKey> out, KeyPairProvider p, String type) {
final KeyPair pair = p.loadKey(type);
if (pair != null && pair.getPublic() != null) {
out.add(pair.getPublic());
@@ -162,9 +162,8 @@
return p.keys;
}
- private SshKeyCacheEntry find(
- final Iterable<SshKeyCacheEntry> keyList, final PublicKey suppliedKey) {
- for (final SshKeyCacheEntry k : keyList) {
+ private SshKeyCacheEntry find(Iterable<SshKeyCacheEntry> keyList, PublicKey suppliedKey) {
+ for (SshKeyCacheEntry k : keyList) {
if (k.match(suppliedKey)) {
return k;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
index 87e90f4..3f2e258 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
@@ -69,7 +69,7 @@
}
@Override
- public void start(final Environment env) throws IOException {
+ public void start(Environment env) throws IOException {
try {
parseCommandLine();
if (Strings.isNullOrEmpty(commandName)) {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
index 2a88f63..c782d2f 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
@@ -35,7 +35,7 @@
private final CommandName parent;
private volatile ConcurrentMap<String, CommandProvider> map;
- public DispatchCommandProvider(final CommandName cn) {
+ public DispatchCommandProvider(CommandName cn) {
this.parent = cn;
}
@@ -44,7 +44,7 @@
return factory.create(getMap());
}
- public RegistrationHandle register(final CommandName name, final Provider<Command> cmd) {
+ public RegistrationHandle register(CommandName name, Provider<Command> cmd) {
final ConcurrentMap<String, CommandProvider> m = getMap();
final CommandProvider commandProvider = new CommandProvider(cmd, null);
if (m.putIfAbsent(name.value(), commandProvider) != null) {
@@ -58,7 +58,7 @@
};
}
- public RegistrationHandle replace(final CommandName name, final Provider<Command> cmd) {
+ public RegistrationHandle replace(CommandName name, Provider<Command> cmd) {
final ConcurrentMap<String, CommandProvider> m = getMap();
final CommandProvider commandProvider = new CommandProvider(cmd, null);
m.put(name.value(), commandProvider);
@@ -84,7 +84,7 @@
@SuppressWarnings("unchecked")
private ConcurrentMap<String, CommandProvider> createMap() {
ConcurrentMap<String, CommandProvider> m = Maps.newConcurrentMap();
- for (final Binding<?> b : allCommands()) {
+ for (Binding<?> b : allCommands()) {
final Annotation annotation = b.getKey().getAnnotation();
if (annotation instanceof CommandName) {
final CommandName n = (CommandName) annotation;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java
index 0b1f3ae..8e4be78 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java
@@ -51,7 +51,7 @@
}
@Override
- public boolean validateIdentity(final ServerSession session, final String identity) {
+ public boolean validateIdentity(ServerSession session, String identity) {
final SshSession sd = session.getAttribute(SshSession.KEY);
int at = identity.indexOf('@');
String username;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
index 20694b2..c0b6d5a 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
@@ -31,7 +31,7 @@
private final SitePaths site;
@Inject
- HostKeyProvider(final SitePaths site) {
+ HostKeyProvider(SitePaths site) {
this.site = site;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java
index eafdcd6..aec85d4 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java
@@ -76,33 +76,33 @@
}
@Override
- public void setInputStream(final InputStream in) {
+ public void setInputStream(InputStream in) {
this.in = in;
}
@Override
- public void setOutputStream(final OutputStream out) {
+ public void setOutputStream(OutputStream out) {
this.out = out;
}
@Override
- public void setErrorStream(final OutputStream err) {
+ public void setErrorStream(OutputStream err) {
this.err = err;
}
@Override
- public void setExitCallback(final ExitCallback callback) {
+ public void setExitCallback(ExitCallback callback) {
this.exit = callback;
}
@Override
- public void setSession(final ServerSession session) {
+ public void setSession(ServerSession session) {
SshSession s = session.getAttribute(SshSession.KEY);
this.context = sshScope.newContext(schemaFactory, s, "");
}
@Override
- public void start(final Environment env) throws IOException {
+ public void start(Environment env) throws IOException {
Context old = sshScope.set(context);
String message;
try {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java
index fe8197d..b0116e4 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java
@@ -46,7 +46,7 @@
command(command, clazz);
}
- protected void alias(final String name, Class<? extends BaseCommand> clazz) {
+ protected void alias(String name, Class<? extends BaseCommand> clazz) {
alias(command, name, clazz);
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index 3c108b0..4b37dad 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -149,16 +149,16 @@
@Inject
SshDaemon(
- final CommandFactory commandFactory,
- final NoShell noShell,
- final PublickeyAuthenticator userAuth,
- final GerritGSSAuthenticator kerberosAuth,
- final KeyPairProvider hostKeyProvider,
- final IdGenerator idGenerator,
- @GerritServerConfig final Config cfg,
- final SshLog sshLog,
- @SshListenAddresses final List<SocketAddress> listen,
- @SshAdvertisedAddresses final List<String> advertised,
+ CommandFactory commandFactory,
+ NoShell noShell,
+ PublickeyAuthenticator userAuth,
+ GerritGSSAuthenticator kerberosAuth,
+ KeyPairProvider hostKeyProvider,
+ IdGenerator idGenerator,
+ @GerritServerConfig Config cfg,
+ SshLog sshLog,
+ @SshListenAddresses List<SocketAddress> listen,
+ @SshAdvertisedAddresses List<String> advertised,
MetricMaker metricMaker) {
setPort(IANA_SSH_PORT /* never used */);
@@ -257,7 +257,7 @@
setSessionFactory(
new SessionFactory(this) {
@Override
- protected ServerSessionImpl createSession(final IoSession io) throws Exception {
+ protected ServerSessionImpl createSession(IoSession io) throws Exception {
connected.incrementAndGet();
sessionsCreated.increment();
if (io instanceof MinaSession) {
@@ -392,12 +392,12 @@
final List<PublicKey> keys = myHostKeys();
final List<HostKey> r = new ArrayList<>();
- for (final PublicKey pub : keys) {
+ for (PublicKey pub : keys) {
final Buffer buf = new ByteArrayBuffer();
buf.putRawPublicKey(pub);
final byte[] keyBin = buf.getCompactData();
- for (final String addr : advertised) {
+ for (String addr : advertised) {
try {
r.add(new HostKey(addr, keyBin));
} catch (JSchException e) {
@@ -423,7 +423,7 @@
}
private static void addPublicKey(
- final Collection<PublicKey> out, final KeyPairProvider p, final String type) {
+ final Collection<PublicKey> out, KeyPairProvider p, String type) {
final KeyPair pair = p.loadKey(type);
if (pair != null && pair.getPublic() != null) {
out.add(pair.getPublic());
@@ -523,7 +523,7 @@
}
@SuppressWarnings("unchecked")
- private void initCiphers(final Config cfg) {
+ private void initCiphers(Config cfg) {
final List<NamedFactory<Cipher>> a = BaseBuilder.setUpDefaultCiphers(true);
for (Iterator<NamedFactory<Cipher>> i = a.iterator(); i.hasNext(); ) {
@@ -561,9 +561,9 @@
@SafeVarargs
private static <T> List<NamedFactory<T>> filter(
- final Config cfg, final String key, final NamedFactory<T>... avail) {
+ final Config cfg, String key, NamedFactory<T>... avail) {
final ArrayList<NamedFactory<T>> def = new ArrayList<>();
- for (final NamedFactory<T> n : avail) {
+ for (NamedFactory<T> n : avail) {
if (n == null) {
break;
}
@@ -576,7 +576,7 @@
}
boolean didClear = false;
- for (final String setting : want) {
+ for (String setting : want) {
String name = setting.trim();
boolean add = true;
if (name.startsWith("-")) {
@@ -617,8 +617,8 @@
}
@SafeVarargs
- private static <T> NamedFactory<T> find(final String name, final NamedFactory<T>... avail) {
- for (final NamedFactory<T> n : avail) {
+ private static <T> NamedFactory<T> find(String name, NamedFactory<T>... avail) {
+ for (NamedFactory<T> n : avail) {
if (n != null && name.equals(n.getName())) {
return n;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java
index 2cab00b..1a5e137 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java
@@ -22,7 +22,7 @@
private final AccountSshKey.Id id;
private final PublicKey publicKey;
- SshKeyCacheEntry(final AccountSshKey.Id i, final PublicKey k) {
+ SshKeyCacheEntry(AccountSshKey.Id i, PublicKey k) {
id = i;
publicKey = k;
}
@@ -31,7 +31,7 @@
return id.getParentKey();
}
- boolean match(final PublicKey inkey) {
+ boolean match(PublicKey inkey) {
return publicKey.equals(inkey);
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
index dfd56f1..12064c8 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
@@ -89,7 +89,7 @@
audit(context.get(), "0", "LOGIN");
}
- void onAuthFail(final SshSession sd) {
+ void onAuthFail(SshSession sd) {
final LoggingEvent event =
new LoggingEvent( //
Logger.class.getName(), // fqnOfCategoryClass
@@ -210,7 +210,7 @@
audit(context.get(), "0", "LOGOUT");
}
- private LoggingEvent log(final String msg) {
+ private LoggingEvent log(String msg) {
final SshSession sd = session.get();
final CurrentUser user = sd.getUser();
@@ -248,7 +248,7 @@
return event;
}
- private static String id(final int id) {
+ private static String id(int id) {
return IdGenerator.format(id);
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java
index 627bf71..442ec52 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java
@@ -69,7 +69,7 @@
return buf.toString();
}
- private void formatDate(final long now, final StringBuffer sbuf) {
+ private void formatDate(long now, StringBuffer sbuf) {
final int millis = (int) (now % 1000);
final long rounded = now - millis;
if (rounded != lastTimeMillis) {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java
index 789a630..b911044 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java
@@ -26,7 +26,6 @@
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.AsyncReceiveCommits;
import com.google.gerrit.server.git.QueueProvider;
-import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.plugins.ModuleGenerator;
import com.google.gerrit.server.plugins.ReloadPluginListener;
import com.google.gerrit.server.plugins.StartPluginListener;
@@ -39,6 +38,7 @@
import java.net.SocketAddress;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.auth.gss.GSSAuthenticator;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
@@ -77,7 +77,7 @@
.toInstance(new DispatchCommandProvider(Commands.CMD_ROOT));
bind(CommandFactoryProvider.class);
bind(CommandFactory.class).toProvider(CommandFactoryProvider.class);
- bind(WorkQueue.Executor.class)
+ bind(ScheduledThreadPoolExecutor.class)
.annotatedWith(StreamCommandExecutor.class)
.toProvider(StreamCommandExecutorProvider.class)
.in(SINGLETON);
@@ -126,7 +126,7 @@
.toProvider(SshRemotePeerProvider.class)
.in(SshScope.REQUEST);
- bind(WorkQueue.Executor.class)
+ bind(ScheduledThreadPoolExecutor.class)
.annotatedWith(CommandExecutor.class)
.toProvider(CommandExecutorProvider.class)
.in(SshScope.REQUEST);
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java
index 44554ca..5e2626e 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java
@@ -24,7 +24,7 @@
private final Provider<SshSession> session;
@Inject
- SshRemotePeerProvider(final Provider<SshSession> s) {
+ SshRemotePeerProvider(Provider<SshSession> s) {
session = s;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
index 202a80e..963a71a 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
@@ -51,7 +51,7 @@
volatile long started;
volatile long finished;
- private Context(SchemaFactory<ReviewDb> sf, final SshSession s, final String c, final long at) {
+ private Context(SchemaFactory<ReviewDb> sf, SshSession s, String c, long at) {
schemaFactory = sf;
session = s;
commandLine = c;
@@ -179,7 +179,7 @@
public static final Scope REQUEST =
new Scope() {
@Override
- public <T> Provider<T> scope(final Key<T> key, final Provider<T> creator) {
+ public <T> Provider<T> scope(Key<T> key, Provider<T> creator) {
return new Provider<T>() {
@Override
public T get() {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java
index f08fb43..1a60a20 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java
@@ -35,7 +35,7 @@
private volatile String authError;
private volatile String peerAgent;
- SshSession(final int sessionId, SocketAddress peer) {
+ SshSession(int sessionId, SocketAddress peer) {
this.sessionId = sessionId;
this.remoteAddress = peer;
this.remoteAsString = format(remoteAddress);
@@ -109,7 +109,7 @@
return authError != null;
}
- private static String format(final SocketAddress remote) {
+ private static String format(SocketAddress remote) {
if (remote instanceof InetSocketAddress) {
final InetSocketAddress sa = (InetSocketAddress) remote;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java
index 33d253a..ab0ffcf 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java
@@ -48,7 +48,7 @@
* @throws NoSuchAlgorithmException the JVM is missing the key algorithm.
* @throws NoSuchProviderException the JVM is missing the provider.
*/
- public static PublicKey parse(final AccountSshKey key)
+ public static PublicKey parse(AccountSshKey key)
throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException {
try {
final String s = key.getEncodedKey();
@@ -69,7 +69,7 @@
* @return {@code keyStr} if conversion failed; otherwise the converted key, in OpenSSH key
* format.
*/
- public static String toOpenSshPublicKey(final String keyStr) {
+ public static String toOpenSshPublicKey(String keyStr) {
try {
final StringBuilder strBuf = new StringBuilder();
final BufferedReader br = new BufferedReader(new StringReader(keyStr));
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutor.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutor.java
index 794ff76..9a8e029 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutor.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutor.java
@@ -16,11 +16,11 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import com.google.gerrit.server.git.WorkQueue.Executor;
import com.google.inject.BindingAnnotation;
import java.lang.annotation.Retention;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
-/** Marker on {@link Executor} used by delayed event streaming. */
+/** Marker on {@link ScheduledThreadPoolExecutor} used by delayed event streaming. */
@Retention(RUNTIME)
@BindingAnnotation
public @interface StreamCommandExecutor {}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java
index 58fd027..6ab3ae7 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java
@@ -18,23 +18,24 @@
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import com.google.inject.Provider;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import org.eclipse.jgit.lib.Config;
-class StreamCommandExecutorProvider implements Provider<WorkQueue.Executor> {
+class StreamCommandExecutorProvider implements Provider<ScheduledThreadPoolExecutor> {
private final int poolSize;
private final WorkQueue queues;
@Inject
- StreamCommandExecutorProvider(@GerritServerConfig final Config config, final WorkQueue wq) {
+ StreamCommandExecutorProvider(@GerritServerConfig Config config, WorkQueue wq) {
final int cores = Runtime.getRuntime().availableProcessors();
poolSize = config.getInt("sshd", "streamThreads", cores + 1);
queues = wq;
}
@Override
- public WorkQueue.Executor get() {
- final WorkQueue.Executor executor;
+ public ScheduledThreadPoolExecutor get() {
+ final ScheduledThreadPoolExecutor executor;
executor = queues.createQueue(poolSize, "SSH-Stream-Worker");
@@ -42,7 +43,7 @@
executor.setThreadFactory(
new ThreadFactory() {
@Override
- public Thread newThread(final Runnable task) {
+ public Thread newThread(Runnable task) {
final Thread t = parent.newThread(task);
t.setPriority(Thread.MIN_PRIORITY);
return t;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java
index 4434694..35788fd 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java
@@ -126,7 +126,7 @@
}
final List<Project.NameKey> childProjects = new ArrayList<>();
- for (final ProjectControl pc : children) {
+ for (ProjectControl pc : children) {
childProjects.add(pc.getProject().getNameKey());
}
if (oldParent != null) {
@@ -137,7 +137,7 @@
}
}
- for (final Project.NameKey nameKey : childProjects) {
+ for (Project.NameKey nameKey : childProjects) {
final String name = nameKey.get();
if (allProjectsName.equals(nameKey)) {
@@ -190,18 +190,18 @@
* list of child projects does not contain projects that were specified to be excluded from
* reparenting.
*/
- private List<Project.NameKey> getChildrenForReparenting(final ProjectControl parent)
+ private List<Project.NameKey> getChildrenForReparenting(ProjectControl parent)
throws PermissionBackendException {
final List<Project.NameKey> childProjects = new ArrayList<>();
final List<Project.NameKey> excluded = new ArrayList<>(excludedChildren.size());
- for (final ProjectControl excludedChild : excludedChildren) {
+ for (ProjectControl excludedChild : excludedChildren) {
excluded.add(excludedChild.getProject().getNameKey());
}
final List<Project.NameKey> automaticallyExcluded = new ArrayList<>(excludedChildren.size());
if (newParentKey != null) {
automaticallyExcluded.addAll(getAllParents(newParentKey));
}
- for (final ProjectInfo child : listChildProjects.apply(new ProjectResource(parent))) {
+ for (ProjectInfo child : listChildProjects.apply(new ProjectResource(parent))) {
final Project.NameKey childName = new Project.NameKey(child.name);
if (!excluded.contains(childName)) {
if (!automaticallyExcluded.contains(childName)) {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java
index 92098cc..633eaa0 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java
@@ -34,7 +34,7 @@
private Short value;
- ApproveOption(final String name, final String usage, final LabelType type) {
+ ApproveOption(String name, String usage, LabelType type) {
this.name = name;
this.usage = usage;
this.type = type;
@@ -100,7 +100,7 @@
}
@Override
- public void addValue(final Short val) {
+ public void addValue(Short val) {
this.value = val;
}
@@ -122,13 +122,13 @@
private final ApproveOption cmdOption;
// CS IGNORE RedundantModifier FOR NEXT 1 LINES. REASON: needed by org.kohsuke.args4j.Option
- public Handler(final CmdLineParser parser, final OptionDef option, final Setter<Short> setter) {
+ public Handler(CmdLineParser parser, OptionDef option, Setter<Short> setter) {
super(parser, option, setter);
this.cmdOption = (ApproveOption) setter;
}
@Override
- protected Short parse(final String token) throws NumberFormatException, CmdLineException {
+ protected Short parse(String token) throws NumberFormatException, CmdLineException {
String argument = token;
if (argument.startsWith("+")) {
argument = argument.substring(1);
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java
index 22bca56..4bb176c 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java
@@ -75,7 +75,7 @@
metaVar = "USERNAME",
usage = "initial set of users to become members of the group"
)
- void addMember(final Account.Id id) {
+ void addMember(Account.Id id) {
initialMembers.add(id);
}
@@ -90,7 +90,7 @@
metaVar = "GROUP",
usage = "initial set of groups to be included in the group"
)
- void addGroup(final AccountGroup.UUID id) {
+ void addGroup(AccountGroup.UUID id) {
initialGroups.add(id);
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java
index 8357a91..c510680 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java
@@ -91,9 +91,9 @@
groupBackend);
}
- void display(final PrintWriter out) throws OrmException, BadRequestException {
+ void display(PrintWriter out) throws OrmException, BadRequestException {
final ColumnFormatter formatter = new ColumnFormatter(out, '\t');
- for (final GroupInfo info : get()) {
+ for (GroupInfo info : get()) {
formatter.addColumn(MoreObjects.firstNonNull(info.name, "n/a"));
if (verboseOutput) {
AccountGroup o =
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
index 5b7f23b7..4d93fe8 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
@@ -17,20 +17,18 @@
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
import static org.eclipse.jgit.lib.RefDatabase.ALL;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.reviewdb.client.Account;
+import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountResolver;
import com.google.gerrit.server.git.GitRepositoryManager;
-import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.VisibleRefFilter;
-import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.project.ProjectControl;
+import com.google.gerrit.server.util.ManualRequestContext;
+import com.google.gerrit.server.util.OneOffRequestContext;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
import com.google.gwtorm.server.OrmException;
@@ -50,16 +48,10 @@
)
public class LsUserRefs extends SshCommand {
@Inject private AccountResolver accountResolver;
-
- @Inject private IdentifiedUser.GenericFactory userFactory;
-
+ @Inject private OneOffRequestContext requestContext;
+ @Inject private VisibleRefFilter.Factory refFilterFactory;
@Inject private ReviewDb db;
-
- @Inject private TagCache tagCache;
-
- @Inject private ChangeNotes.Factory changeNotesFactory;
-
- @Inject @Nullable private SearchingChangeCacheImpl changeCache;
+ @Inject private GitRepositoryManager repoManager;
@Option(
name = "--project",
@@ -82,8 +74,6 @@
@Option(name = "--only-refs-heads", usage = "list only refs under refs/heads")
private boolean onlyRefsHeads;
- @Inject private GitRepositoryManager repoManager;
-
@Override
protected void run() throws Failure {
Account userAccount;
@@ -92,36 +82,33 @@
} catch (OrmException e) {
throw die(e);
}
-
if (userAccount == null) {
stdout.print("No single user could be found when searching for: " + userName + '\n');
stdout.flush();
return;
}
- IdentifiedUser user = userFactory.create(userAccount.getId());
- ProjectControl userProjectControl = projectControl.forUser(user);
- try (Repository repo =
- repoManager.openRepository(userProjectControl.getProject().getNameKey())) {
+ Project.NameKey projectName = projectControl.getProject().getNameKey();
+ try (Repository repo = repoManager.openRepository(projectName);
+ ManualRequestContext ctx = requestContext.openAs(userAccount.getId())) {
try {
Map<String, Ref> refsMap =
- new VisibleRefFilter(
- tagCache, changeNotesFactory, changeCache, repo, userProjectControl, db, true)
+ refFilterFactory
+ .create(projectControl.getProjectState(), repo)
.filter(repo.getRefDatabase().getRefs(ALL), false);
- for (final String ref : refsMap.keySet()) {
+ for (String ref : refsMap.keySet()) {
if (!onlyRefsHeads || ref.startsWith(RefNames.REFS_HEADS)) {
stdout.println(ref);
}
}
} catch (IOException e) {
- throw new Failure(
- 1, "fatal: Error reading refs: '" + projectControl.getProject().getNameKey(), e);
+ throw new Failure(1, "fatal: Error reading refs: '" + projectName, e);
}
} catch (RepositoryNotFoundException e) {
- throw die("'" + projectControl.getProject().getNameKey() + "': not a git archive");
- } catch (IOException e) {
- throw die("Error opening: '" + projectControl.getProject().getNameKey());
+ throw die("'" + projectName + "': not a git archive");
+ } catch (IOException | OrmException e) {
+ throw die("Error opening: '" + projectName);
}
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java
index 4201c2c..3f592be 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java
@@ -272,7 +272,7 @@
Identity.create(rs, "COLUMN_NAME"),
new Function("TYPE") {
@Override
- String apply(final ResultSet rs) throws SQLException {
+ String apply(ResultSet rs) throws SQLException {
String type = rs.getString("TYPE_NAME");
switch (rs.getInt("DATA_TYPE")) {
case java.sql.Types.CHAR:
@@ -344,7 +344,7 @@
println("");
}
- private void executeStatement(final String sql) {
+ private void executeStatement(String sql) {
final long start = TimeUtil.nowMs();
final boolean hasResultSet;
try {
@@ -397,7 +397,7 @@
* @param show Functions to map columns
* @throws SQLException
*/
- private void showResultSet(final ResultSet rs, boolean alreadyOnRow, long start, Function... show)
+ private void showResultSet(ResultSet rs, boolean alreadyOnRow, long start, Function... show)
throws SQLException {
switch (outputFormat) {
case JSON_SINGLE:
@@ -620,7 +620,7 @@
}
}
- private void warning(final String msg) {
+ private void warning(String msg) {
switch (outputFormat) {
case JSON_SINGLE:
case JSON:
@@ -639,7 +639,7 @@
}
}
- private void error(final SQLException err) {
+ private void error(SQLException err) {
switch (outputFormat) {
case JSON_SINGLE:
case JSON:
@@ -718,7 +718,7 @@
private abstract static class Function {
final String name;
- Function(final String name) {
+ Function(String name) {
this.name = name;
}
@@ -726,19 +726,19 @@
}
private static class Identity extends Function {
- static Identity create(final ResultSet rs, final String name) throws SQLException {
+ static Identity create(ResultSet rs, String name) throws SQLException {
return new Identity(rs.findColumn(name), name);
}
final int colId;
- Identity(final int colId, final String name) {
+ Identity(int colId, String name) {
super(name);
this.colId = colId;
}
@Override
- String apply(final ResultSet rs) throws SQLException {
+ String apply(ResultSet rs) throws SQLException {
return rs.getString(colId);
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java
index 7789c65..1fbcc17 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java
@@ -61,7 +61,7 @@
metaVar = "EMAIL",
usage = "request reviewer for change(s)"
)
- void addReviewer(final Account.Id id) {
+ void addReviewer(Account.Id id) {
reviewerId.add(id);
}
@@ -71,7 +71,7 @@
metaVar = "EMAIL",
usage = "CC user on change(s)"
)
- void addCC(final Account.Id id) {
+ void addCC(Account.Id id) {
ccId.add(id);
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
index ca69b54..491455d 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
@@ -78,7 +78,7 @@
metaVar = "{COMMIT | CHANGE,PATCHSET}",
usage = "list of commits or patch sets to review"
)
- void addPatchSetId(final String token) {
+ void addPatchSetId(String token) {
try {
PatchSet ps = psParser.parsePatchSet(token, projectControl, branch);
patchSets.add(ps);
@@ -159,7 +159,7 @@
usage = "custom label(s) to assign",
metaVar = "LABEL=VALUE"
)
- void addLabel(final String token) {
+ void addLabel(String token) {
LabelVote v = LabelVote.parseWithEquals(token);
LabelType.checkName(v.label()); // Disallow SUBM.
customLabels.put(v.label(), v.value());
@@ -256,7 +256,7 @@
input = reviewFromJson();
}
- for (final PatchSet patchSet : patchSets) {
+ for (PatchSet patchSet : patchSets) {
try {
if (input != null) {
applyReview(patchSet, input);
@@ -281,7 +281,7 @@
}
}
- private void applyReview(PatchSet patchSet, final ReviewInput review) throws RestApiException {
+ private void applyReview(PatchSet patchSet, ReviewInput review) throws RestApiException {
gApi.changes()
.id(patchSet.getId().getParentKey().get())
.revision(patchSet.getRevision().get())
@@ -297,7 +297,7 @@
}
}
- private void reviewPatchSet(final PatchSet patchSet) throws Exception {
+ private void reviewPatchSet(PatchSet patchSet) throws Exception {
if (notify == null) {
notify = NotifyHandling.ALL;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java
index 0c8c74a..1306c52 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java
@@ -50,7 +50,7 @@
private IOException error;
@Override
- public void setArguments(final String[] args) {
+ public void setArguments(String[] args) {
root = "";
for (int i = 0; i < args.length; i++) {
if (args[i].charAt(0) == '-') {
@@ -81,7 +81,7 @@
}
@Override
- public void start(final Environment env) {
+ public void start(Environment env) {
startThread(this::runImp);
}
@@ -155,7 +155,7 @@
}
}
- private void readFile(final Entry ent) throws IOException {
+ private void readFile(Entry ent) throws IOException {
byte[] data = ent.getBytes();
if (data == null) {
throw new FileNotFoundException(ent.getPath());
@@ -169,7 +169,7 @@
readAck();
}
- private void readDir(final Entry dir) throws IOException {
+ private void readDir(Entry dir) throws IOException {
header(dir, 0);
readAck();
@@ -186,8 +186,7 @@
readAck();
}
- private void header(final Entry dir, final int len)
- throws IOException, UnsupportedEncodingException {
+ private void header(Entry dir, int len) throws IOException, UnsupportedEncodingException {
final StringBuilder buf = new StringBuilder();
switch (dir.getType()) {
case DIR:
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
index 8c6db83..1923169 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
@@ -231,7 +231,7 @@
private void addSshKeys(List<String> sshKeys)
throws RestApiException, OrmException, IOException, ConfigInvalidException,
PermissionBackendException {
- for (final String sshKey : sshKeys) {
+ for (String sshKey : sshKeys) {
AddSshKey.Input in = new AddSshKey.Input();
in.raw = RawInputUtil.create(sshKey.getBytes(UTF_8), "plain/text");
addSshKey.apply(rsrc, in);
@@ -302,7 +302,7 @@
stderr.println("preferred email not found: " + email);
}
- private List<String> readSshKey(final List<String> sshKeys)
+ private List<String> readSshKey(List<String> sshKeys)
throws UnsupportedEncodingException, IOException {
if (!sshKeys.isEmpty()) {
int idx = sshKeys.indexOf("-");
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java
index 5dee105..a8452c8 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java
@@ -75,7 +75,7 @@
private int columns = 80;
@Override
- public void start(final Environment env) throws IOException {
+ public void start(Environment env) throws IOException {
String s = env.getEnv().get(Environment.ENV_COLUMNS);
if (s != null && !s.isEmpty()) {
try {
@@ -122,7 +122,7 @@
String.format(
"%-8s %8s %8s %-15s %s\n", "Session", "Start", "Idle", "User", "Remote Host"));
stdout.print("--------------------------------------------------------------\n");
- for (final IoSession io : list) {
+ for (IoSession io : list) {
checkState(io instanceof MinaSession, "expected MinaSession");
MinaSession minaSession = (MinaSession) io;
long start = minaSession.getSession().getCreationTime();
@@ -142,7 +142,7 @@
} else {
stdout.print(String.format("%-8s %-15s %s\n", "Session", "User", "Remote Host"));
stdout.print("--------------------------------------------------------------\n");
- for (final IoSession io : list) {
+ for (IoSession io : list) {
AbstractSession s = AbstractSession.getSession(io, true);
SshSession sd = s != null ? s.getAttribute(SshSession.KEY) : null;
@@ -169,11 +169,11 @@
}
}
- private static String id(final SshSession sd) {
+ private static String id(SshSession sd) {
return sd != null ? IdGenerator.format(sd.getSessionId()) : "";
}
- private static String time(final long now, final long time) {
+ private static String time(long now, long time) {
if (time - now < 24 * 60 * 60 * 1000L) {
return new SimpleDateFormat("HH:mm:ss").format(new Date(time));
}
@@ -193,7 +193,7 @@
return String.format("%02d:%02d:%02d", hr, min, sec);
}
- private String username(final SshSession sd) {
+ private String username(SshSession sd) {
if (sd == null) {
return "";
}
@@ -214,7 +214,7 @@
return "";
}
- private String hostname(final SocketAddress remoteAddress) {
+ private String hostname(SocketAddress remoteAddress) {
if (remoteAddress == null) {
return "?";
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
index dfb9c9c..0296690 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
@@ -38,6 +38,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.apache.sshd.server.Environment;
import org.kohsuke.args4j.Option;
@@ -108,7 +109,7 @@
if (groupByQueue) {
ListMultimap<String, TaskInfo> byQueue = byQueue(tasks);
for (String queueName : byQueue.keySet()) {
- WorkQueue.Executor e = workQueue.getExecutor(queueName);
+ ScheduledThreadPoolExecutor e = workQueue.getExecutor(queueName);
stdout.print(String.format("Queue: %s\n", queueName));
print(byQueue.get(queueName), now, viewAll, e.getCorePoolSize());
}
@@ -180,7 +181,7 @@
return format(when, delay);
}
- private static String startTime(final Date when) {
+ private static String startTime(Date when) {
return format(when, TimeUtil.nowMs() - when.getTime());
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java
index 1c0a424..91e0cb1 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java
@@ -29,7 +29,6 @@
import com.google.gerrit.server.events.EventTypes;
import com.google.gerrit.server.events.ProjectNameKeySerializer;
import com.google.gerrit.server.events.SupplierSerializer;
-import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.CancelableRunnable;
import com.google.gerrit.sshd.BaseCommand;
import com.google.gerrit.sshd.CommandMetaData;
@@ -43,6 +42,7 @@
import java.util.List;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.apache.sshd.server.Environment;
import org.kohsuke.args4j.Option;
import org.slf4j.Logger;
@@ -71,7 +71,7 @@
@Inject private DynamicSet<UserScopedEventListener> eventListeners;
- @Inject @StreamCommandExecutor private WorkQueue.Executor pool;
+ @Inject @StreamCommandExecutor private ScheduledThreadPoolExecutor pool;
/** Queue of events to stream to the connected user. */
private final LinkedBlockingQueue<Event> queue = new LinkedBlockingQueue<>(MAX_EVENTS);
@@ -131,7 +131,7 @@
private PrintWriter stdout;
@Override
- public void start(final Environment env) throws IOException {
+ public void start(Environment env) throws IOException {
try {
parseCommandLine();
} catch (UnloggedFailure e) {
@@ -150,7 +150,7 @@
eventListeners.add(
new UserScopedEventListener() {
@Override
- public void onEvent(final Event event) {
+ public void onEvent(Event event) {
if (subscribedToEvents.isEmpty() || subscribedToEvents.contains(event.getType())) {
offer(event);
}
@@ -170,7 +170,7 @@
}
@Override
- protected void onExit(final int rc) {
+ protected void onExit(int rc) {
eventListenerRegistration.remove();
synchronized (taskLock) {
@@ -199,7 +199,7 @@
}
}
- private void offer(final Event event) {
+ private void offer(Event event) {
synchronized (taskLock) {
if (!queue.offer(event)) {
dropped = true;
@@ -263,7 +263,7 @@
}
}
- private void write(final Object message) {
+ private void write(Object message) {
String msg = null;
try {
msg = gson.toJson(message) + "\n";
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java
index 67dfe96..fc3a917 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java
@@ -15,16 +15,11 @@
package com.google.gerrit.sshd.commands;
import com.google.common.collect.Lists;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.git.SearchingChangeCacheImpl;
-import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.git.validators.UploadValidationException;
import com.google.gerrit.server.git.validators.UploadValidators;
-import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.sshd.AbstractGitCommand;
import com.google.gerrit.sshd.SshSession;
import com.google.inject.Inject;
@@ -38,22 +33,11 @@
/** Publishes Git repositories over SSH using the Git upload-pack protocol. */
final class Upload extends AbstractGitCommand {
- @Inject private ReviewDb db;
-
@Inject private TransferConfig config;
-
- @Inject private TagCache tagCache;
-
- @Inject private ChangeNotes.Factory changeNotesFactory;
-
- @Inject @Nullable private SearchingChangeCacheImpl changeCache;
-
+ @Inject private VisibleRefFilter.Factory refFilterFactory;
@Inject private DynamicSet<PreUploadHook> preUploadHooks;
-
@Inject private DynamicSet<PostUploadHook> postUploadHooks;
-
@Inject private UploadValidators.Factory uploadValidatorsFactory;
-
@Inject private SshSession session;
@Override
@@ -63,9 +47,7 @@
}
final UploadPack up = new UploadPack(repo);
- up.setAdvertiseRefsHook(
- new VisibleRefFilter(
- tagCache, changeNotesFactory, changeCache, repo, projectControl, db, true));
+ up.setAdvertiseRefsHook(refFilterFactory.create(projectControl.getProjectState(), repo));
up.setPackConfig(config.getPackConfig());
up.setTimeout(config.getTimeout());
up.setPostUploadHook(PostUploadHookChain.newChain(Lists.newArrayList(postUploadHooks)));
diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java
index 8aa5b9e..bb293cc 100644
--- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java
+++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java
@@ -195,7 +195,7 @@
return parser.help.value;
}
- public void parseArgument(final String... args) throws CmdLineException {
+ public void parseArgument(String... args) throws CmdLineException {
List<String> tmp = Lists.newArrayListWithCapacity(args.length);
for (int argi = 0; argi < args.length; argi++) {
final String str = args[argi];
@@ -232,7 +232,7 @@
public void parseOptionMap(ListMultimap<String, String> params) throws CmdLineException {
List<String> tmp = Lists.newArrayListWithCapacity(2 * params.size());
- for (final String key : params.keySet()) {
+ for (String key : params.keySet()) {
String name = makeOption(key);
if (isBoolean(name)) {
@@ -391,7 +391,7 @@
private HelpOption help;
- MyParser(final Object bean) {
+ MyParser(Object bean) {
super(bean);
ensureOptionsInitialized();
}
@@ -417,7 +417,7 @@
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
- protected OptionHandler createOptionHandler(final OptionDef option, final Setter setter) {
+ protected OptionHandler createOptionHandler(OptionDef option, Setter setter) {
if (isHandlerSpecified(option) || isEnum(setter) || isPrimitive(setter)) {
return add(super.createOptionHandler(option, setter));
}
@@ -444,7 +444,7 @@
}
}
- private boolean isHandlerSpecified(final OptionDef option) {
+ private boolean isHandlerSpecified(OptionDef option) {
return option.handler() != OptionHandler.class;
}
diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java
index 582bee2..95d11a5 100644
--- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java
+++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java
@@ -25,7 +25,7 @@
public class OptionHandlerUtil {
/** Generate a key for an {@link OptionHandlerFactory} in Guice. */
@SuppressWarnings("unchecked")
- public static <T> Key<OptionHandlerFactory<T>> keyFor(final Class<T> valueType) {
+ public static <T> Key<OptionHandlerFactory<T>> keyFor(Class<T> valueType) {
final Type factoryType = Types.newParameterizedType(OptionHandlerFactory.class, valueType);
return (Key<OptionHandlerFactory<T>>) Key.get(factoryType);
}
@@ -36,7 +36,7 @@
return (Key<OptionHandler<T>>) Key.get(handlerType);
}
- public static <T> Module moduleFor(final Class<T> type, Class<? extends OptionHandler<T>> impl) {
+ public static <T> Module moduleFor(Class<T> type, Class<? extends OptionHandler<T>> impl) {
return new FactoryModuleBuilder().implement(handlerOf(type), impl).build(keyFor(type));
}
diff --git a/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java b/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java
index 171e059..6dc1006 100644
--- a/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java
+++ b/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java
@@ -63,7 +63,7 @@
private final SSLSocketFactory sslFactory;
- private BlindSSLSocketFactory(final SSLSocketFactory sslFactory) {
+ private BlindSSLSocketFactory(SSLSocketFactory sslFactory) {
this.sslFactory = sslFactory;
}
diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java
index 2693340..616030e 100644
--- a/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java
+++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java
@@ -54,7 +54,7 @@
}
}
- private void closeDataSource(final DataSource ds) {
+ private void closeDataSource(DataSource ds) {
try {
Class<?> type = Class.forName("org.apache.commons.dbcp.BasicDataSource");
if (type.isInstance(ds)) {
diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
index 0535f26..e1eb9de 100644
--- a/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
+++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
@@ -17,6 +17,7 @@
import com.google.gerrit.reviewdb.client.SystemConfig;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.SitePath;
+import com.google.gerrit.server.schema.ReviewDbFactory;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
@@ -30,7 +31,8 @@
private final Path path;
@Inject
- SitePathFromSystemConfigProvider(SchemaFactory<ReviewDb> schemaFactory) throws OrmException {
+ SitePathFromSystemConfigProvider(@ReviewDbFactory SchemaFactory<ReviewDb> schemaFactory)
+ throws OrmException {
path = read(schemaFactory);
}
diff --git a/lib/js/bower_components.bzl b/lib/js/bower_components.bzl
index 9c3c63b..bb047bd70 100644
--- a/lib/js/bower_components.bzl
+++ b/lib/js/bower_components.bzl
@@ -168,15 +168,6 @@
seed = True,
)
bower_component(
- name = "polymer-resin",
- license = "//lib:LICENSE-polymer",
- deps = [
- ":polymer",
- ":webcomponentsjs",
- ],
- seed = True,
- )
- bower_component(
name = "polymer",
license = "//lib:LICENSE-polymer",
deps = [ ":webcomponentsjs" ],
diff --git a/plugins/replication b/plugins/replication
index 3afb87f..2a4d0bf 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 3afb87fff2cf5034d757ae491b9a85af645eb638
+Subproject commit 2a4d0bfe10c63c79ca0d47be21756377703e46c0
diff --git a/plugins/reviewnotes b/plugins/reviewnotes
index 7070ce2..1a64a6f 160000
--- a/plugins/reviewnotes
+++ b/plugins/reviewnotes
@@ -1 +1 @@
-Subproject commit 7070ce225267cd024d0a2f06d0c03f8011774def
+Subproject commit 1a64a6f6407df31c06350a5c6e9266e9ba0cf72a
diff --git a/plugins/singleusergroup b/plugins/singleusergroup
index 570b6e2..a4c9e7e 160000
--- a/plugins/singleusergroup
+++ b/plugins/singleusergroup
@@ -1 +1 @@
-Subproject commit 570b6e287a74750d37d2a94e2cf66297c004dce4
+Subproject commit a4c9e7eb2e3165c981f518457e323d1154d6efc4
diff --git a/polygerrit-ui/BUILD b/polygerrit-ui/BUILD
index 1b58a90..1f11cde 100644
--- a/polygerrit-ui/BUILD
+++ b/polygerrit-ui/BUILD
@@ -21,7 +21,6 @@
"//lib/js:moment",
"//lib/js:page",
"//lib/js:polymer",
- "//lib/js:polymer-resin",
"//lib/js:promise-polyfill",
],
)
diff --git a/polygerrit-ui/app/behaviors/gr-list-view-behavior/gr-list-view-behavior.html b/polygerrit-ui/app/behaviors/gr-list-view-behavior/gr-list-view-behavior.html
new file mode 100644
index 0000000..f2b12ee
--- /dev/null
+++ b/polygerrit-ui/app/behaviors/gr-list-view-behavior/gr-list-view-behavior.html
@@ -0,0 +1,55 @@
+<!--
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<link rel="import" href="../base-url-behavior/base-url-behavior.html">
+<link rel="import" href="../gr-url-encoding-behavior.html">
+<script>
+(function(window) {
+ 'use strict';
+
+ /** @polymerBehavior Gerrit.ListViewBehavior */
+ const ListViewBehavior = {
+ computeLoadingClass(loading) {
+ return loading ? 'loading' : '';
+ },
+
+ computeShownItems(items) {
+ return items.slice(0, 25);
+ },
+
+ getUrl(path, item) {
+ return this.getBaseUrl() + path + this.encodeURL(item, true);
+ },
+
+ getFilterValue(params) {
+ if (!params) { return null; }
+ return this._filter = params.filter || null;
+ },
+
+ getOffsetValue(params) {
+ if (params && params.offset) {
+ return params.offset;
+ }
+ return 0;
+ },
+ };
+
+ window.Gerrit = window.Gerrit || {};
+ window.Gerrit.ListViewBehavior = [
+ ListViewBehavior,
+ window.Gerrit.BaseUrlBehavior,
+ window.Gerrit.URLEncodingBehavior];
+})(window);
+</script>
diff --git a/polygerrit-ui/app/behaviors/gr-list-view-behavior/gr-list-view-behavior_test.html b/polygerrit-ui/app/behaviors/gr-list-view-behavior/gr-list-view-behavior_test.html
new file mode 100644
index 0000000..599f691
--- /dev/null
+++ b/polygerrit-ui/app/behaviors/gr-list-view-behavior/gr-list-view-behavior_test.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<!--
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+<title>keyboard-shortcut-behavior</title>
+
+<script src="../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
+<script src="../../bower_components/web-component-tester/browser.js"></script>
+<link rel="import" href="../../test/common-test-setup.html"/>
+<link rel="import" href="gr-list-view-behavior.html">
+
+<test-fixture id="basic">
+ <template>
+ <test-element></test-element>
+ </template>
+</test-fixture>
+
+<script>
+ suite('gr-list-view-behavior tests', () => {
+ let element;
+ // eslint-disable-next-line no-unused-vars
+ let overlay;
+
+ suiteSetup(() => {
+ // Define a Polymer element that uses this behavior.
+ Polymer({
+ is: 'test-element',
+ behaviors: [Gerrit.ListViewBehavior],
+ });
+ });
+
+ setup(() => {
+ element = fixture('basic');
+ });
+
+ test('computeLoadingClass', () => {
+ assert.equal(element.computeLoadingClass(true), 'loading');
+ assert.equal(element.computeLoadingClass(false), '');
+ });
+
+ test('computeShownItems', () => {
+ const myArr = new Array(26);
+ assert.equal(element.computeShownItems(myArr).length, 25);
+ });
+
+ test('getUrl', () => {
+ assert.equal(element.getUrl('/path/to/something/', 'item'),
+ '/path/to/something/item');
+ assert.equal(element.getUrl('/path/to/something/', 'item%test'),
+ '/path/to/something/item%2525test');
+ });
+
+ test('getFilterValue', () => {
+ let params;
+ assert.equal(element.getFilterValue(params), null);
+
+ params = {filter: null};
+ assert.equal(element.getFilterValue(params), null);
+
+ params = {filter: 'test'};
+ assert.equal(element.getFilterValue(params), 'test');
+ });
+
+ test('getOffsetValue', () => {
+ let params;
+ assert.equal(element.getOffsetValue(params), 0);
+
+ params = {offset: null};
+ assert.equal(element.getOffsetValue(params), 0);
+
+ params = {offset: 1};
+ assert.equal(element.getOffsetValue(params), 1);
+ });
+ });
+</script>
diff --git a/polygerrit-ui/app/behaviors/keyboard-shortcut-behavior/keyboard-shortcut-behavior.html b/polygerrit-ui/app/behaviors/keyboard-shortcut-behavior/keyboard-shortcut-behavior.html
index 975bb5e..40bfbca 100644
--- a/polygerrit-ui/app/behaviors/keyboard-shortcut-behavior/keyboard-shortcut-behavior.html
+++ b/polygerrit-ui/app/behaviors/keyboard-shortcut-behavior/keyboard-shortcut-behavior.html
@@ -42,10 +42,11 @@
shouldSuppressKeyboardShortcut(e) {
e = getKeyboardEvent(e);
- if (e.path[0].tagName === 'INPUT' || e.path[0].tagName === 'TEXTAREA') {
+ const tagName = e.target.tagName;
+ if (tagName === 'INPUT' || tagName === 'TEXTAREA') {
return true;
}
- for (let i = 0; i < e.path.length; i++) {
+ for (let i = 0; e.path && i < e.path.length; i++) {
if (e.path[i].tagName === 'GR-OVERLAY') { return true; }
}
return false;
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.html b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.html
index 38afe66..ab9158d 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.html
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html">
-<link rel="import" href="../../../behaviors/gr-url-encoding-behavior.html">
+<link rel="import" href="../../../behaviors/gr-list-view-behavior/gr-list-view-behavior.html">
<link rel="import" href="../../../bower_components/iron-input/iron-input.html">
<link rel="import" href="../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../shared/gr-list-view/gr-list-view.html">
@@ -39,14 +38,14 @@
<th class="description topHeader">Group Description</th>
<th class="visibleToAll topHeader">Visible To All</th>
</tr>
- <tr id="loading" class$="loadingMsg [[_computeLoadingClass(_loading)]]">
+ <tr id="loading" class$="loadingMsg [[computeLoadingClass(_loading)]]">
<td>Loading...</td>
</tr>
<template is="dom-repeat" items="[[_shownGroups]]"
- class$="[[_computeLoadingClass(_loading)]]">
+ class$="[[computeLoadingClass(_loading)]]">
<tr class="table">
<td class="name">
- <a href$="[[_getUrl(item.group_id)]]">[[item.name]]</a>
+ <a href$="[[_computeGroupUrl(item.group_id)]]">[[item.name]]</a>
</td>
<td class="description">[[item.description]]</td>
<td class="visibleToAll">[[_visibleToAll(item)]]</td>
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.js b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.js
index c2c74ba..130e4f4 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.js
+++ b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list.js
@@ -30,7 +30,11 @@
* Offset of currently visible query results.
*/
_offset: Number,
-
+ _path: {
+ type: String,
+ readOnly: true,
+ value: '/admin/groups/',
+ },
_groups: Array,
/**
@@ -39,7 +43,7 @@
* */
_shownGroups: {
type: Array,
- computed: '_computeShownGroups(_groups)',
+ computed: 'computeShownItems(_groups)',
},
_groupsPerPage: {
@@ -55,8 +59,7 @@
},
behaviors: [
- Gerrit.BaseUrlBehavior,
- Gerrit.URLEncodingBehavior,
+ Gerrit.ListViewBehavior,
],
listeners: {
@@ -64,22 +67,19 @@
'previous-page': '_handlePreviousPage',
},
- _paramsChanged(value) {
+ _paramsChanged(params) {
this._loading = true;
+ this._filter = this.getFilterValue(params);
+ this._offset = this.getOffsetValue(params);
- if (value) {
- this._filter = value.filter || null;
- }
-
- if (value && value.offset) {
- this._offset = value.offset;
- } else {
- this._offset = 0;
- }
return this._getGroups(this._filter, this._groupsPerPage,
this._offset);
},
+ _computeGroupUrl(id) {
+ return this.getUrl(this._path, id);
+ },
+
_getGroups(filter, groupsPerPage, offset) {
this._groups = [];
return this.$.restAPI.getGroups(filter, groupsPerPage, offset)
@@ -97,21 +97,8 @@
});
},
- _computeLoadingClass(loading) {
- return loading ? 'loading' : '';
- },
-
_visibleToAll(item) {
return item.options.visible_to_all === true ? 'Y' : 'N';
},
-
- _getUrl(item) {
- return this.getBaseUrl() + '/admin/groups/' +
- this.encodeURL(item, true);
- },
-
- _computeShownGroups(groups) {
- return groups.slice(0, 25);
- },
});
})();
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.html b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.html
index 5f55cd3..a6834e2 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.html
@@ -130,14 +130,14 @@
suite('loading', () => {
test('correct contents are displayed', () => {
assert.isTrue(element._loading);
- assert.equal(element._computeLoadingClass(element._loading), 'loading');
+ assert.equal(element.computeLoadingClass(element._loading), 'loading');
assert.equal(getComputedStyle(element.$.loading).display, 'block');
element._loading = false;
element._groups = _.times(25, groupGenerator);
flushAsynchronousOperations();
- assert.equal(element._computeLoadingClass(element._loading), '');
+ assert.equal(element.computeLoadingClass(element._loading), '');
assert.equal(getComputedStyle(element.$.loading).display, 'none');
});
});
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.html b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.html
new file mode 100644
index 0000000..67a89d4
--- /dev/null
+++ b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.html
@@ -0,0 +1,52 @@
+<!--
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../../../behaviors/gr-list-view-behavior/gr-list-view-behavior.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../shared/gr-list-view/gr-styled-table.html">
+<link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
+
+<link rel="import" href="../../../styles/shared-styles.html">
+
+<dom-module id="gr-admin-plugin-list">
+ <template>
+ <style include="shared-styles"></style>
+ <gr-styled-table>
+ <table id="list">
+ <tr class="headerRow">
+ <th class="name topHeader">Plugin Name</th>
+ <th class="version topHeader">Version</th>
+ <th class="status topHeader">Status</th>
+ </tr>
+ <tr id="loading" class$="loadingMsg [[computeLoadingClass(_loading)]]">
+ <td>Loading...</td>
+ </tr>
+ <template is="dom-repeat" items="[[_plugins]]"
+ class$="[[computeLoadingClass(_loading)]]">
+ <tr class="table">
+ <td class="name">
+ <a href$="[[_computePluginUrl(item.index_url)]]">[[item.id]]</a>
+ </td>
+ <td class="version">[[item.version]]</td>
+ <td class="status">[[_status(item)]]</td>
+ </tr>
+ </template>
+ </table>
+ </gr-styled-table>
+ <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
+ </template>
+ <script src="gr-admin-plugin-list.js"></script>
+</dom-module>
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js
new file mode 100644
index 0000000..1885bb0
--- /dev/null
+++ b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js
@@ -0,0 +1,58 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+(function() {
+ 'use strict';
+
+ Polymer({
+ is: 'gr-admin-plugin-list',
+
+ properties: {
+ _plugins: Array,
+ _loading: {
+ type: Boolean,
+ value: true,
+ },
+ },
+
+ behaviors: [
+ Gerrit.ListViewBehavior,
+ ],
+
+ ready() {
+ return this.$.restAPI.getPlugins()
+ .then(plugins => {
+ if (!plugins) {
+ this._plugins = [];
+ return;
+ }
+ this._plugins = Object.keys(plugins)
+ .map(key => {
+ const plugin = plugins[key];
+ plugin.name = key;
+ return plugin;
+ });
+ this._loading = false;
+ });
+ },
+
+
+ _status(item) {
+ return item.disabled === true ? 'Disabled' : 'Enabled';
+ },
+
+ _computePluginUrl(id) {
+ return this.getUrl('/', id);
+ },
+ });
+})();
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html
new file mode 100644
index 0000000..b946854
--- /dev/null
+++ b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<!--
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+<title>gr-admin-plugin-list</title>
+
+<script src="../../../bower_components/page/page.js"></script>
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
+<script src="../../../bower_components/web-component-tester/browser.js"></script>
+<link rel="import" href="../../../test/common-test-setup.html"/>
+<link rel="import" href="gr-admin-plugin-list.html">
+
+<script>void(0);</script>
+
+<test-fixture id="basic">
+ <template>
+ <gr-admin-plugin-list></gr-admin-plugin-list>
+ </template>
+</test-fixture>
+
+<script>
+ let counter = 0;
+ const pluginGenerator = () => {
+ return {
+ id: `test${++counter}`,
+ index_url: `plugins/test${counter}/`,
+ version: '3.0-SNAPSHOT',
+ disabled: false,
+ };
+ };
+
+ suite('gr-admin-plugin-list tests', () => {
+ let element;
+ let plugins;
+ let sandbox;
+
+ setup(() => {
+ sandbox = sinon.sandbox.create();
+ element = fixture('basic');
+ });
+
+ teardown(() => {
+ sandbox.restore();
+ });
+
+ suite('list with plugins', () => {
+ setup(done => {
+ plugins = _.times(26, pluginGenerator);
+
+ stub('gr-rest-api-interface', {
+ getPlugins() {
+ return Promise.resolve(plugins);
+ },
+ });
+
+ flush(done);
+ });
+
+ test('test for a test plugin in the list', done => {
+ element._plugins = plugins;
+
+ flush(() => {
+ assert.equal(element._plugins[2].id, 'test3');
+ assert.equal(element._plugins[2].index_url, 'plugins/test3/');
+ assert.equal(element._plugins[2].version, '3.0-SNAPSHOT');
+ assert.equal(element._plugins[2].disabled, false);
+ done();
+ });
+ });
+ });
+ });
+</script>
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html b/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html
index 7ae5aa2..05b30e2 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html">
-<link rel="import" href="../../../behaviors/gr-url-encoding-behavior.html">
+<link rel="import" href="../../../behaviors/gr-list-view-behavior/gr-list-view-behavior.html">
<link rel="import" href="../../../bower_components/iron-input/iron-input.html">
<link rel="import" href="../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../shared/gr-list-view/gr-list-view.html">
@@ -41,14 +40,14 @@
<th class="repositoryBrowser topHeader">Repository Browser</th>
<th class="readOnly topHeader">Read only</th>
</tr>
- <tr id="loading" class$="loadingMsg [[_computeLoadingClass(_loading)]]">
+ <tr id="loading" class$="loadingMsg [[computeLoadingClass(_loading)]]">
<td>Loading...</td>
</tr>
<template is="dom-repeat" items="[[_shownProjects]]"
- class$="[[_computeLoadingClass(_loading)]]">
+ class$="[[computeLoadingClass(_loading)]]">
<tr class="table">
<td class="name">
- <a href$="[[_getUrl(item.name)]]">[[item.name]]</a>
+ <a href$="[[_computeProjectUrl(item.name)]]">[[item.name]]</a>
</td>
<td class="description">[[item.description]]</td>
<td class="repositoryBrowser">
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js b/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js
index 803fc80..41a4737 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js
+++ b/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js
@@ -30,7 +30,11 @@
* Offset of currently visible query results.
*/
_offset: Number,
-
+ _path: {
+ type: String,
+ readOnly: true,
+ value: '/admin/projects/',
+ },
_projects: Array,
/**
@@ -39,7 +43,7 @@
* */
_shownProjects: {
type: Array,
- computed: '_computeShownProjects(_projects)',
+ computed: 'computeShownItems(_projects)',
},
_projectsPerPage: {
@@ -55,27 +59,22 @@
},
behaviors: [
- Gerrit.BaseUrlBehavior,
- Gerrit.URLEncodingBehavior,
+ Gerrit.ListViewBehavior,
],
- _paramsChanged(value) {
+ _paramsChanged(params) {
this._loading = true;
-
- if (value) {
- this._filter = value.filter || null;
- }
-
- if (value && value.offset) {
- this._offset = value.offset;
- } else {
- this._offset = 0;
- }
+ this._filter = this.getFilterValue(params);
+ this._offset = this.getOffsetValue(params);
return this._getProjects(this._filter, this._projectsPerPage,
this._offset);
},
+ _computeProjectUrl(name) {
+ return this.getUrl(this._path, name);
+ },
+
_getProjects(filter, projectsPerPage, offset) {
this._projects = [];
return this.$.restAPI.getProjects(filter, projectsPerPage, offset)
@@ -93,19 +92,10 @@
});
},
- _computeLoadingClass(loading) {
- return loading ? 'loading' : '';
- },
-
_readOnly(item) {
return item.state === 'READ_ONLY' ? 'Y' : 'N';
},
- _getUrl(item) {
- return this.getBaseUrl() + '/admin/projects/' +
- this.encodeURL(item, true);
- },
-
_computeWeblink(project) {
if (!project.web_links) {
return '';
@@ -113,9 +103,5 @@
const webLinks = project.web_links;
return webLinks.length ? webLinks : null;
},
-
- _computeShownProjects(projects) {
- return projects.slice(0, 25);
- },
});
})();
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html b/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html
index c5597b5..8829506 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html
@@ -125,14 +125,14 @@
suite('loading', () => {
test('correct contents are displayed', () => {
assert.isTrue(element._loading);
- assert.equal(element._computeLoadingClass(element._loading), 'loading');
+ assert.equal(element.computeLoadingClass(element._loading), 'loading');
assert.equal(getComputedStyle(element.$.loading).display, 'block');
element._loading = false;
element._projects = _.times(25, projectGenerator);
flushAsynchronousOperations();
- assert.equal(element._computeLoadingClass(element._loading), '');
+ assert.equal(element.computeLoadingClass(element._loading), '');
assert.equal(getComputedStyle(element.$.loading).display, 'none');
});
});
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index 8a8a9c7..56e9d4c 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -76,14 +76,14 @@
},
backPage: String,
hasParent: Boolean,
- serverConfig: {
- type: Object,
- observer: '_startUpdateCheckTimer',
- },
keyEventTarget: {
type: Object,
value() { return document.body; },
},
+ _serverConfig: {
+ type: Object,
+ observer: '_startUpdateCheckTimer',
+ },
_diffPrefs: Object,
_numFilesShown: {
type: Number,
@@ -165,7 +165,7 @@
_replyDisabled: {
type: Boolean,
value: true,
- computed: '_computeReplyDisabled(serverConfig)',
+ computed: '_computeReplyDisabled(_serverConfig)',
},
_changeStatus: {
type: String,
@@ -206,6 +206,10 @@
},
attached() {
+ this._getServerConfig().then(config => {
+ this._serverConfig = config;
+ });
+
this._getLoggedIn().then(loggedIn => {
this._loggedIn = loggedIn;
if (loggedIn) {
@@ -900,6 +904,10 @@
return this.$.restAPI.getLoggedIn();
},
+ _getServerConfig() {
+ return this.$.restAPI.getConfig();
+ },
+
_getProjectConfig() {
return this.$.restAPI.getProjectConfig(this._change.project).then(
config => {
@@ -1256,10 +1264,10 @@
},
_startUpdateCheckTimer() {
- if (!this.serverConfig ||
- !this.serverConfig.change ||
- this.serverConfig.change.update_delay === undefined ||
- this.serverConfig.change.update_delay <= MIN_CHECK_INTERVAL_SECS) {
+ if (!this._serverConfig ||
+ !this._serverConfig.change ||
+ this._serverConfig.change.update_delay === undefined ||
+ this._serverConfig.change.update_delay <= MIN_CHECK_INTERVAL_SECS) {
return;
}
@@ -1283,7 +1291,7 @@
});
}
});
- }, this.serverConfig.change.update_delay * 1000);
+ }, this._serverConfig.change.update_delay * 1000);
},
_cancelUpdateCheckTimer() {
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index 0cc9994..1cc2743 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -44,7 +44,7 @@
sandbox = sinon.sandbox.create();
showStub = sandbox.stub(page, 'show');
stub('gr-rest-api-interface', {
- getConfig() { return Promise.resolve({}); },
+ getConfig() { return Promise.resolve({test: 'config'}); },
getAccount() { return Promise.resolve(null); },
});
element = fixture('basic');
@@ -167,6 +167,13 @@
});
});
+ test('fetches the server config on attached', done => {
+ flush(() => {
+ assert.equal(element._serverConfig.test, 'config');
+ done();
+ });
+ });
+
test('Diff preferences hidden when no prefs or logged out', () => {
element._loggedIn = false;
flushAsynchronousOperations();
@@ -1125,7 +1132,7 @@
test('reply button is disabled until server config is loaded', () => {
assert.isTrue(element._replyDisabled);
- element.serverConfig = {};
+ element._serverConfig = {};
assert.isFalse(element._replyDisabled);
});
@@ -1278,7 +1285,7 @@
test('_startUpdateCheckTimer negative delay', () => {
sandbox.stub(element, 'fetchIsLatestKnown');
- element.serverConfig = {change: {update_delay: -1}};
+ element._serverConfig = {change: {update_delay: -1}};
assert.isTrue(element._startUpdateCheckTimer.called);
assert.isFalse(element.fetchIsLatestKnown.called);
@@ -1288,7 +1295,7 @@
sandbox.stub(element, 'fetchIsLatestKnown',
() => { return Promise.resolve(true); });
- element.serverConfig = {change: {update_delay: 12345}};
+ element._serverConfig = {change: {update_delay: 12345}};
assert.isTrue(element._startUpdateCheckTimer.called);
assert.isTrue(element.fetchIsLatestKnown.called);
@@ -1301,7 +1308,7 @@
element.addEventListener('show-alert', () => {
done();
});
- element.serverConfig = {change: {update_delay: 12345}};
+ element._serverConfig = {change: {update_delay: 12345}};
});
});
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.js b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
index 4087e41..b1f6ecf 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -182,6 +182,18 @@
};
});
+ page(/^\/admin\/plugins(\/)?$/, loadUser, data => {
+ restAPI.getLoggedIn().then(loggedIn => {
+ if (loggedIn) {
+ app.params = {
+ view: 'gr-admin-plugin-list',
+ };
+ } else {
+ page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
+ }
+ });
+ });
+
page('/admin/(.*)', loadUser, data => {
restAPI.getLoggedIn().then(loggedIn => {
if (loggedIn) {
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index caf83bb..f70a16c 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -21,6 +21,7 @@
<link rel="import" href="./admin/gr-admin-group-list/gr-admin-group-list.html">
<link rel="import" href="./admin/gr-admin-project-list/gr-admin-project-list.html">
<link rel="import" href="./admin/gr-admin-project/gr-admin-project.html">
+<link rel="import" href="./admin/gr-admin-plugin-list/gr-admin-plugin-list.html">
<link rel="import" href="./admin/gr-admin-view/gr-admin-view.html">
<link rel="import" href="./change-list/gr-change-list-view/gr-change-list-view.html">
<link rel="import" href="./change-list/gr-dashboard-view/gr-dashboard-view.html">
@@ -127,7 +128,6 @@
<template is="dom-if" if="[[_showChangeView]]" restamp="true">
<gr-change-view
params="[[params]]"
- server-config="[[_serverConfig]]"
view-state="{{_viewState.changeView}}"
back-page="[[_lastSearchPage]]"></gr-change-view>
</template>
@@ -155,6 +155,9 @@
<template is="dom-if" if="[[_showAdminProject]]" restamp="true">
<gr-admin-project project="[[params.project]]"></gr-admin-project>
</template>
+ <template is="dom-if" if="[[_showPluginListView]]" restamp="true">
+ <gr-admin-plugin-list id="pluginList"></gr-admin-plugin-list>
+ </template>
<template is="dom-if" if="[[_showAdminView]]" restamp="true">
<gr-admin-view path="[[_path]]"></gr-admin-view>
</template>
diff --git a/polygerrit-ui/app/elements/gr-app.js b/polygerrit-ui/app/elements/gr-app.js
index 7f63330..7011202 100644
--- a/polygerrit-ui/app/elements/gr-app.js
+++ b/polygerrit-ui/app/elements/gr-app.js
@@ -50,6 +50,7 @@
_showSettingsView: Boolean,
_showProjectListView: Boolean,
_showAdminProject: Boolean,
+ _showPluginListView: Boolean,
_showAdminView: Boolean,
_showCLAView: Boolean,
_viewState: Object,
@@ -141,6 +142,7 @@
this.set('_showGroupListView', view === 'gr-admin-group-list');
this.set('_showProjectListView', view === 'gr-admin-project-list');
this.set('_showAdminProject', view === 'gr-admin-project');
+ this.set('_showPluginListView', view === 'gr-admin-plugin-list');
this.set('_showAdminView', view === 'gr-admin-view');
this.set('_showCLAView', view === 'gr-cla-view');
if (this.params.justRegistered) {
diff --git a/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view.html b/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view.html
index 92b06b1..b471d55 100644
--- a/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view.html
+++ b/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view.html
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+<link rel="import" href="./gr-styled-table.html">
<link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html">
<link rel="import" href="../../../behaviors/gr-url-encoding-behavior.html">
<link rel="import" href="../../../bower_components/polymer/polymer.html">
@@ -47,51 +47,6 @@
nav a:first-of-type {
margin-right: .5em;
}
- ::content {
- display: flex;
- flex-direction: column;
- }
-
- ::content .loading {
- display: none;
- }
-
- ::content #list {
- border-collapse: collapse;
- width: 100%;
- }
- ::content #list tr.table {
- border-bottom: 1px solid #eee;
- }
- ::content #list td {
- flex-shrink: 0;
- padding: .3em .5em;
- }
- ::content #list th {
- background-color: #ddd;
- border-bottom: 1px solid #eee;
- font-weight: bold;
- padding: .3em .5em;
- text-align: left;
- }
- ::content #list a {
- color: var(--default-text-color);
- text-decoration: none;
- }
- ::content #list a:hover {
- text-decoration: underline;
- }
- ::content #list .description {
- width: 70%;
- }
- ::content #list .loadingMsg {
- color: #666;
- display: block;
- padding: 1em var(--default-horizontal-margin);
- }
- ::content #list .loadingMsg:not(.loading) {
- display: none;
- }
</style>
<div id="filterContainer">
<label>Filter:</label>
@@ -100,7 +55,9 @@
id="filter"
bind-value="{{_filter}}">
</div>
- <content></content>
+ <gr-styled-table>
+ <content></content>
+ </gr-styled-table>
<nav>
<a id="prevArrow"
href$="[[_computeNavLink(offset, -1, itemsPerPage, filter)]]"
diff --git a/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view_test.html b/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view_test.html
index d8e2ee0..e4dc288 100644
--- a/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-list-view/gr-list-view_test.html
@@ -77,8 +77,7 @@
assert.equal(url, '/admin/projects/q/filter:test');
done();
});
- const e = {target: {value: 'test'}};
- element._onValueChange(e);
+ element._filterChanged('test');
});
test('next button', done => {
diff --git a/polygerrit-ui/app/elements/shared/gr-list-view/gr-styled-table.html b/polygerrit-ui/app/elements/shared/gr-list-view/gr-styled-table.html
new file mode 100644
index 0000000..273b005f
--- /dev/null
+++ b/polygerrit-ui/app/elements/shared/gr-list-view/gr-styled-table.html
@@ -0,0 +1,77 @@
+<!--
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../styles/shared-styles.html">
+
+<dom-module id="gr-styled-table">
+ <template>
+ <style include="shared-styles">
+ ::content {
+ display: flex;
+ flex-direction: column;
+ }
+ ::content .loading {
+ display: none;
+ }
+ ::content #list {
+ border-collapse: collapse;
+ width: 100%;
+ }
+ ::content #list tr.table {
+ border-bottom: 1px solid #eee;
+ }
+ ::content #list td {
+ flex-shrink: 0;
+ padding: .3em .5em;
+ }
+ ::content #list th {
+ background-color: #ddd;
+ border-bottom: 1px solid #eee;
+ font-weight: bold;
+ padding: .3em .5em;
+ text-align: left;
+ }
+ ::content #list a {
+ color: var(--default-text-color);
+ text-decoration: none;
+ }
+ ::content #list a:hover {
+ text-decoration: underline;
+ }
+ ::content #list .description {
+ width: 70%;
+ }
+ ::content #list .loadingMsg {
+ color: #666;
+ display: block;
+ padding: 1em var(--default-horizontal-margin);
+ }
+ ::content #list .loadingMsg:not(.loading) {
+ display: none;
+ }
+ </style>
+ <content></content>
+ </template>
+ <script>
+ (function() {
+ 'use strict';
+ Polymer({
+ is: 'gr-styled-table',
+ });
+ })();
+ </script>
+</dom-module>
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
index 4f89535..ae25a81 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
@@ -515,6 +515,10 @@
);
},
+ getPlugins() {
+ return this._fetchSharedCacheURL('/plugins/?all');
+ },
+
getSuggestedGroups(inputVal, opt_n, opt_errFn, opt_ctx) {
const params = {s: inputVal};
if (opt_n) { params.n = opt_n; }
diff --git a/polygerrit-ui/app/test/common-test-setup.html b/polygerrit-ui/app/test/common-test-setup.html
index 9e277ab..00bd1e7 100644
--- a/polygerrit-ui/app/test/common-test-setup.html
+++ b/polygerrit-ui/app/test/common-test-setup.html
@@ -16,10 +16,4 @@
-->
<link rel="import"
- href="../bower_components/polymer-resin/standalone/polymer-resin-debug.html"
- />
-<script>
-security.polymer_resin.install({allowedIdentifierPrefixes: ['']});
-</script>
-<link rel="import"
href="../bower_components/iron-test-helpers/iron-test-helpers.html" />
diff --git a/polygerrit-ui/app/test/index.html b/polygerrit-ui/app/test/index.html
index 0cddedb..f499389 100644
--- a/polygerrit-ui/app/test/index.html
+++ b/polygerrit-ui/app/test/index.html
@@ -31,6 +31,7 @@
// beginning.
'gr-app_test.html',
'admin/gr-admin-group-list/gr-admin-group-list_test.html',
+ 'admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html',
'admin/gr-admin-project/gr-admin-project_test.html',
'admin/gr-admin-project-list/gr-admin-project-list_test.html',
'change-list/gr-change-list-item/gr-change-list-item_test.html',
@@ -114,6 +115,7 @@
'shared/gr-js-api-interface/gr-js-api-interface_test.html',
'shared/gr-linked-chip/gr-linked-chip_test.html',
'shared/gr-linked-text/gr-linked-text_test.html',
+ 'shared/gr-list-view/gr-list-view_test.html',
'shared/gr-rest-api-interface/gr-rest-api-interface_test.html',
'shared/gr-rest-api-interface/gr-reviewer-updates-parser_test.html',
'shared/gr-select/gr-select_test.html',
