Re-run gjf 1.24
These files don't seem to have been formatted correctly after the merge
from stable-3.8.
Forward-Compatible: checked
Release-Notes: skip
Change-Id: I4dc1a6c26314b61e35034f80cb11bce5f2bd6466
diff --git a/java/com/google/gerrit/acceptance/GerritServer.java b/java/com/google/gerrit/acceptance/GerritServer.java
index 53c952e..f4a2e34 100644
--- a/java/com/google/gerrit/acceptance/GerritServer.java
+++ b/java/com/google/gerrit/acceptance/GerritServer.java
@@ -655,7 +655,9 @@
}
private static Injector getInjector(Object obj, String field)
- throws SecurityException, NoSuchFieldException, IllegalArgumentException,
+ throws SecurityException,
+ NoSuchFieldException,
+ IllegalArgumentException,
IllegalAccessException {
Field f = obj.getClass().getDeclaredField(field);
f.setAccessible(true);
diff --git a/java/com/google/gerrit/git/RefUpdateUtil.java b/java/com/google/gerrit/git/RefUpdateUtil.java
index c2db073..43ce3f9 100644
--- a/java/com/google/gerrit/git/RefUpdateUtil.java
+++ b/java/com/google/gerrit/git/RefUpdateUtil.java
@@ -165,8 +165,8 @@
case LOCK_FAILURE:
throw new LockFailureException("Failed to delete " + refName + ": " + ru.getResult(), ru);
- // Not really failures, but should not be the result of a deletion, so the best option is to
- // throw.
+ // Not really failures, but should not be the result of a deletion, so the best option is to
+ // throw.
case NO_CHANGE:
case FAST_FORWARD:
case RENAMED:
diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 727bb7c..fd85c19 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -1162,9 +1162,15 @@
@Nullable
private Object parseRequest(HttpServletRequest req, Type type)
- throws IOException, BadRequestException, SecurityException, IllegalArgumentException,
- NoSuchMethodException, IllegalAccessException, InstantiationException,
- InvocationTargetException, MethodNotAllowedException {
+ throws IOException,
+ BadRequestException,
+ SecurityException,
+ IllegalArgumentException,
+ NoSuchMethodException,
+ IllegalAccessException,
+ InstantiationException,
+ InvocationTargetException,
+ MethodNotAllowedException {
// HTTP/1.1 requires consuming the request body before writing non-error response (less than
// 400). Consume the request body for all but raw input request types here.
if (isType(JSON_TYPE, req.getContentType())) {
@@ -1241,8 +1247,12 @@
}
private Object parseRawInput(HttpServletRequest req, Type type)
- throws SecurityException, NoSuchMethodException, IllegalArgumentException,
- InstantiationException, IllegalAccessException, InvocationTargetException,
+ throws SecurityException,
+ NoSuchMethodException,
+ IllegalArgumentException,
+ InstantiationException,
+ IllegalAccessException,
+ InvocationTargetException,
MethodNotAllowedException {
Object obj = createInstance(type);
for (Field f : obj.getClass().getDeclaredFields()) {
@@ -1256,8 +1266,12 @@
}
private Object parseString(String value, Type type)
- throws BadRequestException, SecurityException, NoSuchMethodException,
- IllegalArgumentException, IllegalAccessException, InstantiationException,
+ throws BadRequestException,
+ SecurityException,
+ NoSuchMethodException,
+ IllegalArgumentException,
+ IllegalAccessException,
+ InstantiationException,
InvocationTargetException {
if (type == String.class) {
return value;
@@ -1279,7 +1293,9 @@
}
private static Object createInstance(Type type)
- throws NoSuchMethodException, InstantiationException, IllegalAccessException,
+ throws NoSuchMethodException,
+ InstantiationException,
+ IllegalAccessException,
InvocationTargetException {
if (type instanceof Class) {
Class<?> clazz = (Class<?>) type;
diff --git a/java/com/google/gerrit/index/query/QueryProcessor.java b/java/com/google/gerrit/index/query/QueryProcessor.java
index f49cecb..341918c 100644
--- a/java/com/google/gerrit/index/query/QueryProcessor.java
+++ b/java/com/google/gerrit/index/query/QueryProcessor.java
@@ -323,7 +323,8 @@
// TODO(brohlfs): Remove this extra logging by end of Q3 2023.
if (limit > 500 && userProvidedLimit <= 0 && matchCount > 100 && enforceVisibility) {
logger.atWarning().log(
- "%s index query without provided limit. effective limit: %d, result count: %d, query: %s",
+ "%s index query without provided limit. effective limit: %d, result count: %d, query:"
+ + " %s",
schemaDef.getName(), getPermittedLimit(), matchCount, queryString);
}
out.add(QueryResult.create(queryString, predicates.get(i), limit, matchesList));
diff --git a/java/com/google/gerrit/lucene/QueryBuilder.java b/java/com/google/gerrit/lucene/QueryBuilder.java
index 4ff41a1..f9e6b76 100644
--- a/java/com/google/gerrit/lucene/QueryBuilder.java
+++ b/java/com/google/gerrit/lucene/QueryBuilder.java
@@ -48,7 +48,9 @@
import org.apache.lucene.util.BytesRefBuilder;
public class QueryBuilder<V> {
- /** @param name field name qparam i key value */
+ /**
+ * @param name field name qparam i key value
+ */
static Term intTerm(String name) {
checkState(false, "Lucene index implementation removed legacy numeric type");
return null;
diff --git a/java/com/google/gerrit/server/CommentsUtil.java b/java/com/google/gerrit/server/CommentsUtil.java
index bddd86a..06813d1 100644
--- a/java/com/google/gerrit/server/CommentsUtil.java
+++ b/java/com/google/gerrit/server/CommentsUtil.java
@@ -309,6 +309,7 @@
Optional.ofNullable(cm.getAuthor()).map(a -> a.get()),
Optional.ofNullable(comment.author).map(a -> a._accountId));
}
+
/**
* For the commit message the A side in a diff view is always empty when a comparison against an
* ancestor is done, so there can't be any comments on this ancestor. However earlier we showed
diff --git a/java/com/google/gerrit/server/PublishCommentsOp.java b/java/com/google/gerrit/server/PublishCommentsOp.java
index bfafcb6..8205907 100644
--- a/java/com/google/gerrit/server/PublishCommentsOp.java
+++ b/java/com/google/gerrit/server/PublishCommentsOp.java
@@ -87,8 +87,11 @@
@Override
public boolean updateChange(ChangeContext ctx)
- throws ResourceConflictException, UnprocessableEntityException, IOException,
- PatchListNotAvailableException, CommentsRejectedException {
+ throws ResourceConflictException,
+ UnprocessableEntityException,
+ IOException,
+ PatchListNotAvailableException,
+ CommentsRejectedException {
preUpdateMetaId = ctx.getNotes().getMetaId();
comments =
draftCommentsReader.getDraftsByChangeAndDraftAuthor(
diff --git a/java/com/google/gerrit/server/account/AccountResolver.java b/java/com/google/gerrit/server/account/AccountResolver.java
index 65e9d9d..20a12f4 100644
--- a/java/com/google/gerrit/server/account/AccountResolver.java
+++ b/java/com/google/gerrit/server/account/AccountResolver.java
@@ -836,7 +836,9 @@
return AccountResolver::allVisible;
}
- /** @param accountState account state for which the visibility should be checked */
+ /**
+ * @param accountState account state for which the visibility should be checked
+ */
private static boolean allVisible(AccountState accountState) {
return true;
}
diff --git a/java/com/google/gerrit/server/account/externalids/storage/notedb/ExternalIdsConsistencyCheckerNoteDbImpl.java b/java/com/google/gerrit/server/account/externalids/storage/notedb/ExternalIdsConsistencyCheckerNoteDbImpl.java
index 83c72f1..c44e027 100644
--- a/java/com/google/gerrit/server/account/externalids/storage/notedb/ExternalIdsConsistencyCheckerNoteDbImpl.java
+++ b/java/com/google/gerrit/server/account/externalids/storage/notedb/ExternalIdsConsistencyCheckerNoteDbImpl.java
@@ -59,7 +59,8 @@
this.validator = validator;
checkState(
externalIdFactory instanceof ExternalIdFactoryNoteDbImpl,
- "ExternalIdsConsistencyCheckerNoteDbImpl must be initiated with ExternalIdFactoryNoteDbImpl.");
+ "ExternalIdsConsistencyCheckerNoteDbImpl must be initiated with"
+ + " ExternalIdFactoryNoteDbImpl.");
this.externalIdFactory = (ExternalIdFactoryNoteDbImpl) externalIdFactory;
}
diff --git a/java/com/google/gerrit/server/approval/ApprovalsUtil.java b/java/com/google/gerrit/server/approval/ApprovalsUtil.java
index e64c273..cd9c9ba 100644
--- a/java/com/google/gerrit/server/approval/ApprovalsUtil.java
+++ b/java/com/google/gerrit/server/approval/ApprovalsUtil.java
@@ -727,7 +727,8 @@
LabelVote.create(
approvalData.patchSetApproval().label(),
approvalData.patchSetApproval().value()))
- .entries().stream()
+ .entries()
+ .stream()
.collect(
toImmutableListMultimap(
e -> e.getKey(), e -> e.getValue().patchSetApproval().accountId()));
@@ -804,7 +805,10 @@
// request (e.g. a group used in this query might not be visible to the person sending this
// request).
try (ManualRequestContext ignored = requestContext.open()) {
- return approvalQueryBuilderProvider.get().parse(copyCondition).getFlattenedPredicateList()
+ return approvalQueryBuilderProvider
+ .get()
+ .parse(copyCondition)
+ .getFlattenedPredicateList()
.stream()
.anyMatch(UserInPredicate.class::isInstance);
}
diff --git a/java/com/google/gerrit/server/change/LabelsJson.java b/java/com/google/gerrit/server/change/LabelsJson.java
index e4118d5..c72c7a0 100644
--- a/java/com/google/gerrit/server/change/LabelsJson.java
+++ b/java/com/google/gerrit/server/change/LabelsJson.java
@@ -215,7 +215,7 @@
boolean detailed)
throws PermissionBackendException {
Map<String, LabelWithStatus> labels =
- initLabels(accountLoader, cd, labelTypes, /*includeAccountInfo=*/ standard || detailed);
+ initLabels(accountLoader, cd, labelTypes, /* includeAccountInfo= */ standard || detailed);
setAllApprovals(accountLoader, cd, labels, detailed);
for (Map.Entry<String, LabelWithStatus> e : labels.entrySet()) {
diff --git a/java/com/google/gerrit/server/change/ParentDataProvider.java b/java/com/google/gerrit/server/change/ParentDataProvider.java
index c0a1ffe..ffa46764b 100644
--- a/java/com/google/gerrit/server/change/ParentDataProvider.java
+++ b/java/com/google/gerrit/server/change/ParentDataProvider.java
@@ -100,7 +100,8 @@
List<ChangeData> changeData = queryProvider.get().byCommit(parentCommitId.name());
if (changeData.size() > 1) {
logger.atWarning().log(
- "Found more than one change associated with parent revision %s (project: %s). Found changes %s.",
+ "Found more than one change associated with parent revision %s (project: %s). Found"
+ + " changes %s.",
parentCommitId.name(),
project.get(),
changeData.stream().map(ChangeData::getId).collect(ImmutableList.toImmutableList()));
diff --git a/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java
index de3b7d5..6ebc9b7 100644
--- a/java/com/google/gerrit/server/change/RebaseChangeOp.java
+++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java
@@ -276,7 +276,10 @@
@Override
public void updateRepo(RepoContext ctx)
- throws InvalidChangeOperationException, RestApiException, IOException, NoSuchChangeException,
+ throws InvalidChangeOperationException,
+ RestApiException,
+ IOException,
+ NoSuchChangeException,
PermissionBackendException {
// Ok that originalPatchSet was not read in a transaction, since we just
// need its revision.
diff --git a/java/com/google/gerrit/server/comment/CommentContextCacheImpl.java b/java/com/google/gerrit/server/comment/CommentContextCacheImpl.java
index 5b4c3d2..2bd8d5f 100644
--- a/java/com/google/gerrit/server/comment/CommentContextCacheImpl.java
+++ b/java/com/google/gerrit/server/comment/CommentContextCacheImpl.java
@@ -109,8 +109,7 @@
Collectors.toMap(
Function.identity(),
k ->
- adjustMaxContextPadding(k)
- .toBuilder()
+ adjustMaxContextPadding(k).toBuilder()
.path(Loader.hashPath(k.path()))
.build()));
diff --git a/java/com/google/gerrit/server/config/CachedPreferences.java b/java/com/google/gerrit/server/config/CachedPreferences.java
index 169d9ec..de28ea0 100644
--- a/java/com/google/gerrit/server/config/CachedPreferences.java
+++ b/java/com/google/gerrit/server/config/CachedPreferences.java
@@ -44,6 +44,7 @@
public Optional<CachedPreferencesProto> nonEmptyConfig() {
return config().equals(EMPTY.config()) ? Optional.empty() : Optional.of(config());
}
+
/** Returns a cache-able representation of the preferences proto. */
public static CachedPreferences fromUserPreferencesProto(UserPreferences proto) {
return fromCachedPreferencesProto(
@@ -105,7 +106,7 @@
try {
switch (config().getPreferencesCase()) {
case LEGACY_GIT_CONFIG:
- // continue below
+ // continue below
case PREFERENCES_NOT_SET:
Config cfg = new Config();
cfg.fromText(config().getLegacyGitConfig());
diff --git a/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/java/com/google/gerrit/server/edit/ChangeEditModifier.java
index 68569f0..9cef539 100644
--- a/java/com/google/gerrit/server/edit/ChangeEditModifier.java
+++ b/java/com/google/gerrit/server/edit/ChangeEditModifier.java
@@ -135,8 +135,11 @@
* @throws InvalidChangeOperationException if a change edit already existed for the change
*/
public void createEdit(Repository repository, ChangeNotes notes)
- throws AuthException, IOException, InvalidChangeOperationException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ IOException,
+ InvalidChangeOperationException,
+ PermissionBackendException,
+ ResourceConflictException {
assertCanEdit(notes);
Optional<ChangeEdit> changeEdit = lookupChangeEdit(notes);
@@ -161,8 +164,11 @@
* the root commit
*/
public void rebaseEdit(Repository repository, ChangeNotes notes)
- throws AuthException, InvalidChangeOperationException, IOException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ InvalidChangeOperationException,
+ IOException,
+ PermissionBackendException,
+ ResourceConflictException {
assertCanEdit(notes);
Optional<ChangeEdit> optionalChangeEdit = lookupChangeEdit(notes);
@@ -227,8 +233,12 @@
* @throws BadRequestException if the commit message is malformed
*/
public void modifyMessage(Repository repository, ChangeNotes notes, String newCommitMessage)
- throws AuthException, IOException, InvalidChangeOperationException,
- PermissionBackendException, BadRequestException, ResourceConflictException {
+ throws AuthException,
+ IOException,
+ InvalidChangeOperationException,
+ PermissionBackendException,
+ BadRequestException,
+ ResourceConflictException {
modifyCommit(
repository,
notes,
@@ -256,8 +266,12 @@
String filePath,
RawInput newContent,
@Nullable Integer newGitFileMode)
- throws AuthException, BadRequestException, InvalidChangeOperationException, IOException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ BadRequestException,
+ InvalidChangeOperationException,
+ IOException,
+ PermissionBackendException,
+ ResourceConflictException {
modifyCommit(
repository,
notes,
@@ -281,8 +295,12 @@
* @throws ResourceConflictException if the project state does not permit the operation
*/
public void deleteFile(Repository repository, ChangeNotes notes, String file)
- throws AuthException, BadRequestException, InvalidChangeOperationException, IOException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ BadRequestException,
+ InvalidChangeOperationException,
+ IOException,
+ PermissionBackendException,
+ ResourceConflictException {
modifyCommit(
repository,
notes,
@@ -306,8 +324,12 @@
*/
public void renameFile(
Repository repository, ChangeNotes notes, String currentFilePath, String newFilePath)
- throws AuthException, BadRequestException, InvalidChangeOperationException, IOException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ BadRequestException,
+ InvalidChangeOperationException,
+ IOException,
+ PermissionBackendException,
+ ResourceConflictException {
modifyCommit(
repository,
notes,
@@ -329,8 +351,12 @@
* @throws InvalidChangeOperationException if the file was already restored
*/
public void restoreFile(Repository repository, ChangeNotes notes, String file)
- throws AuthException, BadRequestException, InvalidChangeOperationException, IOException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ BadRequestException,
+ InvalidChangeOperationException,
+ IOException,
+ PermissionBackendException,
+ ResourceConflictException {
modifyCommit(
repository,
notes,
@@ -361,8 +387,12 @@
ChangeNotes notes,
PatchSet patchSet,
CommitModification commitModification)
- throws AuthException, BadRequestException, IOException, InvalidChangeOperationException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ BadRequestException,
+ IOException,
+ InvalidChangeOperationException,
+ PermissionBackendException,
+ ResourceConflictException {
return modifyCommit(
repository, notes, new ModificationIntention.PatchsetCommit(patchSet), commitModification);
}
@@ -372,8 +402,12 @@
ChangeNotes notes,
ModificationIntention modificationIntention,
CommitModification commitModification)
- throws AuthException, BadRequestException, IOException, InvalidChangeOperationException,
- PermissionBackendException, ResourceConflictException {
+ throws AuthException,
+ BadRequestException,
+ IOException,
+ InvalidChangeOperationException,
+ PermissionBackendException,
+ ResourceConflictException {
assertCanEdit(notes);
Optional<ChangeEdit> optionalChangeEdit = lookupChangeEdit(notes);
diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java
index 0d6885e..dcb7790 100644
--- a/java/com/google/gerrit/server/git/MergeUtil.java
+++ b/java/com/google/gerrit/server/git/MergeUtil.java
@@ -222,8 +222,11 @@
int parentIndex,
boolean ignoreIdenticalTree,
boolean allowConflicts)
- throws IOException, MergeIdenticalTreeException, MergeConflictException,
- MethodNotAllowedException, InvalidMergeStrategyException {
+ throws IOException,
+ MergeIdenticalTreeException,
+ MergeConflictException,
+ MethodNotAllowedException,
+ InvalidMergeStrategyException {
ThreeWayMerger m = newThreeWayMerger(inserter, repoConfig);
m.setBase(originalCommit.getParent(parentIndex));
@@ -411,7 +414,9 @@
PersonIdent committerIdent,
String commitMsg,
CodeReviewRevWalk rw)
- throws IOException, MergeIdenticalTreeException, MergeConflictException,
+ throws IOException,
+ MergeIdenticalTreeException,
+ MergeConflictException,
InvalidMergeStrategyException {
return createMergeCommit(
inserter,
@@ -437,7 +442,9 @@
PersonIdent committerIdent,
String commitMsg,
CodeReviewRevWalk rw)
- throws IOException, MergeIdenticalTreeException, MergeConflictException,
+ throws IOException,
+ MergeIdenticalTreeException,
+ MergeConflictException,
InvalidMergeStrategyException {
if (!MergeStrategy.THEIRS.getName().equals(mergeStrategy)
diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
index 254e57b..6444de5 100644
--- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java
+++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
@@ -257,7 +257,10 @@
@Override
public boolean updateChange(ChangeContext ctx)
- throws RestApiException, IOException, PermissionBackendException, ConfigInvalidException,
+ throws RestApiException,
+ IOException,
+ PermissionBackendException,
+ ConfigInvalidException,
ValidationException {
notes = ctx.getNotes();
Change change = notes.getChange();
diff --git a/java/com/google/gerrit/server/mail/send/AttentionSetChangeEmailDecorator.java b/java/com/google/gerrit/server/mail/send/AttentionSetChangeEmailDecorator.java
index ebc9e4c..ad1c175 100644
--- a/java/com/google/gerrit/server/mail/send/AttentionSetChangeEmailDecorator.java
+++ b/java/com/google/gerrit/server/mail/send/AttentionSetChangeEmailDecorator.java
@@ -26,8 +26,10 @@
/** User who is being added/removed from attention set. */
public void setAttentionSetUser(Account.Id attentionSetUser);
+
/** Cause of the change in attention set. */
public void setReason(String reason);
+
/** Whether the user is being added or removed. */
public void setAttentionSetChange(AttentionSetChange attentionSetChange);
}
diff --git a/java/com/google/gerrit/server/mail/send/ChangeEmailImpl.java b/java/com/google/gerrit/server/mail/send/ChangeEmailImpl.java
index 4ecbd52..1ba5e2a 100644
--- a/java/com/google/gerrit/server/mail/send/ChangeEmailImpl.java
+++ b/java/com/google/gerrit/server/mail/send/ChangeEmailImpl.java
@@ -547,7 +547,7 @@
authors.add(patchSetInfo.getCommitter().getAccount());
}
}
- // $FALL-THROUGH$
+ // $FALL-THROUGH$
case OWNER_REVIEWERS:
case OWNER:
authors.add(change.getOwner());
diff --git a/java/com/google/gerrit/server/mail/send/StartReviewChangeEmailDecoratorImpl.java b/java/com/google/gerrit/server/mail/send/StartReviewChangeEmailDecoratorImpl.java
index 1e91ba2..67bf95b 100644
--- a/java/com/google/gerrit/server/mail/send/StartReviewChangeEmailDecoratorImpl.java
+++ b/java/com/google/gerrit/server/mail/send/StartReviewChangeEmailDecoratorImpl.java
@@ -120,7 +120,7 @@
default:
extraCC.stream().forEach(cc -> email.addByAccountId(RecipientType.CC, cc));
extraCCByEmail.stream().forEach(cc -> email.addByEmail(RecipientType.CC, cc));
- // $FALL-THROUGH$
+ // $FALL-THROUGH$
case OWNER_REVIEWERS:
reviewers.stream().forEach(r -> email.addByAccountId(RecipientType.TO, r, true));
reviewersByEmail.stream().forEach(r -> email.addByEmail(RecipientType.TO, r, true));
diff --git a/java/com/google/gerrit/server/notedb/StarredChangesUtilNoteDbImpl.java b/java/com/google/gerrit/server/notedb/StarredChangesUtilNoteDbImpl.java
index d5258b1..27a441b 100644
--- a/java/com/google/gerrit/server/notedb/StarredChangesUtilNoteDbImpl.java
+++ b/java/com/google/gerrit/server/notedb/StarredChangesUtilNoteDbImpl.java
@@ -132,7 +132,10 @@
.map(c -> RefNames.refsStarredChanges(c, caller))
.collect(Collectors.toList());
try {
- return allUsersRepo.getRefDatabase().exactRef(starRefs.toArray(new String[0])).keySet()
+ return allUsersRepo
+ .getRefDatabase()
+ .exactRef(starRefs.toArray(new String[0]))
+ .keySet()
.stream()
.map(r -> Change.Id.fromAllUsersRef(r))
.collect(Collectors.toSet());
diff --git a/java/com/google/gerrit/server/patch/GitPositionTransformer.java b/java/com/google/gerrit/server/patch/GitPositionTransformer.java
index b2c02e7..880037b 100644
--- a/java/com/google/gerrit/server/patch/GitPositionTransformer.java
+++ b/java/com/google/gerrit/server/patch/GitPositionTransformer.java
@@ -139,7 +139,9 @@
Set<String> newFiles = newFilesPerOldFile.get(oldFilePath);
if (newFiles.isEmpty()) {
// File was deleted.
- return positionConflictStrategy.getOnFileConflict(entity.position()).map(entity::withPosition)
+ return positionConflictStrategy
+ .getOnFileConflict(entity.position())
+ .map(entity::withPosition)
.stream();
}
return newFiles.stream().map(entity::withFilePath);
diff --git a/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/java/com/google/gerrit/server/patch/PatchScriptFactory.java
index 5015c768..08af714 100644
--- a/java/com/google/gerrit/server/patch/PatchScriptFactory.java
+++ b/java/com/google/gerrit/server/patch/PatchScriptFactory.java
@@ -177,7 +177,10 @@
@Override
public PatchScript call()
- throws LargeObjectException, AuthException, InvalidChangeOperationException, IOException,
+ throws LargeObjectException,
+ AuthException,
+ InvalidChangeOperationException,
+ IOException,
PermissionBackendException {
if (!permissionBackend.user(currentUser).change(notes).test(ChangePermission.READ)) {
diff --git a/java/com/google/gerrit/server/patch/SubmitWithStickyApprovalDiff.java b/java/com/google/gerrit/server/patch/SubmitWithStickyApprovalDiff.java
index f6faa4e..ab9e6f9 100644
--- a/java/com/google/gerrit/server/patch/SubmitWithStickyApprovalDiff.java
+++ b/java/com/google/gerrit/server/patch/SubmitWithStickyApprovalDiff.java
@@ -106,7 +106,9 @@
}
public String apply(ChangeNotes notes, CurrentUser currentUser)
- throws AuthException, IOException, PermissionBackendException,
+ throws AuthException,
+ IOException,
+ PermissionBackendException,
InvalidChangeOperationException {
PatchSet currentPatchset = notes.getCurrentPatchSet();
@@ -193,7 +195,9 @@
CurrentUser currentUser,
@Nullable List<String> formatterResult,
boolean isDiffTooLarge)
- throws AuthException, InvalidChangeOperationException, IOException,
+ throws AuthException,
+ InvalidChangeOperationException,
+ IOException,
PermissionBackendException {
StringBuilder diff =
new StringBuilder(
diff --git a/java/com/google/gerrit/server/patch/filediff/FileDiffOutput.java b/java/com/google/gerrit/server/patch/filediff/FileDiffOutput.java
index 9107dde..b7cd5e4 100644
--- a/java/com/google/gerrit/server/patch/filediff/FileDiffOutput.java
+++ b/java/com/google/gerrit/server/patch/filediff/FileDiffOutput.java
@@ -158,8 +158,7 @@
*/
public static FileDiffOutput createNegative(
String filePath, ObjectId oldCommitId, ObjectId newCommitId) {
- return empty(filePath, oldCommitId, newCommitId)
- .toBuilder()
+ return empty(filePath, oldCommitId, newCommitId).toBuilder()
.negative(Optional.of(true))
.build();
}
diff --git a/java/com/google/gerrit/server/permissions/RefControl.java b/java/com/google/gerrit/server/permissions/RefControl.java
index aba9522..153fd59 100644
--- a/java/com/google/gerrit/server/permissions/RefControl.java
+++ b/java/com/google/gerrit/server/permissions/RefControl.java
@@ -704,7 +704,8 @@
if (resolvedRef == null) {
return false;
}
- return projectControl.asForProject()
+ return projectControl
+ .asForProject()
.filter(
ImmutableList.of(resolvedRef), repo, PermissionBackend.RefFilterOptions.defaults())
.stream()
diff --git a/java/com/google/gerrit/server/plugins/JarPluginProvider.java b/java/com/google/gerrit/server/plugins/JarPluginProvider.java
index 760631d..0a0b07e 100644
--- a/java/com/google/gerrit/server/plugins/JarPluginProvider.java
+++ b/java/com/google/gerrit/server/plugins/JarPluginProvider.java
@@ -178,7 +178,7 @@
case PLUGIN:
return pluginApiClassLoader;
- // $CASES-OMITTED$
+ // $CASES-OMITTED$
default:
return PluginUtil.parentFor(type);
}
diff --git a/java/com/google/gerrit/server/restapi/account/AddSshKey.java b/java/com/google/gerrit/server/restapi/account/AddSshKey.java
index fa04707..04b046a 100644
--- a/java/com/google/gerrit/server/restapi/account/AddSshKey.java
+++ b/java/com/google/gerrit/server/restapi/account/AddSshKey.java
@@ -77,7 +77,10 @@
@Override
public Response<SshKeyInfo> apply(AccountResource rsrc, SshKeyInput input)
- throws AuthException, BadRequestException, IOException, ConfigInvalidException,
+ throws AuthException,
+ BadRequestException,
+ IOException,
+ ConfigInvalidException,
PermissionBackendException {
if (!self.get().hasSameAccountId(rsrc.getUser())) {
permissionBackend.currentUser().check(GlobalPermission.ADMINISTRATE_SERVER);
diff --git a/java/com/google/gerrit/server/restapi/account/CreateAccount.java b/java/com/google/gerrit/server/restapi/account/CreateAccount.java
index c9ae7d3..74caf74 100644
--- a/java/com/google/gerrit/server/restapi/account/CreateAccount.java
+++ b/java/com/google/gerrit/server/restapi/account/CreateAccount.java
@@ -117,14 +117,22 @@
@Override
public Response<AccountInfo> apply(
TopLevelResource rsrc, IdString id, @Nullable AccountInput input)
- throws BadRequestException, ResourceConflictException, UnprocessableEntityException,
- IOException, ConfigInvalidException, PermissionBackendException {
+ throws BadRequestException,
+ ResourceConflictException,
+ UnprocessableEntityException,
+ IOException,
+ ConfigInvalidException,
+ PermissionBackendException {
return apply(id, input != null ? input : new AccountInput());
}
public Response<AccountInfo> apply(IdString id, AccountInput input)
- throws BadRequestException, ResourceConflictException, UnprocessableEntityException,
- IOException, ConfigInvalidException, PermissionBackendException {
+ throws BadRequestException,
+ ResourceConflictException,
+ UnprocessableEntityException,
+ IOException,
+ ConfigInvalidException,
+ PermissionBackendException {
String username = applyCaseOfUsername(id.get());
if (input.username != null && !username.equals(applyCaseOfUsername(input.username))) {
throw new BadRequestException("username must match URL");
diff --git a/java/com/google/gerrit/server/restapi/account/CreateEmail.java b/java/com/google/gerrit/server/restapi/account/CreateEmail.java
index 57cd466..bcebcd1 100644
--- a/java/com/google/gerrit/server/restapi/account/CreateEmail.java
+++ b/java/com/google/gerrit/server/restapi/account/CreateEmail.java
@@ -114,8 +114,12 @@
@Override
public Response<EmailInfo> apply(AccountResource rsrc, IdString id, EmailInput input)
- throws RestApiException, EmailException, MethodNotAllowedException, IOException,
- ConfigInvalidException, PermissionBackendException {
+ throws RestApiException,
+ EmailException,
+ MethodNotAllowedException,
+ IOException,
+ ConfigInvalidException,
+ PermissionBackendException {
if (input == null) {
input = new EmailInput();
}
@@ -134,8 +138,12 @@
/** To be used from plugins that want to create emails without permission checks. */
@UsedAt(UsedAt.Project.PLUGIN_SERVICEUSER)
public EmailInfo apply(IdentifiedUser user, IdString id, EmailInput input)
- throws RestApiException, EmailException, MethodNotAllowedException, IOException,
- ConfigInvalidException, PermissionBackendException {
+ throws RestApiException,
+ EmailException,
+ MethodNotAllowedException,
+ IOException,
+ ConfigInvalidException,
+ PermissionBackendException {
String email = id.get().trim();
if (input == null) {
diff --git a/java/com/google/gerrit/server/restapi/account/DeleteSshKey.java b/java/com/google/gerrit/server/restapi/account/DeleteSshKey.java
index 53f15d4..3c32e6a 100644
--- a/java/com/google/gerrit/server/restapi/account/DeleteSshKey.java
+++ b/java/com/google/gerrit/server/restapi/account/DeleteSshKey.java
@@ -71,7 +71,10 @@
@Override
public Response<?> apply(AccountResource.SshKey rsrc, Input input)
- throws AuthException, RepositoryNotFoundException, IOException, ConfigInvalidException,
+ throws AuthException,
+ RepositoryNotFoundException,
+ IOException,
+ ConfigInvalidException,
PermissionBackendException {
if (!self.get().hasSameAccountId(rsrc.getUser())) {
permissionBackend.currentUser().check(GlobalPermission.ADMINISTRATE_SERVER);
diff --git a/java/com/google/gerrit/server/restapi/account/PutHttpPassword.java b/java/com/google/gerrit/server/restapi/account/PutHttpPassword.java
index 2aa0ef0..a3478f7 100644
--- a/java/com/google/gerrit/server/restapi/account/PutHttpPassword.java
+++ b/java/com/google/gerrit/server/restapi/account/PutHttpPassword.java
@@ -103,8 +103,12 @@
@Override
public Response<String> apply(AccountResource rsrc, HttpPasswordInput input)
- throws AuthException, ResourceNotFoundException, ResourceConflictException, IOException,
- ConfigInvalidException, PermissionBackendException {
+ throws AuthException,
+ ResourceNotFoundException,
+ ResourceConflictException,
+ IOException,
+ ConfigInvalidException,
+ PermissionBackendException {
if (!self.get().hasSameAccountId(rsrc.getUser())) {
permissionBackend.currentUser().check(GlobalPermission.ADMINISTRATE_SERVER);
}
@@ -129,7 +133,9 @@
@UsedAt(UsedAt.Project.PLUGIN_SERVICEUSER)
public Response<String> apply(IdentifiedUser user, String newPassword)
- throws ResourceNotFoundException, ResourceConflictException, IOException,
+ throws ResourceNotFoundException,
+ ResourceConflictException,
+ IOException,
ConfigInvalidException {
String userName =
user.getUserName().orElseThrow(() -> new ResourceConflictException("username must be set"));
diff --git a/java/com/google/gerrit/server/restapi/change/ChangeEdits.java b/java/com/google/gerrit/server/restapi/change/ChangeEdits.java
index 8a7beb6..ce78bc7 100644
--- a/java/com/google/gerrit/server/restapi/change/ChangeEdits.java
+++ b/java/com/google/gerrit/server/restapi/change/ChangeEdits.java
@@ -132,7 +132,10 @@
@Override
public Response<Object> apply(
ChangeResource resource, IdString id, FileContentInput fileContentInput)
- throws AuthException, BadRequestException, ResourceConflictException, IOException,
+ throws AuthException,
+ BadRequestException,
+ ResourceConflictException,
+ IOException,
PermissionBackendException {
putEdit.apply(resource, id.get(), fileContentInput);
return Response.none();
@@ -151,7 +154,10 @@
@Override
public Response<Object> apply(ChangeResource rsrc, IdString id, Input input)
- throws IOException, AuthException, BadRequestException, ResourceConflictException,
+ throws IOException,
+ AuthException,
+ BadRequestException,
+ ResourceConflictException,
PermissionBackendException {
return deleteContent.apply(rsrc, id.get());
}
@@ -198,7 +204,10 @@
@Override
public Response<EditInfo> apply(ChangeResource rsrc)
- throws AuthException, IOException, ResourceNotFoundException, ResourceConflictException,
+ throws AuthException,
+ IOException,
+ ResourceNotFoundException,
+ ResourceConflictException,
PermissionBackendException {
Optional<ChangeEdit> edit = editUtil.byChange(rsrc.getNotes(), rsrc.getUser());
if (!edit.isPresent()) {
@@ -254,7 +263,10 @@
@Override
public Response<Object> apply(ChangeResource resource, Post.Input postInput)
- throws AuthException, BadRequestException, IOException, ResourceConflictException,
+ throws AuthException,
+ BadRequestException,
+ IOException,
+ ResourceConflictException,
PermissionBackendException {
Project.NameKey project = resource.getProject();
try (Repository repository = repositoryManager.openRepository(project)) {
@@ -307,7 +319,10 @@
@Override
public Response<Object> apply(ChangeEditResource rsrc, FileContentInput fileContentInput)
- throws AuthException, BadRequestException, ResourceConflictException, IOException,
+ throws AuthException,
+ BadRequestException,
+ ResourceConflictException,
+ IOException,
PermissionBackendException {
return apply(rsrc.getChangeResource(), rsrc.getPath(), fileContentInput);
}
@@ -331,7 +346,10 @@
public Response<Object> apply(
ChangeResource rsrc, String path, FileContentInput fileContentInput)
- throws AuthException, BadRequestException, ResourceConflictException, IOException,
+ throws AuthException,
+ BadRequestException,
+ ResourceConflictException,
+ IOException,
PermissionBackendException {
if (fileContentInput.content == null && fileContentInput.binary_content == null) {
@@ -395,13 +413,19 @@
@Override
public Response<Object> apply(ChangeEditResource rsrc, Input input)
- throws AuthException, BadRequestException, ResourceConflictException, IOException,
+ throws AuthException,
+ BadRequestException,
+ ResourceConflictException,
+ IOException,
PermissionBackendException {
return apply(rsrc.getChangeResource(), rsrc.getPath());
}
public Response<Object> apply(ChangeResource rsrc, String filePath)
- throws AuthException, BadRequestException, IOException, ResourceConflictException,
+ throws AuthException,
+ BadRequestException,
+ IOException,
+ ResourceConflictException,
PermissionBackendException {
try (Repository repository = repositoryManager.openRepository(rsrc.getProject())) {
editModifier.deleteFile(repository, rsrc.getNotes(), filePath);
@@ -501,7 +525,10 @@
@Override
public Response<Object> apply(ChangeResource rsrc, EditMessage.Input editMessageInput)
- throws AuthException, IOException, BadRequestException, ResourceConflictException,
+ throws AuthException,
+ IOException,
+ BadRequestException,
+ ResourceConflictException,
PermissionBackendException {
if (editMessageInput == null || Strings.isNullOrEmpty(editMessageInput.message)) {
throw new BadRequestException("commit message must be provided");
diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
index 12cfbe6..c8e80f5 100644
--- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
@@ -163,8 +163,12 @@
* @throws NoSuchProjectException Can't find project state.
*/
public Result cherryPick(Change change, PatchSet patch, CherryPickInput input, BranchNameKey dest)
- throws IOException, InvalidChangeOperationException, UpdateException, RestApiException,
- ConfigInvalidException, NoSuchProjectException {
+ throws IOException,
+ InvalidChangeOperationException,
+ UpdateException,
+ RestApiException,
+ ConfigInvalidException,
+ NoSuchProjectException {
return cherryPick(
change,
change.getProject(),
@@ -204,8 +208,12 @@
ObjectId sourceCommit,
CherryPickInput input,
BranchNameKey dest)
- throws IOException, InvalidChangeOperationException, UpdateException, RestApiException,
- ConfigInvalidException, NoSuchProjectException {
+ throws IOException,
+ InvalidChangeOperationException,
+ UpdateException,
+ RestApiException,
+ ConfigInvalidException,
+ NoSuchProjectException {
return cherryPick(
sourceChange,
project,
@@ -265,8 +273,12 @@
@Nullable Change.Id idForNewChange,
@Nullable Boolean workInProgress,
Optional<RevCommit> verifiedBaseCommit)
- throws IOException, InvalidChangeOperationException, UpdateException, RestApiException,
- ConfigInvalidException, NoSuchProjectException {
+ throws IOException,
+ InvalidChangeOperationException,
+ UpdateException,
+ RestApiException,
+ ConfigInvalidException,
+ NoSuchProjectException {
IdentifiedUser identifiedUser = user.get();
try (Repository git = gitManager.openRepository(project);
// This inserter and revwalk *must* be passed to any BatchUpdates
diff --git a/java/com/google/gerrit/server/restapi/change/CreateChange.java b/java/com/google/gerrit/server/restapi/change/CreateChange.java
index 5146a97..e597607 100644
--- a/java/com/google/gerrit/server/restapi/change/CreateChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CreateChange.java
@@ -182,8 +182,12 @@
@Override
public Response<ChangeInfo> apply(TopLevelResource parent, ChangeInput input)
- throws IOException, InvalidChangeOperationException, RestApiException, UpdateException,
- PermissionBackendException, ConfigInvalidException {
+ throws IOException,
+ InvalidChangeOperationException,
+ RestApiException,
+ UpdateException,
+ PermissionBackendException,
+ ConfigInvalidException {
if (Strings.isNullOrEmpty(input.project)) {
throw new BadRequestException("project must be non-empty");
}
@@ -194,7 +198,10 @@
/** Creates the changes in the given project. This is public for reuse in the project API. */
public Response<ChangeInfo> execute(
BatchUpdate.Factory updateFactory, ChangeInput input, ProjectResource projectResource)
- throws IOException, RestApiException, UpdateException, PermissionBackendException,
+ throws IOException,
+ RestApiException,
+ UpdateException,
+ PermissionBackendException,
ConfigInvalidException {
if (!user.get().isIdentifiedUser()) {
throw new AuthException("Authentication required");
@@ -333,7 +340,10 @@
IdentifiedUser me,
ProjectState projectState,
BatchUpdate.Factory updateFactory)
- throws RestApiException, PermissionBackendException, IOException, ConfigInvalidException,
+ throws RestApiException,
+ PermissionBackendException,
+ IOException,
+ ConfigInvalidException,
UpdateException {
try (RefUpdateContext ctx = RefUpdateContext.open(CHANGE_MODIFICATION)) {
logger.atFine().log(
@@ -508,7 +518,9 @@
@Nullable PatchSet basePatchSet,
@Nullable String baseCommit,
@Nullable MergeInput mergeInput)
- throws BadRequestException, IOException, UnprocessableEntityException,
+ throws BadRequestException,
+ IOException,
+ UnprocessableEntityException,
ResourceConflictException {
if (basePatchSet != null) {
return basePatchSet.commitId();
diff --git a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java
index 989dc7a..5ad4259 100644
--- a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java
+++ b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java
@@ -276,7 +276,9 @@
PersonIdent author,
PersonIdent committer,
ObjectId changeId)
- throws ResourceNotFoundException, MergeIdenticalTreeException, MergeConflictException,
+ throws ResourceNotFoundException,
+ MergeIdenticalTreeException,
+ MergeConflictException,
IOException {
ObjectId parentCommit;
diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java
index 32474a4..b68d9e1 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReview.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReview.java
@@ -230,14 +230,22 @@
@Override
public Response<ReviewResult> apply(RevisionResource revision, ReviewInput input)
- throws RestApiException, UpdateException, IOException, PermissionBackendException,
- ConfigInvalidException, PatchListNotAvailableException {
+ throws RestApiException,
+ UpdateException,
+ IOException,
+ PermissionBackendException,
+ ConfigInvalidException,
+ PatchListNotAvailableException {
return apply(revision, input, TimeUtil.now());
}
public Response<ReviewResult> apply(RevisionResource revision, ReviewInput input, Instant ts)
- throws RestApiException, UpdateException, IOException, PermissionBackendException,
- ConfigInvalidException, PatchListNotAvailableException {
+ throws RestApiException,
+ UpdateException,
+ IOException,
+ PermissionBackendException,
+ ConfigInvalidException,
+ PatchListNotAvailableException {
// Respect timestamp, but truncate at change created-on time.
ts = Ordering.natural().max(ts, revision.getChange().getCreatedOn());
if (revision.getEdit().isPresent()) {
@@ -524,8 +532,12 @@
}
private RevisionResource onBehalfOf(RevisionResource rev, LabelTypes labelTypes, ReviewInput in)
- throws BadRequestException, AuthException, UnprocessableEntityException,
- ResourceConflictException, PermissionBackendException, IOException,
+ throws BadRequestException,
+ AuthException,
+ UnprocessableEntityException,
+ ResourceConflictException,
+ PermissionBackendException,
+ IOException,
ConfigInvalidException {
logger.atFine().log("request is executed on behalf of %s", in.onBehalfOf);
diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewOp.java b/java/com/google/gerrit/server/restapi/change/PostReviewOp.java
index a47e179..c7b52b1 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReviewOp.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReviewOp.java
@@ -249,7 +249,9 @@
@Override
public boolean updateChange(ChangeContext ctx)
- throws ResourceConflictException, UnprocessableEntityException, IOException,
+ throws ResourceConflictException,
+ UnprocessableEntityException,
+ IOException,
CommentsRejectedException {
user = ctx.getIdentifiedUser();
notes = ctx.getNotes();
@@ -556,14 +558,16 @@
}
private Map<String, HumanComment> changeDrafts(ChangeContext ctx) {
- return draftCommentsReader.getDraftsByChangeAndDraftAuthor(ctx.getNotes(), user.getAccountId())
+ return draftCommentsReader
+ .getDraftsByChangeAndDraftAuthor(ctx.getNotes(), user.getAccountId())
.stream()
.collect(Collectors.toMap(c -> c.key.uuid, c -> c));
}
private Map<String, HumanComment> patchSetDrafts(ChangeContext ctx) {
return draftCommentsReader
- .getDraftsByPatchSetAndDraftAuthor(ctx.getNotes(), psId, user.getAccountId()).stream()
+ .getDraftsByPatchSetAndDraftAuthor(ctx.getNotes(), psId, user.getAccountId())
+ .stream()
.collect(Collectors.toMap(c -> c.key.uuid, c -> c));
}
@@ -705,8 +709,11 @@
/** Approval is copied over if it doesn't exist in the approvals of the current patch-set. */
private boolean isApprovalCopiedOver(PatchSetApproval patchSetApproval, ChangeNotes changeNotes) {
- return !changeNotes.getApprovals().onlyNonCopied()
- .get(changeNotes.getChange().currentPatchSetId()).stream()
+ return !changeNotes
+ .getApprovals()
+ .onlyNonCopied()
+ .get(changeNotes.getChange().currentPatchSetId())
+ .stream()
.anyMatch(p -> p.equals(patchSetApproval));
}
diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewers.java b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
index b0e58c5..5d51ccd 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
@@ -63,7 +63,10 @@
@Override
public Response<ReviewerResult> apply(ChangeResource rsrc, ReviewerInput input)
- throws IOException, RestApiException, UpdateException, PermissionBackendException,
+ throws IOException,
+ RestApiException,
+ UpdateException,
+ PermissionBackendException,
ConfigInvalidException {
if (input.reviewer == null) {
throw new BadRequestException("missing reviewer field");
diff --git a/java/com/google/gerrit/server/restapi/change/PutMessage.java b/java/com/google/gerrit/server/restapi/change/PutMessage.java
index 3717e02..f79e187 100644
--- a/java/com/google/gerrit/server/restapi/change/PutMessage.java
+++ b/java/com/google/gerrit/server/restapi/change/PutMessage.java
@@ -102,7 +102,10 @@
@Override
public Response<String> apply(ChangeResource resource, CommitMessageInput input)
- throws IOException, RestApiException, UpdateException, PermissionBackendException,
+ throws IOException,
+ RestApiException,
+ UpdateException,
+ PermissionBackendException,
ConfigInvalidException {
PatchSet ps = psUtil.current(resource.getNotes());
if (ps == null) {
diff --git a/java/com/google/gerrit/server/restapi/change/Rebase.java b/java/com/google/gerrit/server/restapi/change/Rebase.java
index 98a3f83..0daef20 100644
--- a/java/com/google/gerrit/server/restapi/change/Rebase.java
+++ b/java/com/google/gerrit/server/restapi/change/Rebase.java
@@ -99,7 +99,7 @@
IdentifiedUser rebaseAsUser;
if (input.onBehalfOfUploader && !rsrc.getPatchSet().uploader().equals(rsrc.getAccountId())) {
rebaseAsUser =
- userFactory.runAs(/*remotePeer= */ null, rsrc.getPatchSet().uploader(), rsrc.getUser());
+ userFactory.runAs(/* remotePeer= */ null, rsrc.getPatchSet().uploader(), rsrc.getUser());
rsrc.permissions().check(ChangePermission.REBASE_ON_BEHALF_OF_UPLOADER);
rebaseUtil.checkCanRebaseOnBehalfOf(rsrc, input);
} else {
diff --git a/java/com/google/gerrit/server/restapi/change/RebaseChain.java b/java/com/google/gerrit/server/restapi/change/RebaseChain.java
index 76c5253..76305de 100644
--- a/java/com/google/gerrit/server/restapi/change/RebaseChain.java
+++ b/java/com/google/gerrit/server/restapi/change/RebaseChain.java
@@ -172,7 +172,7 @@
&& !revRsrc.getPatchSet().uploader().equals(revRsrc.getAccountId())) {
rebaseAsUser =
userFactory.runAs(
- /*remotePeer= */ null, revRsrc.getPatchSet().uploader(), revRsrc.getUser());
+ /* remotePeer= */ null, revRsrc.getPatchSet().uploader(), revRsrc.getUser());
rebaseUtil.checkCanRebaseOnBehalfOf(revRsrc, input);
revRsrc.permissions().check(ChangePermission.REBASE_ON_BEHALF_OF_UPLOADER);
anyRebaseOnBehalfOfUploader = true;
diff --git a/java/com/google/gerrit/server/restapi/change/ReplyAttentionSetUpdates.java b/java/com/google/gerrit/server/restapi/change/ReplyAttentionSetUpdates.java
index 7f4b10f..ce9b176 100644
--- a/java/com/google/gerrit/server/restapi/change/ReplyAttentionSetUpdates.java
+++ b/java/com/google/gerrit/server/restapi/change/ReplyAttentionSetUpdates.java
@@ -119,8 +119,11 @@
*/
public void updateAttentionSet(
BatchUpdate bu, ChangeNotes changeNotes, ReviewInput input, CurrentUser currentUser)
- throws BadRequestException, IOException, PermissionBackendException,
- UnprocessableEntityException, ConfigInvalidException {
+ throws BadRequestException,
+ IOException,
+ PermissionBackendException,
+ UnprocessableEntityException,
+ ConfigInvalidException {
processManualUpdates(bu, changeNotes, input);
if (input.ignoreAutomaticAttentionSetRules) {
@@ -245,8 +248,11 @@
/** Process the manual updates of the attention set. */
private void processManualUpdates(BatchUpdate bu, ChangeNotes changeNotes, ReviewInput input)
- throws BadRequestException, IOException, PermissionBackendException,
- UnprocessableEntityException, ConfigInvalidException {
+ throws BadRequestException,
+ IOException,
+ PermissionBackendException,
+ UnprocessableEntityException,
+ ConfigInvalidException {
Set<Account.Id> accountsChangedInCommit = new HashSet<>();
// If we specify a user to remove, and the user is in the attention set, we remove it.
if (input.removeFromAttentionSet != null) {
@@ -323,8 +329,11 @@
ChangeNotes changeNotes,
AttentionSetInput add,
Set<Account.Id> accountsChangedInCommit)
- throws BadRequestException, IOException, PermissionBackendException,
- UnprocessableEntityException, ConfigInvalidException {
+ throws BadRequestException,
+ IOException,
+ PermissionBackendException,
+ UnprocessableEntityException,
+ ConfigInvalidException {
AttentionSetUtil.validateInput(add);
try {
Account.Id attentionUserId =
@@ -345,8 +354,11 @@
ChangeNotes changeNotes,
AttentionSetInput remove,
Set<Account.Id> accountsChangedInCommit)
- throws BadRequestException, IOException, PermissionBackendException,
- UnprocessableEntityException, ConfigInvalidException {
+ throws BadRequestException,
+ IOException,
+ PermissionBackendException,
+ UnprocessableEntityException,
+ ConfigInvalidException {
AttentionSetUtil.validateInput(remove);
try {
Account.Id attentionUserId =
@@ -367,8 +379,11 @@
private Account.Id getAccountId(
ChangeNotes changeNotes, String user, AttentionSetUpdate.Operation operation)
- throws ConfigInvalidException, IOException, UnprocessableEntityException,
- PermissionBackendException, AuthException {
+ throws ConfigInvalidException,
+ IOException,
+ UnprocessableEntityException,
+ PermissionBackendException,
+ AuthException {
Account.Id attentionUserId = accountResolver.resolve(user).asUnique().account().id();
try {
permissionBackend
@@ -395,8 +410,12 @@
String user,
Set<Account.Id> accountsChangedInCommit,
AttentionSetUpdate.Operation operation)
- throws ConfigInvalidException, IOException, PermissionBackendException,
- UnprocessableEntityException, BadRequestException, AuthException {
+ throws ConfigInvalidException,
+ IOException,
+ PermissionBackendException,
+ UnprocessableEntityException,
+ BadRequestException,
+ AuthException {
try {
Account.Id attentionUserId = getAccountId(changeNotes, user, operation);
if (accountsChangedInCommit.contains(attentionUserId)) {
diff --git a/java/com/google/gerrit/server/restapi/change/RevertSubmission.java b/java/com/google/gerrit/server/restapi/change/RevertSubmission.java
index 5bf0e8b..2b0a42c 100644
--- a/java/com/google/gerrit/server/restapi/change/RevertSubmission.java
+++ b/java/com/google/gerrit/server/restapi/change/RevertSubmission.java
@@ -170,8 +170,13 @@
@Override
public Response<RevertSubmissionInfo> apply(ChangeResource changeResource, RevertInput input)
- throws RestApiException, IOException, UpdateException, PermissionBackendException,
- NoSuchProjectException, ConfigInvalidException, StorageException {
+ throws RestApiException,
+ IOException,
+ UpdateException,
+ PermissionBackendException,
+ NoSuchProjectException,
+ ConfigInvalidException,
+ StorageException {
if (!changeResource.getChange().isMerged()) {
throw new ResourceConflictException(
@@ -233,8 +238,12 @@
private RevertSubmissionInfo revertSubmission(
List<ChangeData> changeData, RevertInput revertInput)
- throws RestApiException, IOException, UpdateException, ConfigInvalidException,
- StorageException, PermissionBackendException {
+ throws RestApiException,
+ IOException,
+ UpdateException,
+ ConfigInvalidException,
+ StorageException,
+ PermissionBackendException {
Multimap<BranchNameKey, ChangeData> changesPerProjectAndBranch = ArrayListMultimap.create();
changeData.stream().forEach(c -> changesPerProjectAndBranch.put(c.change().getDest(), c));
@@ -280,7 +289,10 @@
Iterator<PatchSetData> sortedChangesInProjectAndBranch,
Set<ObjectId> commitIdsInProjectAndBranch,
Instant timestamp)
- throws IOException, RestApiException, UpdateException, ConfigInvalidException,
+ throws IOException,
+ RestApiException,
+ UpdateException,
+ ConfigInvalidException,
PermissionBackendException {
while (sortedChangesInProjectAndBranch.hasNext()) {
ChangeNotes changeNotes = sortedChangesInProjectAndBranch.next().data().notes();
diff --git a/java/com/google/gerrit/server/restapi/group/CreateGroup.java b/java/com/google/gerrit/server/restapi/group/CreateGroup.java
index 4110eff..ea15f12 100644
--- a/java/com/google/gerrit/server/restapi/group/CreateGroup.java
+++ b/java/com/google/gerrit/server/restapi/group/CreateGroup.java
@@ -127,8 +127,13 @@
@Override
public Response<GroupInfo> apply(TopLevelResource resource, IdString id, GroupInput input)
- throws AuthException, BadRequestException, UnprocessableEntityException,
- ResourceConflictException, IOException, ConfigInvalidException, ResourceNotFoundException,
+ throws AuthException,
+ BadRequestException,
+ UnprocessableEntityException,
+ ResourceConflictException,
+ IOException,
+ ConfigInvalidException,
+ ResourceNotFoundException,
PermissionBackendException {
String name = id.get();
if (input == null) {
diff --git a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java
index 338ff0d..3db3fa0 100644
--- a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java
+++ b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java
@@ -96,8 +96,13 @@
@Override
public Response<ChangeInfo> apply(ProjectResource rsrc, ProjectAccessInput input)
- throws PermissionBackendException, AuthException, IOException, ConfigInvalidException,
- InvalidNameException, UpdateException, RestApiException {
+ throws PermissionBackendException,
+ AuthException,
+ IOException,
+ ConfigInvalidException,
+ InvalidNameException,
+ UpdateException,
+ RestApiException {
PermissionBackend.ForProject forProject =
permissionBackend.user(rsrc.getUser()).project(rsrc.getNameKey());
if (!check(forProject, ProjectPermission.READ_CONFIG)) {
diff --git a/java/com/google/gerrit/server/restapi/project/CreateBranch.java b/java/com/google/gerrit/server/restapi/project/CreateBranch.java
index ae9b1a8..6dc84d8 100644
--- a/java/com/google/gerrit/server/restapi/project/CreateBranch.java
+++ b/java/com/google/gerrit/server/restapi/project/CreateBranch.java
@@ -86,8 +86,12 @@
@Override
public Response<BranchInfo> apply(ProjectResource rsrc, IdString id, BranchInput input)
- throws BadRequestException, AuthException, ResourceConflictException,
- UnprocessableEntityException, IOException, PermissionBackendException,
+ throws BadRequestException,
+ AuthException,
+ ResourceConflictException,
+ UnprocessableEntityException,
+ IOException,
+ PermissionBackendException,
NoSuchProjectException {
try (RefUpdateContext ctx = RefUpdateContext.open(BRANCH_MODIFICATION)) {
String ref = id.get();
diff --git a/java/com/google/gerrit/server/restapi/project/ListProjectsImpl.java b/java/com/google/gerrit/server/restapi/project/ListProjectsImpl.java
index 33f0b58..8b386e2 100644
--- a/java/com/google/gerrit/server/restapi/project/ListProjectsImpl.java
+++ b/java/com/google/gerrit/server/restapi/project/ListProjectsImpl.java
@@ -303,7 +303,12 @@
private SortedMap<String, ProjectInfo> applyAsQuery(String query) throws BadRequestException {
try {
- return queryProjectsProvider.get().withQuery(query).withStart(start).withLimit(limit).apply()
+ return queryProjectsProvider
+ .get()
+ .withQuery(query)
+ .withStart(start)
+ .withLimit(limit)
+ .apply()
.stream()
.collect(
ImmutableSortedMap.toImmutableSortedMap(
diff --git a/java/com/google/gerrit/server/restapi/project/SuggestBranchReviewers.java b/java/com/google/gerrit/server/restapi/project/SuggestBranchReviewers.java
index 743f696..239c8d9 100644
--- a/java/com/google/gerrit/server/restapi/project/SuggestBranchReviewers.java
+++ b/java/com/google/gerrit/server/restapi/project/SuggestBranchReviewers.java
@@ -90,7 +90,10 @@
@Override
public Response<List<SuggestedReviewerInfo>> apply(BranchResource rsrc)
- throws AuthException, BadRequestException, IOException, ConfigInvalidException,
+ throws AuthException,
+ BadRequestException,
+ IOException,
+ ConfigInvalidException,
PermissionBackendException {
if (!self.get().isIdentifiedUser()) {
throw new AuthException("Authentication required");
diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java
index 2b8a662..10401cc 100644
--- a/java/com/google/gerrit/server/submit/MergeOp.java
+++ b/java/com/google/gerrit/server/submit/MergeOp.java
@@ -444,7 +444,10 @@
boolean checkSubmitRules,
SubmitInput submitInput,
boolean dryrun)
- throws RestApiException, UpdateException, IOException, ConfigInvalidException,
+ throws RestApiException,
+ UpdateException,
+ IOException,
+ ConfigInvalidException,
PermissionBackendException {
this.submitInput = submitInput;
this.notify =
diff --git a/java/gerrit/PRED_commit_edits_2.java b/java/gerrit/PRED_commit_edits_2.java
index 23def3a..52d7f63 100644
--- a/java/gerrit/PRED_commit_edits_2.java
+++ b/java/gerrit/PRED_commit_edits_2.java
@@ -146,7 +146,9 @@
}
private Text load(@Nullable ObjectId tree, String path, ObjectReader reader)
- throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException,
+ throws MissingObjectException,
+ IncorrectObjectTypeException,
+ CorruptObjectException,
IOException {
if (tree == null || path == null) {
return Text.EMPTY;
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ApplyPatchIT.java b/javatests/com/google/gerrit/acceptance/api/change/ApplyPatchIT.java
index e9fac73..ce02a88 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ApplyPatchIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ApplyPatchIT.java
@@ -730,7 +730,8 @@
+ "NOTE FOR REVIEWERS - errors occurred while applying the patch.\n"
+ "PLEASE REVIEW CAREFULLY.\n"
+ "Errors:\n"
- + "Error applying patch in file_name.txt, hunk HunkHeader[1,1->1,1]: Hunk cannot be applied\n"
+ + "Error applying patch in file_name.txt, hunk HunkHeader[1,1->1,1]: Hunk cannot be"
+ + " applied\n"
+ "\n"
+ "Original patch:\n"
+ " diff file_name.txt file_name.txt\n"
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index b880660..05474cd 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -260,7 +260,13 @@
revision(r).review(in);
ApprovalInfo cr =
- gApi.changes().id(changeId).get(DETAILED_LABELS).labels.get(LabelId.CODE_REVIEW).all
+ gApi
+ .changes()
+ .id(changeId)
+ .get(DETAILED_LABELS)
+ .labels
+ .get(LabelId.CODE_REVIEW)
+ .all
.stream()
.filter(a -> a._accountId == user.id().get())
.findFirst()
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
index fe220f2..81962e3 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
@@ -304,7 +304,9 @@
}
private void assertChangeSetMergeable(ChangeData change, boolean expected)
- throws MissingObjectException, IncorrectObjectTypeException, IOException,
+ throws MissingObjectException,
+ IncorrectObjectTypeException,
+ IOException,
PermissionBackendException {
ChangeSet cs =
mergeSuperSet
diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
index 8efc5bd..b30fab7 100644
--- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
+++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
@@ -248,8 +248,7 @@
.setMetaId(SHA_BYTES)
.setChangeId(ID.get())
.setColumns(
- colsProto
- .toBuilder()
+ colsProto.toBuilder()
.setOriginalSubject("The first patch set")
.setHasOriginalSubject(true))
.build());
