Merge branch 'stable-3.6' into stable-3.7
* stable-3.6:
Set version to 3.5.7-SNAPSHOT
Set version to 3.5.6
Move creation of PerThreadCache to SshCommand
Update bouncycastle to 1.72
Align commons-compress and tukaani-xz versions with jgit
Bump JGit to 74fa245b3
Bump JGit to 45de4fa
Log external ID differential cache loader failure
ProjectState: simplify the 'getPluginConfig' method
Release-Notes: skip
Change-Id: I86100dc9c13f94e97c1d1dcc27bb95058a7ea256
diff --git a/.bazelignore b/.bazelignore
index 69c04b1..aac80af 100644
--- a/.bazelignore
+++ b/.bazelignore
@@ -1,2 +1,5 @@
eclipse-out
node_modules
+polygerrit-ui/node_modules
+plugins/node_modules
+tools/node_tools/node_modules
diff --git a/.bazelrc b/.bazelrc
index e63d1b5..407b005 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -27,9 +27,6 @@
build:remote17 --tool_java_language_version=17
build:remote17 --tool_java_runtime_version=remotejdk_17
-# workaround for https://github.com/bazelbuild/bazel/issues/17956 on MacOS 13.3 and XCode 14.3
-build --host_conlyopt=-std=c90
-
# Enable strict_action_env flag to. For more information on this feature see
# https://groups.google.com/forum/#!topic/bazel-discuss/_VmRfMyyHBk.
# This will be the new default behavior at some point (and the flag was flipped
diff --git a/.bazelversion b/.bazelversion
index c7cb131..5e32542 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-5.3.1
+6.1.2
diff --git a/.gitignore b/.gitignore
index 8edc10e..53bc9f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,9 @@
/node_modules/
/package-lock.json
/plugins/*
+/polygerrit-ui/coverage/
+/polygerrit-ui/app/plugins/*
+/polygerrit-ui/screenshots/Chrome/failed/
!/plugins/.eslintignore
!/plugins/.eslintrc.js
!/plugins/.prettierrc.js
diff --git a/Documentation/cmd-check-project-access.txt b/Documentation/cmd-check-project-access.txt
new file mode 100644
index 0000000..885993a
--- /dev/null
+++ b/Documentation/cmd-check-project-access.txt
@@ -0,0 +1,74 @@
+= gerrit check-project-access
+
+== NAME
+gerrit check-project-access - Check project readability of all users in a
+matching the given link:rest-api-accounts.html#account-id[account identifier]
+
+== SYNOPSIS
+[verse]
+--
+_ssh_ -p <port> <host> _gerrit check-project-access_
+ [--project <PROJECT> | -p <PROJECT>]
+ [--user <USER> | -u <USER>]
+--
+
+== DESCRIPTION
+Allow users to check if user has access to a project’s changes, comments, code
+differences, and Git access over SSH or HTTP.
+
+It returns all users in given input String, where it includes: username, email
+address and full name.
+
+== ACCESS
+Users who have view access and administrate server capability.
+
+== EXAMPLES
+Check if users can read all references in the repository called "test_project",
+in given input String TestUser.
+
+Given that there are
+a user with username "test_user1", email "one@email.com", and Full name as
+TestUser,
+a user with username "test_user2", email "two@email.com", and Full name as
+TestUser,
+a user with username "test_user3", email "TestUser@email.com", and Full name
+as John Doe
+
+----
+$ ssh -p @SSH_PORT@ @SSH_HOST@ gerrit check-project-access
+ -p test_project
+ -u TestUser
+
+Username: 'test_user1', Email: 'one@example.com', Full Name: 'TestUser'
+, Result: TRUE
+Username: 'test_user3', Email: 'TestUser@example.com', Full Name: 'John Doe'
+, Result: FALSE
+Username: 'test_user2', Email: 'two@example.com', Full Name: 'TestUser'
+, Result: FALSE
+----
+
+----
+$ ssh -p @SSH_PORT@ @SSH_HOST@ gerrit check-project-access
+ -p test_project_doesnt_exist
+ -u TestUser
+
+fatal: project 'test_project_doesnt_exist' is unavailable
+----
+
+----
+$ ssh -p @SSH_PORT@ @SSH_HOST@ gerrit check-project-access
+ -p test_project
+ -u test_user_doesnt_exist
+
+fatal: No accounts found for your query: "test_user_doesnt_exist"
+Tip: Try double-escaping spaces, for example: "--user Last,\\ First"
+----
+
+
+GERRIT
+------
+Part of link:index.html[Gerrit Code Review]
+
+SEARCHBOX
+---------
+
diff --git a/Documentation/cmd-create-project.txt b/Documentation/cmd-create-project.txt
index 0575eb9..358324d 100644
--- a/Documentation/cmd-create-project.txt
+++ b/Documentation/cmd-create-project.txt
@@ -136,13 +136,13 @@
project. Disabled by default.
--use-signed-off-by::
---so:
+--so::
If enabled, each change must contain a Signed-off-by line
from either the author or the uploader in the commit message.
Disabled by default.
--create-new-change-for-all-not-in-target::
---ncfa:
+--ncfa::
If enabled, a new change is created for every commit that is not in
the target branch. If the pushed commit is a merge commit, this flag is
ignored for that push. To avoid accidental creation of a large number
diff --git a/Documentation/cmd-index.txt b/Documentation/cmd-index.txt
index 7f1a6e8..c959a07 100644
--- a/Documentation/cmd-index.txt
+++ b/Documentation/cmd-index.txt
@@ -61,6 +61,9 @@
link:cmd-copy-approvals.html[gerrit copy-approvals]::
Copy all inferred approvals labels to the latest patch-set.
+link:cmd-check-project-access.html[gerrit check-project-access]::
+ Check if user(s) can read non-config refs of a project
+
link:cmd-create-branch.html[gerrit create-branch]::
Create a new project branch.
diff --git a/Documentation/cmd-stream-events.txt b/Documentation/cmd-stream-events.txt
index f0ad460..5fd0bfc 100644
--- a/Documentation/cmd-stream-events.txt
+++ b/Documentation/cmd-stream-events.txt
@@ -324,6 +324,19 @@
comment:: Review comment cover message.
+=== Project Head Updated
+
+Sent when project's head is updated.
+
+type:: "project-head-updated"
+
+oldHead:: The old project head name
+
+newHead:: The new project head name
+
+eventCreatedOn:: Time in seconds since the UNIX epoch when this event was
+created.
+
== SEE ALSO
* link:json.html[JSON Data Formats]
diff --git a/Documentation/concept-changes.txt b/Documentation/concept-changes.txt
index 0444fab..6e76a8a 100644
--- a/Documentation/concept-changes.txt
+++ b/Documentation/concept-changes.txt
@@ -34,6 +34,11 @@
|Owner
|The contributor who created the change.
+|Uploader
+|The user that uploaded the current patch set (e.g. the user that executed the
+`git push` command, or the user that triggered the patch set creation through
+an action in the UI).
+
|Assignee
|The contributor responsible for the change. Often used when a change has
mulitple reviewers to identify the individual responsible for final approval.
diff --git a/Documentation/config-accounts.txt b/Documentation/config-accounts.txt
index aca9591..716fa2f 100644
--- a/Documentation/config-accounts.txt
+++ b/Documentation/config-accounts.txt
@@ -383,8 +383,8 @@
[[starred-changes]]
== Starred Changes
-link:dev-stars.html[Starred changes] allow users to mark changes as
-favorites and receive email notifications for them.
+Starred changes allow users to mark changes as favorites and receive email
+notifications for them.
Each starred change is a tuple of an account ID, a change ID and a
label.
@@ -402,8 +402,7 @@
when the prefix ends with '/', this ref format is optimized to find
starred changes by change ID. Finding starred changes by change ID is
e.g. needed when a change is updated so that all users that have
-the link:dev-stars.html#default-star[default star] on the change can be
-notified by email.
+the star on the change can be notified by email.
Gerrit also needs an efficient way to find all changes that were
starred by an account, e.g. to provide results for the
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 3fbc283..6ca790a 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1460,7 +1460,7 @@
Maximum number of patch sets allowed per change. If this is insufficient,
recreate the change with a new Change-Id, then abandon the old change.
+
-By default 1,500.
+By default 1000.
[[change.maxUpdates]]change.maxUpdates::
+
@@ -1754,8 +1754,11 @@
link = "#/q/$1"
[commentlink "bugzilla"]
- match = "(bug\\s+#?)(\\d+)"
- link = http://bugs.example.com/show_bug.cgi?id=$2
+ match = "(^|\\s)(bug\\s+#?)(\\d+)($|\\s)"
+ link = http://bugs.example.com/show_bug.cgi?id=$3
+ prefix = $1
+ suffix = $4
+ text = $2$3
[commentlink "tracker"]
match = ([Bb]ug:\\s+)(\\d+)
@@ -1790,6 +1793,10 @@
be updated to match text formats.
+
A common pattern to match is `bug\\s+(\\d+)`.
++
+In order to better control the visual presentation of the link `prefix`,
+`suffix` and `text` is used. With the generated link html looking like:
+`prefix<a ...>text</a>suffix`.
[[commentlink.name.link]]commentlink.<name>.link::
+
@@ -1798,6 +1805,27 @@
+
The link property is used only when the html property is not present.
+[[commentlink.name.prefix]]commentlink.<name>.prefix::
++
+The text inserted before the link. Groups in the match expression may be
+accessed as `$'n'`.
++
+The link property is used only when the html property is not present.
+
+[[commentlink.name.suffix]]commentlink.<name>.suffix::
++
+The text inserted after the link. Groups in the match expression may be
+accessed as `$'n'`.
++
+The link property is used only when the html property is not present.
+
+[[commentlink.name.text]]commentlink.<name>.text::
++
+The text content of the link. Groups in the match expression may be
+accessed as `$'n'`.
++
+The link property is used only when the html property is not present.
+
[[commentlink.name.html]]commentlink.<name>.html::
+
HTML to replace the entire matched string with. If present,
@@ -2544,6 +2572,26 @@
by the target version of the upgrade. Refer to the release notes and check whether
the rolling upgrade is possible or not and the associated constraints.
+[[gerrit.importedServerId]]gerrit.importedServerId::
++
+ServerId of the repositories imported from other Gerrit servers. Changes coming
+associated with the imported serverIds are indexed and displayed in the UI.
++
+Specify multiple `gerrit.importedServerId` for allowing the import from multiple
+Gerrit servers with different serverIds.
++
+[NOTE]
+The account-ids referenced in the imported changes are used for looking up the
+associated account-id locally, using the `imported:` external-id.
+Example: the account-id 1000 from the imported server-id 59a4964e-6376-4ed9-beef
+will be looked up in the local accounts using the `imported:1000@59a4964e-6376-4ed9-beef`
+external-id.
++
+If this value is not set, all changes imported from other Gerrit servers will be
+ignored.
++
+By default empty.
+
[[gerrit.serverId]]gerrit.serverId::
+
Used by NoteDb to, amongst other things, identify author identities from
@@ -3233,6 +3281,15 @@
If not set or set to a zero, defaults to the number of logical CPUs as returned
by the JVM. If set to a negative value, defaults to a direct executor.
+[[index.cacheQueryResultsByChangeNum]]index.cacheQueryResultsByChangeNum::
++
+Allow to cache and reuse the change JSON elements by their Change number.
+This improves the performance of queries that are returning Changes duplicates.
+It needs to be turned off when having Changes imported from other servers
+because of the potential conflicts of change numbers.
++
+Defaults to true.
+
[[index.onlineUpgrade]]index.onlineUpgrade::
+
Whether to upgrade to new index schema versions while the server is
@@ -5631,7 +5688,7 @@
[[trackingid.name.system]]trackingid.<name>.system::
+
-The name of the external tracking system (maximum 10 characters).
+The name of the external tracking system (maximum 20 characters).
It is possible to have several trackingid entries for the same
tracking system.
diff --git a/Documentation/config-groups.txt b/Documentation/config-groups.txt
index 0917515..4abb223 100644
--- a/Documentation/config-groups.txt
+++ b/Documentation/config-groups.txt
@@ -34,7 +34,7 @@
group, there is a ref, stored as a sharded UUID, e.g.
----
- refs/groups/ef/deafbeefdeafbeefdeafbeefdeafbeefdeafbeef
+ refs/groups/de/deafbeefdeafbeefdeafbeefdeafbeefdeafbeef
----
The ref points to commits holding files. The files are
diff --git a/Documentation/config-labels.txt b/Documentation/config-labels.txt
index 3fa84b1..e4eee10 100644
--- a/Documentation/config-labels.txt
+++ b/Documentation/config-labels.txt
@@ -11,6 +11,43 @@
link:config-submit-requirements.html[submit requirements] documentation to
configure such rules.
+[[sticky_votes]]
+== Sticky Votes
+
+Whether votes are sticky when a new patch set is created depends on the
+link:#label_copyCondition[copyCondition] of the label. If an approval
+matches the configured condition it is copied from the old current
+patch set to the new current patch set. Votes that are not copied to
+the new patch set, are called `outdated`.
+
+If votes get outdated due to pushing a new patch set the uploader is
+informed about this by a message in the git output. In addition,
+outdated votes are also listed in the email notification that is sent
+for the new patch set (unless this is disabled by a custom email
+template). Note, that the uploader only get this email notification if
+they have configured `Every Comment` for `Email notifications` in their
+user preferences. With any other email preference the email sender, the
+uploader in this case, is not included in the email recipients.
+
+If votes get outdated due to creating a new patch set the user of the
+removed vote is added to the attention set of the change, as they need
+to re-review the change and renew their vote.
+
+If a vote is applied on an outdated patch set (i.e. a patch set that is
+not the current patch set) the vote is copied forward to follow-up
+patch sets if possible. A newly added or updated vote on an outdated
+patch set is copied to follow-up patch sets if:
+
+* the vote is copyable (i.e. it matches the
+link:#label_copyCondition[copyCondition] of the label)
+* neither the follow-up patch set nor an intermediate patch set has a
+ non-copied vote or a deletion vote (vote with value `0`) that
+ overrides the copy vote
+
+If an approval on an outdated patch set is removed or updated to a
+value that is not copyable, existing copies of that approval on
+follow-up patch sets are removed.
+
[[label_Code-Review]]
== Label: Code-Review
@@ -211,9 +248,18 @@
=== `label.Label-Name.function (deprecated)`
Label functions dictate the rules for requiring certain label votes before a
-change is allowed for submission. Label functions are **deprecated**, favour
-using link:config-submit-requirements.html[submit requirements] instead,
-except if it's needed to set the value to `PatchSetLock`.
+change is allowed for submission. Label functions are **deprecated** and updates
+that set `function` to a blocking value {`MaxWithBlock`, `MaxNoBlock`,
+`AnyWithBlock`} will be rejected. Existing label function definitions can only
+be updated to {`NoBlock`, `NoOp`, `PatchSetLock`}. New label defintions should
+also explicitly set the `function` attribute to a non-blocking value since the
+default is `MaxWithBlock`.
+
+If your project has a
+blocking label function, we highly encourage you to change it to `NoBlock` and
+add a submit-requirement for the same label. See the
+link:config-submit-requirements.html#code-review-example[submit-requirements
+documentation] for more details.
The name of a function for evaluating multiple votes for a label. This
function is only applied if the default submit rule is used for a label.
@@ -275,15 +321,6 @@
Defaults to true.
-[[label_copyAnyScore]]
-=== `label.Label-Name.copyAnyScore`
-
-*DEPRECATED: use `is:ANY` predicate in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-If true, any score for the label is copied forward when a new patch
-set is uploaded. Defaults to false.
-
[[label_copyCondition]]
=== `label.Label-Name.copyCondition`
@@ -296,24 +333,104 @@
Gerrit currently supports the following predicates:
-==== changekind:{REWORK,TRIVIAL_REBASE,MERGE_FIRST_PARENT_UPDATE,NO_CODE_CHANGE,NO_CHANGE}
+[[changekind]]
+==== changekind:{NO_CHANGE,NO_CODE_CHANGE,MERGE_FIRST_PARENT_UPDATE,REWORK,TRIVIAL_REBASE}
-Matches if the diff between two patch sets was of a certain change kind.
+Matches if the diff between two patch sets was of a certain change kind:
-`REWORK` matches all kind of change kinds because any other change kind
+* [[no_change]]`NO_CHANGE`:
++
+Matches when a new patch set is uploaded that has the same parent tree,
+code delta, and commit message as the previous patch set. This means
+that only the patch set SHA-1 is different. This can be used to enable
+sticky approvals, reducing turn-around for this special case.
++
+It is recommended to leave this enabled for both, the Code-Review and
+the Verified labels.
++
+`NO_CHANGE` is more trivial than a trivial rebase, no code change and
+a first parent update, hence this change kind is also matched by
+`changekind:TRIVIAL_REBASE`, `changekind:NO_CODE_CHANGE` and if it's
+a merge commit by `changekind:MERGE_FIRST_PARENT_UPDATE`.
+
+
+* [[no_code_change]]`NO_CODE_CHANGE`:
++
+Matches when a new patch set is uploaded that has the same parent tree
+as the previous patch set and the same code diff (including context
+lines) as the previous patch set. This means only the commit message
+may be different; the change hasn't even been rebased. Also matches if
+the commit message is not different, which means this includes matching
+patch sets that have `NO_CHANGE` as the change kind.
++
+This predicate can be used to enable sticky approvals on labels that
+only depend on the code, reducing turn-around if only the commit
+message is changed prior to submitting a change.
++
+For the Verified label that is optionally installed by the
+link:pgm-init.html[init] site program this predicate is used by
+default.
+
+* [[merge_first_parent_update]]`MERGE_FIRST_PARENT_UPDATE`:
++
+Matches when a new patch set is uploaded that is a new merge commit
+which only differs from the merge commit in the previous patch set in
+its first parent, or has identical parents (aka the change kind of the
+merge commit is `NO_CHANGE`).
++
+The first parent of the merge commit is part of the change's target
+branch, whereas the other parent(s) refer to the feature branch(es) to
+be merged.
++
+Matching this change kind is useful if you don't want to trigger CI or
+human verification again if your target branch moved on but the feature
+branch(es) being merged into the target branch did not change.
++
+This predicate does not match if the patch set is not a merge commit.
+
+* [[trivial_rebase]]`TRIVIAL_REBASE`:
++
+Matches when a new patch set is uploaded that is a trivial rebase. A
+new patch set is considered to be trivial rebase if the commit message
+is the same as in the previous patch set and if it has the same diff
+(including context lines) as the previous patch set. This is the case
+if the change was rebased onto a different parent and that rebase did
+not require git to perform any conflict resolution, or if the parent
+did not change at all (aka the change kind of the commit is
+`NO_CHANGE`).
++
+This predicate can be used to enable sticky approvals, reducing
+turn-around for trivial rebases prior to submitting a change.
++
+For the pre-installed Code-Review label this predicate is used by
+default.
+
+* [[rework]]`REWORK`:
++
+Matches all kind of change kinds because any other change kind
is just a more trivial version of a rework. This means setting
`changekind:REWORK` is equivalent to setting `is:ANY`.
-`NO_CHANGE` is more trivial than a trivial rebase, no code change and
-a first parent update, hence this change kind is also matched by
-`changekind:TRIVIAL_REBASE`, `changekind:NO_CODE_CHANGE` and
-`changekind:MERGE_FIRST_PARENT_UPDATE` (only if the change is for a
-merge commit).
-
+[[is_magic]]
==== is:{MIN,MAX,ANY}
-Matches votes that are equal to the minimal or maximal voting range. Or any votes.
+Matches approvals that have a minimal, maximal or any score:
+* [[is_min]]`MIN`:
++
+Matches approvals that have a minimal score, i.e. the lowest possible
+(negative) value for this label.
+
+* [[is_max]]`MAX`:
++
+Matches approvals that a maximal score, i.e. the highest possible
+(positive) value for this label.
+
+* [[is_any]]`ANY`:
++
+Matches any approval when a new patch set is uploaded.
+
+[[is_value]]
==== is:'VALUE'
Matches approvals that have a voting value that is equal to 'VALUE'.
@@ -332,11 +449,25 @@
Matches all votes if the new patch set was uploaded by a member of
link:#group-id[\{group-id\}].
+[[has_unchanged_files]]
==== has:unchanged-files
-Matches when the new patch-set includes the same files as the old patch-set.
+Matches when the new patch-set has the same list of files as the
+previous patch-set.
-Only 'unchanged-files' is supported for 'has'.
+Votes are not copied in the following cases:
+
+ * If one more files are renamed in the new patch set. These files are counted
+ as a deletion of the file at the old path and an addition of the file at the
+ new path. This means the list of files did change.
+ * If one or more files are reverted to their original content, that is files
+ that become same as in the base revision.
+
+This predicate is useful if you don't want to trigger CI or human
+verification again if the list of files didn't change.
+
+Note, "unchanged-files" is the only value that is supported for the
+"has" operator.
[[group-id]]
==== Group ID
@@ -367,129 +498,6 @@
copyCondition = is:MIN OR -change-kind:REWORK OR uploaderin:dead...beef
----
-[[label_copyMinScore]]
-=== `label.Label-Name.copyMinScore`
-
-*DEPRECATED: use `is:MIN` predicate in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-If true, the lowest possible negative value for the label is copied
-forward when a new patch set is uploaded. Defaults to false, except
-for All-Projects which has it true by default.
-
-[[label_copyMaxScore]]
-=== `label.Label-Name.copyMaxScore`
-
-*DEPRECATED: use `is:MAX` predicate in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-If true, the highest possible positive value for the label is copied
-forward when a new patch set is uploaded. This can be used to enable
-sticky approvals, reducing turn-around for trivial cleanups prior to
-submitting a change. Defaults to false.
-
-[[label_copyAllScoresIfListOfFilesDidNotChange]]
-=== `label.Label-Name.copyAllScoresIfListOfFilesDidNotChange`
-
-*DEPRECATED: use `is:ANY AND has:unchanged-files` predicates in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-This policy is useful if you don't want to trigger CI or human
-verification again if the list of files didn't change.
-
-If true, all scores for the label are copied forward when a new
-patch-set is uploaded that has the same list of files as the previous
-patch-set.
-
-Renames are considered different files when computing whether new files
-were added or old files were deleted. Hence, if there are renames, scores will
-*NOT* be copied over.
-
-Defaults to false.
-
-[[label_copyAllScoresOnMergeFirstParentUpdate]]
-=== `label.Label-Name.copyAllScoresOnMergeFirstParentUpdate`
-
-*DEPRECATED: use `is:ANY AND changekind:MERGE_FIRST_PARENT_UPDATE` predicates
-in link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-This policy is useful if you don't want to trigger CI or human
-verification again if your target branch moved on but the feature
-branch being merged into the target branch did not change. It only
-applies if the patch set is a merge commit.
-
-If true, all scores for the label are copied forward when a new
-patch set is uploaded that is a new merge commit which only
-differs from the previous patch set in its first parent, or has
-identical parents. The first parent would be the parent of the merge
-commit that is part of the change's target branch, whereas the other
-parent(s) refer to the feature branch(es) to be merged.
-
-Defaults to false.
-
-[[label_copyAllScoresOnTrivialRebase]]
-=== `label.Label-Name.copyAllScoresOnTrivialRebase`
-
-*DEPRECATED: use `is:ANY AND changekind:TRIVIAL_REBASE` predicates
-in link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-If true, all scores for the label are copied forward when a new patch set is
-uploaded that is a trivial rebase. A new patch set is considered to be trivial
-rebase if the commit message is the same as in the previous patch set and if it
-has the same diff (including context lines) as the previous patch set. This is
-the case if the change was rebased onto a different parent and that rebase did
-not require git to perform any conflict resolution, or if the parent did not
-change at all.
-
-This can be used to enable sticky approvals, reducing turn-around for
-trivial rebases prior to submitting a change.
-For the pre-installed Code-Review label this is enabled by default.
-
-Defaults to false.
-
-[[label_copyAllScoresIfNoCodeChange]]
-=== `label.Label-Name.copyAllScoresIfNoCodeChange`
-
-*DEPRECATED: use `is:ANY AND changekind:NO_CODE_CHANGE` predicates in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-If true, all scores for the label are copied forward when a new patch set is
-uploaded that has the same parent tree as the previous patch set and the same
-code diff (including context lines) as the previous patch set. This means only
-the commit message is different; the change hasn't even been rebased. This can
-be used to enable sticky approvals on labels that only depend on the code,
-reducing turn-around if only the commit message is changed prior to submitting a
-change. For the Verified label that is optionally installed by the
-link:pgm-init.html[init] site program this is enabled by default.
-
-Defaults to false.
-
-[[label_copyAllScoresIfNoChange]]
-=== `label.Label-Name.copyAllScoresIfNoChange`
-
-*DEPRECATED: use `is:ANY AND changekind:NO_CHANGE` predicates in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-If true, all scores for the label are copied forward when a new patch
-set is uploaded that has the same parent tree, code delta, and commit
-message as the previous patch set. This means that only the patch
-set SHA-1 is different. This can be used to enable sticky
-approvals, reducing turn-around for this special case.
-It is recommended to leave this enabled for both Verified and
-Code-Review labels.
-
-Defaults to true.
-
-[[label_copyValue]]
-=== `label.Label-Name.copyValue`
-
-*DEPRECATED: use `is:<value>` predicate in
-link:config-labels.html#label_copyCondition[copyCondition] instead*
-
-Value that should be copied forward when a new patch set is uploaded.
-This can be used to enable sticky votes. Can be specified multiple
-times. By default not set.
-
[[label_canOverride]]
=== `label.Label-Name.canOverride`
diff --git a/Documentation/config-project-config.txt b/Documentation/config-project-config.txt
index 9fd5b1b..7a0e305 100644
--- a/Documentation/config-project-config.txt
+++ b/Documentation/config-project-config.txt
@@ -9,6 +9,7 @@
relevant in an automation scenario of the access controls.
+[[refs-meta-config]]
== The +refs/meta/config+ namespace
The namespace contains three different files that play different
@@ -318,17 +319,306 @@
[[content_merge]]submit.mergeContent::
+
-Defines whether Gerrit will try to
-do a content merge when a path conflict occurs. Valid values are
-'true', 'false', or 'INHERIT'. Default is 'INHERIT'. This option can
-be modified by any project owner through the project console, `Browse`
-> `Repositories` > my/project > `Allow content merges`.
+Defines whether Gerrit will try to do a content merge when a path conflict
+occurs while submitting a change.
++
+A path conflict occurs when the same file has been changed on both sides of a
+merge, e.g. when the same file has been touched in a change and concurrently in
+the target branch.
++
+Doing a content merge means that Gerrit attempts to merge the conflicting file
+contents from both sides of the merge. This is successful if the touched lines
+(plus some surrounding context lines) do not overlap (i.e. both sides touch
+distinct lines).
++
+NOTE: The content merge setting is not relevant when
+link:#fast_forward_only[fast forward only] is configured as the
+link:#submit.action[submit action] because in this case Gerrit will never
+perform a merge, rebase or cherry-pick on submit.
++
+If content merges are disabled, the submit button in the Gerrit web UI is
+disabled, if any path conflict would occur on submitting the change. Users then
+need to rebase the change manually to resolve the path conflict and then get
+the change re-approved so that they can submit it.
++
+NOTE: If only distinct lines have been touched on both sides, rebasing the
+change from the Gerrit UI is sufficient to resolve the path conflict, since the
+rebase action always does the rebase with content merge enabled.
++
+The advantage of enabling content merges on submit is that it makes it less
+likely that change submissions are rejected due to conflicts. Each change
+submission that goes through with content merge, but would be rejected
+otherwise, saves the user from needing to do extra work to get the change
+submitted (rebase the change, get it re-approved and then submit it again).
++
+On the other hand, disabling content merges decreases the chance of breaking
+branches by submitting content merges of incompatible modifications in the same
+file, e.g. a function is removed on one side and a new usage of that function
+is added on the other side. Note, that the chance of breaking a branch by
+incompatible modifications is only reduced, but not eliminated, e.g. even with
+content merges disabled it's possible that a function is removed in one file
+and a new usage of that function is added in another file.
++
+The huge drawback of disabling content merge is that users need to do extra
+work when a change isn't submittable due to a path conflict which could be
+avoided if content merge was enabled (see above). In addition to this, it also
+confuses and frustrates users if a change submission is rejected by Gerrit due
+to a path conflict, but then when they rebase the change manually they do not
+see any conflict (because manual rebases are always done with content merge
+enabled).
++
+In general, the stability gain of disabling content merges is not worth the
+overhead and confusion that this adds for users, which is why disabling content
+merges is highly discouraged.
++
+Valid values are `true`, `false`, or `INHERIT`.
++
+The default is `INHERIT`.
++
+NOTE: Project owners can also set this option in the Gerrit UI:
+`Browse` > `Repositories` > my/repository > `Allow content merges`.
[[submit.action]]submit.action::
+
-Defines the link:#submit-type[submit type]. Valid
-values are 'fast forward only', 'merge if necessary', 'rebase if necessary',
-'rebase always', 'merge always' and 'cherry pick'. The default is 'merge if necessary'.
+Defines the submit action aka submit type aka submit strategy that Gerrit
+should use to integrate changes into the target branch when they are submitted.
++
+In general, submitting a change only merges the change if all its dependencies
+are also submitted. The only exception is the `cherry pick` submit action which
+ignores dependencies and hence is not recommended to be used (see
+link:#cherry_pick[below]).
++
+[[submit-type]]
+--
+The following submit actions are supported:
+
+[[merge_if_necessary]]
+* 'merge if necessary':
++
+With this action, when a change is being submitted, Gerrit fast-forwards the
+target branch if possible, and otherwise creates a merge commit automatically.
++
+A fast-forward is possible if the commit that represents the current patch set
+of the change has the current head of the target branch in its parent lineage.
++
+If a fast-forward is not possible, Gerrit automatically creates a merge commit
+that merges the current patch set of the change into the target branch and then
+the target branch is fast-forwarded to the merge commit.
++
+The behavior of this submit action is identical with the classical `git merge`
+behavior, or
+link:https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---ff[git
+merge --ff].
++
+With this submit action the commits that have been reviewed and approved are
+retained in the git history of the target branch. This means, by looking at the
+history of the target branch, you can see for all commits when they were
+originally committed and on which parent commit they were originally based.
+
+[[always_merge]]
+[[merge_always]]
+* 'merge always':
++
+With this action, when a change is being submitted, Gerrit always creates a
+merge commit, even if a fast-forward is possible.
++
+This is identical to the behavior of
+link:https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---no-ff[git merge --no-ff].
++
+With this submit action the commits that have been reviewed and approved are
+retained in the git history of the target branch. This means, by looking at the
+history of the target branch, you can see for all commits when they were
+originally committed and on which parent commit they were originally based. In
+addition, from the merge commits you can see when the changes were submitted
+and it's possible to follow submissions with `git log --first-parent`.
+
+[[rebase_if_necessary]]
+* 'rebase if necessary':
++
+With this action, when a change is being submitted, Gerrit fast-forwards the
+target branch if possible, and otherwise does a rebase automatically.
++
+A fast-forward is possible if the commit that represents the current patch set
+of the change has the current head of the target branch in its parent lineage.
++
+If a fast-forward is not possible, Gerrit automatically rebases the current
+patch set of the change on top of the current head of the target branch and
+then the target branch is fast-forwarded to the rebased commit.
++
+With this submit action, when a rebase is performed, the original commits that
+have been reviewed and approved do not become part of the target branch's
+history. This means the information on when the original commits were committed
+and on which parent they were based is not retained in the branch history.
++
+Using this submit action results in a linear history of the target branch,
+unless merge commits are being submitted. For some people this is an advantage
+since they find the linear history easier to read.
++
+NOTE: Rebasing merge commits is not supported. If a change with a merge commit
+is submitted the link:#merge_if_necessary[merge if necessary] submit action is
+applied.
++
+When rebasing the patchset, Gerrit automatically appends onto the end of the
+commit message a short summary of the change's approvals, and a URL link back
+to the change in the web UI (see link:#submit-footers[below]). If a fast-forward
+is done no footers are added.
+
+[[rebase_always]]
+* 'rebase always':
++
+With this action, when a change is being submitted, Gerrit always does a
+rebase, even if a fast-forward is possible.
++
+With this submit action, the original commits that have been reviewed and
+approved do not become part of the target branch's history. This means the
+information on when the original commits were committed and on which parent
+they were based is not retained in the branch history.
++
+Using this submit action results in a linear history of the target branch,
+unless merge commits are being submitted. For some people this is an advantage
+since they find the linear history easier to read.
++
+NOTE: Rebasing merge commits is not supported. If a change with a merge commit
+is submitted the link:#merge_if_necessary[merge if necessary] submit action is
+applied.
++
+When rebasing the patchset, Gerrit automatically appends onto the end of the
+commit message a short summary of the change's approvals, and a URL link back
+to the change in the web UI (see link:#submit-footers[below]).
++
+The footers that are added are exactly the same footers that are also added by
+the link:cherry_pick[cherry pick] action. Thus, the `rebase always` action can
+be considered similar to the `cherry pick` action, but with the important
+distinction that `rebase always` does not ignore dependencies, which is why
+using the `rebase always` action should be preferred over the `cherry pick`
+submit action.
+
+[[fast_forward_only]]
+* 'fast forward only' (usage generally not recommended):
++
+With this action a change can only be submitted if at submit time the target
+branch can be fast-forwarded to the commit that represents the current patch
+set of the change. This means in order for a change to be submittable its
+current patch set must have the current head of the target branch in its parent
+lineage.
++
+The advantage of using this action is that the target branch is always updated
+to the exact commit that has been reviewed and approved. In particular, if CI
+verification is configured, this means that the CI verified the exact commit to
+which the target branch is being fast-forwarded on submit (assuming no approval
+copying is configured for CI votes).
++
+The huge drawback of using this action is that whenever one change is submitted
+all other open changes for the same branch, that are not successors of the
+submitted change, become non-submittable, since the target branch can no longer
+be fast-forwarded to their current patch sets. Making these changes submittable
+again requires rebasing and re-approving/re-verifying them. For most projects
+this causes an unreasonable amount of overhead that doesn't justify the
+stability gain by verifying exact commits so that using this submit action is
+generally discouraged. Using this action should only be considered for projects
+that have a low frequency of changes and that have special requirements to
+never break any target branch.
++
+NOTE: With this submit action Gerrit does not create merge commits on
+submitting a change, but merge commits that are created on the client, prior to
+uploading to Gerrit for review, may still be submitted.
+
+[[cherry_pick]]
+* 'cherry pick' (usage not recommended, use link:#rebase_always[rebase always]
+instead):
++
+With this submit action Gerrit always performs a cherry pick of the current
+patch set when a change is submitted. This ignores the parent lineage and
+instead creates a brand new commit on top of the current head of the target
+branch. The submitter becomes the committer of the new commit and the original
+commit author is retained.
++
+Ignoring change dependencies on submit is often confusing for users. For users
+that stack changes on top of each other, it's unexpected that these
+dependencies are ignored on submit. Ignoring dependencies also means that
+submitters need to submit the changes individually in the correct order.
+Otherwise it's likely that submissions fail due to conflicts or that the
+target branch gets broken (because it contains the submitted change, but not
+its predecessors which may be required for the submitted change to work
+correctly).
++
+If link:config-gerrit.html#change.submitWholeTopic[`change.submitWholeTopic`]
+is enabled changes that have the same topic are submitted together, the same as
+with all other submit actions. This means by setting the same topic on all
+dependent changes it's possible to submit a stack of changes together and
+overcome the limitation that change dependencies are ignored.
++
+When cherry picking the patchset, Gerrit automatically appends onto the end of
+the commit message a short summary of the change's approvals, and a URL link
+back to the change in the web UI (see link:#submit-footers[below]).
++
+Using this submit action is not recommended because it ignores change
+dependencies, instead link:#rebase_always[rebase always] should be used which
+behaves the same way except that it respects change dependencies (in particular
+`rebase always` adds the same kind of footers to the merged commit as
+`cherry pick`).
+
+--
++
+[[submit_type_inherit]]
+In addition the submit action can be set to `Inherit`, which means that the
+value that is configured in the parent project applies. For new projects
+`Inherit` is the default, unless the default is overridden by the global
+link:config-gerrit.html#repository.name.defaultSubmitType[defaultSubmitType]
+configuration. Configuring `Inherit` for the `All-Projects` root project is
+equivalent to configuring link:#merge_if_necessary[merge if necessary].
++
+If `submit.action` is not set, the default is 'merge if necessary'.
++
+NOTE: The different submit actions are also described in the
+link:https://docs.google.com/presentation/d/1C73UgQdzZDw0gzpaEqIC6SPujZJhqamyqO1XOHjH-uk/edit#slide=id.g4d6c16487b_1_800[Gerrit - Concepts and Workflows]
+presentation, where their behavior is visualized by git commit graphs.
++
+NOTE: If Gerrit performs a merge, rebase or cherry-pick as part of the
+change submission (true for all submit actions, except for
+link:#fast_forward_only[fast forward only]), it is controlled by the
+link:#submit.mergeContent[mergeContent] setting whether a content merge is
+performed when there is a path conflict.
++
+NOTE: If Gerrit performs a merge, rebase or cherry-pick as part of the
+change submission (true for all submit actions, except for
+link:#fast_forward_only[fast forward only]), it can be that trying to submit
+a change would fail due to Git conflicts (if the same lines were modified
+concurrently, or if link:#submit.mergeContent[mergeContent] is disabled also if
+the same files were modified concurrently). In this case the submit button in
+the Gerrit web UI is disabled and a tooltip on the disabled submit button
+informs about the change being non-mergeable.
++
+[[submit-footers]]
+--
+NOTE: If Gerrit performs a rebase or cherry-pick as part of the change
+submission (true for link:#rebase_if_necessary[rebase if necessary],
+link:#rebase_always[rebase always] and link:#cherry_pick[cherry pick]) Gerrit
+inserts additional footers into the commit message of the newly created
+commit: +
+ +
+* `Change-Id: <change-id>` (only if this footer is not already present, see
+ link:user-changeid.html[Change-Id]) +
+* `Reviewed-on: <change-url>` (links to the change in Gerrit where this commit
+ was reviewed) +
+* `Reviewed-by: <reviewer>` (once for every reviewer with a positive
+ `Code-Review` vote) +
+* `Tested-by: <reviewer>` (once for every reviewer with a positive `Verified`
+ vote) +
+* `<label-name>: <reviewer>` (once for every reviewer with a positive vote on
+ any other label) +
+ +
+In addition, plugins that implement a
+link:dev-plugins.html#change-message-modifier[Change Message Modifier] may add
+additional custom footers.
+--
++
+NOTE: For the value of `submit.action` in `project.config` use the exact
+spelling as given above, e.g. 'merge if necessary' (without the single quotes,
+but with the spaces).
++
+NOTE: Project owners can also set the submit action in the Gerrit UI:
+`Browse` > `Repositories` > my/repository > `Submit type`
[[submit.matchAuthorToCommitterDate]]submit.matchAuthorToCommitterDate::
+
@@ -346,98 +636,6 @@
is set to 'true' the merge would fail in such a case. An empty commit is still allowed as the
initial commit on a branch.
-[[submit-type]]
-==== Submit Type
-
-'submit.action': The method Gerrit uses to submit a change to a project.
-
-The submit type can also be modified by any project owner through the
-project console, `Browse` > `Repositories` > my/project > 'Submit type'.
-In general, a submitting a change only merges the change if all its
-dependencies are also submitted, with exceptions documented below.
-
-The following submit types are supported:
-
-[[submit_type_inherit]]
-* Inherit
-+
-This is the default for new projects, unless overridden by a global
-link:config-gerrit.html#repository.name.defaultSubmitType[`defaultSubmitType` option].
-+
-Inherit the submit type from the parent project. In `All-Projects`, this
-is equivalent to link:#merge_if_necessary[Merge If Necessary].
-
-[[fast_forward_only]]
-* Fast Forward Only
-+
-With this method Gerrit does not create merge commits on submitting a
-change. Merge commits may still be submitted, but they must be created
-on the client prior to uploading to Gerrit for review.
-+
-To submit a change, the change must be a strict superset of the
-destination branch. That is, the change must already contain the
-tip of the destination branch at submit time.
-
-[[merge_if_necessary]]
-* Merge If Necessary
-+
-If the change being submitted is a strict superset of the destination
-branch, then the branch is fast-forwarded to the change. If not,
-then a merge commit is automatically created. This is identical
-to the classical `git merge` behavior, or `git merge --ff`.
-
-[[always_merge]]
-* Always Merge
-+
-Always produce a merge commit, even if the change is a strict
-superset of the destination branch. This is identical to the
-behavior of `git merge --no-ff`, and may be useful if the
-project needs to follow submits with `git log --first-parent`.
-
-[[cherry_pick]]
-* Cherry Pick
-+
-Always cherry pick the patch set, ignoring the parent lineage
-and instead creating a brand new commit on top of the current
-branch head.
-+
-When cherry picking a change, Gerrit automatically appends onto the
-end of the commit message a short summary of the change's approvals,
-and a URL link back to the change on the web. The committer header
-is also set to the submitter, while the author header retains the
-original patch set author.
-+
-Note that Gerrit ignores dependencies between changes when using this
-submit type unless
-link:config-gerrit.html#change.submitWholeTopic[`change.submitWholeTopic`]
-is enabled and depending changes share the same topic. So generally
-submitters must remember to submit changes in the right order when using this
-submit type. If all you want is extra information in the commit message,
-consider using the Rebase Always submit strategy.
-
-[[rebase_if_necessary]]
-* Rebase If Necessary
-+
-If the change being submitted is a strict superset of the destination
-branch, then the branch is fast-forwarded to the change. If not,
-then the change is automatically rebased and then the branch is
-fast-forwarded to the change.
-+
-When Gerrit tries to do a merge, by default the merge will only
-succeed if there is no path conflict. A path conflict occurs when
-the same file has also been changed on the other side of the merge.
-
-[[rebase_always]]
-* Rebase Always
-+
-Basically, the same as Rebase If Necessary, but it creates a new patchset even
-if fast forward is possible AND like Cherry Pick it ensures footers such as
-Change-Id, Reviewed-On, and others are present in resulting commit that is
-merged.
-+
-Thus, Rebase Always can be considered similar to Cherry Pick, but with
-the important distinction that Rebase Always does not ignore dependencies.
-
[[access-section]]
=== Access section
diff --git a/Documentation/config-submit-requirements.txt b/Documentation/config-submit-requirements.txt
index 2686f39..8298be3 100644
--- a/Documentation/config-submit-requirements.txt
+++ b/Documentation/config-submit-requirements.txt
@@ -38,6 +38,15 @@
submit requirements for certain branch patterns. See the
link:#exempt-branch-example[exempt branch] example.
+Often submit requirements should only apply to branches that contain source
+code. In this case this parameter can be used to exclude the
+link:config-project-config.html#refs-meta-config[refs/meta/config] branch from
+a submit requirement:
+
+----
+ applicableIf = -branch:refs/meta/config
+----
+
This field is optional, and if not specified, the submit requirement is
considered applicable for all changes in the project.
diff --git a/Documentation/dev-community.txt b/Documentation/dev-community.txt
index 7488f74..47c0be2 100644
--- a/Documentation/dev-community.txt
+++ b/Documentation/dev-community.txt
@@ -54,7 +54,6 @@
* link:dev-build-plugins.html[Building Gerrit plugins]
* link:pg-plugin-dev.html[JavaScript Plugin Development and API]
* link:config-validation.html[Validation Interfaces]
-* link:dev-stars.html[Starring Changes]
* link:quota.html[Quota Enforcement]
[[maintainer]]
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index fcc8b7e..107473a 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt
@@ -24,33 +24,31 @@
link:dev-roles.html#maintainer[maintainers,role=external,window=_blank]
review them adhoc.
-For large/complex features, it is required to follow the
-link:#design-driven-contribution-process[design-driven contribution
-process] and specify the feature in a link:dev-design-docs.html[design
-doc,role=external,window=_blank] before starting with the implementation.
+For large/complex features, it is required to specify the feature in a
+link:dev-design-docs.html[design document,role=external,window=_blank] before
+starting implementation, as per the
+link:#design-driven-contribution-process[design-driven contribution process].
If link:dev-roles.html#contributor[contributors,role=external,window=_blank]
-choose the lightweight contribution process and during the review it turns out
-that the feature is too large or complex,
-link:dev-roles.html#maintainer[maintainers,role=external,window=_blank] can
-require to follow the design-driven contribution process instead.
+choose the lightweight contribution process but the feature is found to be
+large or complex, link:dev-roles.html#maintainer[maintainers,role=external,window=_blank]
+can require that the design-driven contribution process be followed instead.
If you are in doubt which process is right for you, consult the
link:https://groups.google.com/d/forum/repo-discuss[repo-discuss,role=external,window=_blank]
mailing list.
These contribution processes apply to everyone who contributes code to
-the Gerrit project, including link:dev-roles.html#maintainer[
-maintainers,role=external,window=_blank]. When reading this document, keep in
-mind that maintainers are also contributors when they contribute code.
+the Gerrit project. link:dev-roles.html#maintainer[
+Maintainers,role=external,window=_blank] are also considered contributors
+when they contribute code.
If a new feature is large or complex, it is often difficult to find a
-maintainer who can take the time that is needed for a thorough review,
-and who can help with getting the changes submitted. To avoid that this
-results in unpredictable long waiting times during code review,
-contributors can ask for link:#mentorship[mentor support]. A mentor
-helps with timely code reviews and technical guidance. Doing the
-implementation is still the responsibility of the contributor.
+maintainer who can take the time that is needed for a thorough review. This
+can result in unpredictably long waiting times before the changes are
+submitted. To avoid that, contributors can ask for link:#mentorship[mentor support].
+A mentor helps with timely code reviews and technical guidance, though the
+implementation itself is still the responsibility of the contributor.
[[comparison]]
=== Quick Comparison
@@ -66,8 +64,8 @@
|Review |adhoc (when reviewer is available)|by a dedicated mentor (if
a link:#mentorship[mentor] was assigned)
|Caveats |features may get vetoed after the implementation was already
-done, maintainers may make the design-driven contribution process
-required if a change gets too complex/large|design doc must stay open
+done, maintainers may require the design-driven contribution process
+be followed if a change gets too complex/large|design doc must stay open
for a minimum of 10 calendar days, a mentor may not be available
immediately
|Applicable to|documentation updates, bug fixes, small features|
@@ -83,40 +81,32 @@
link:#design-driven-contribution-process[design-driven contribution
process] is required.
-As Gerrit is a code review tool, naturally contributions will
-be reviewed before they will get submitted to the code base. To
-start your contribution, please make a git commit and upload it
-for review to the link:https://gerrit-review.googlesource.com/[
-gerrit-review.googlesource.com,role=external,window=_blank] Gerrit server. To
-help speed up the review of your change, review these link:dev-crafting-changes.html[
+To start contributing to Gerrit, upload your git commit for review to the
+link:https://gerrit-review.googlesource.com/[gerrit-review.googlesource.com,
+role=external,window=_blank] Gerrit server. Review these link:dev-crafting-changes.html[
guidelines,role=external,window=_blank] before submitting your change. You can
-view the pending Gerrit contributions and their statuses
-link:https://gerrit-review.googlesource.com/#/q/status:open+project:gerrit[here,role=external,window=_blank].
+view pending contributions link:https://gerrit-review.googlesource.com/#/q/status:open+project:gerrit[here,role=external,window=_blank].
Depending on the size of that list it might take a while for
-your change to get reviewed. Naturally there are fewer
-link:dev-roles.html#maintainer[maintainers,role=external,window=_blank], that
-can approve changes, than link:dev-roles.html#contributor[contributors,role=external,window=_blank];
-so anything that you can do to ensure that your contribution will undergo fewer
-revisions will speed up the contribution process. This includes
-helping out reviewing other people's changes to relieve the load from
-the maintainers. Even if you are not familiar with Gerrit's internals,
+your change to get reviewed. Anything that you can do to ensure that your
+contribution will undergo fewer revisions will speed up the contribution process.
+This includes helping out reviewing other people's changes to relieve the
+load from the maintainers. Even if you are not familiar with Gerrit's internals,
it would be of great help if you can download, try out, and comment on
-new features. If it works as advertised, say so, and if you have the
+new features. If it works as advertised, say so, and if you have the
privileges to do so, go ahead and give it a `+1 Verified`. If you
would find the feature useful, say so and give it a `+1 Code Review`.
-And finally, the quicker you respond to the comments of your reviewers,
-the quicker your change might get merged! Try to reply to every
-comment after submitting your new patch, particularly if you decided
-against making the suggested change. Reviewers don't want to seem like
-nags and pester you if you haven't replied or made a fix, so it helps
-them know if you missed it or decided against it.
+Finally, the quicker you respond to the comments of your reviewers, the
+quicker your change can be merged! Try to reply to every comment after
+submitting your new patch, particularly if you decided against making the
+suggested change. Reviewers don't want to seem like nags and pester you
+if you haven't replied or made a fix, so it helps them know if you missed
+it or decided against it.
-Features or API extensions, even if they are small, will incur
-long-time maintenance and support burden, so they should be left
-pending for at least 24 hours to give maintainers in all timezones a
-chance to evaluate.
+A new feature or API extension, even if small, can incur a long-time
+maintenance and support burden and should be left pending for 24 hours
+to give maintainers in all time zones a chance to evaluate the change.
[[design-driven-contribution-process]]
=== Design-driven Contribution Process
@@ -126,19 +116,19 @@
For large/complex features it is important to:
-* agree on the functionality and scope before spending too much time
- on the implementation
+* agree on functionality and scope before spending too much time on
+ implementation
* ensure that they are in line with Gerrit's project scope and vision
* ensure that they are well aligned with other features
-* think about possibilities how the feature could be evolved over time
+* consider how the feature could be evolved over time
This is why for large/complex features it is required to describe the
feature in a link:dev-design-docs.html[design doc,role=external,window=_blank]
and get it approved by the
-link:dev-processes.html#steering-committee[steering committee,role=external,window=_blank],
+link:dev-processes.html#steering-committee[steering committee,role=external,window=_blank]
before starting the implementation.
-The design-driven contribution process has the following steps:
+The design-driven contribution process consists of the following steps:
* A link:dev-roles.html#contributor[contributor,role=external,window=_blank]
link:dev-design-docs.html#propose[proposes,role=external,window=_blank] a new
@@ -155,40 +145,31 @@
be accepted.
* To be submitted, the design doc needs to be approved by the
link:dev-processes.html#steering-committee[steering committee,role=external,window=_blank].
-* After the design was approved, the implementation is done by pushing
- changes for review, see link:#lightweight-contribution-process[
+* After the design is approved, it is implemented by pushing
+ changes for review, see the link:#lightweight-contribution-process[
lightweight contribution process]. Changes that are associated with
a design should all share a common hashtag. The contributor is the
- main driver of the implementation and responsible that it is done.
- Others from the Gerrit community are usually much welcome to help
- with the implementation.
+ main driver of the implementation and responsible for its completion.
+ Others from the Gerrit community are usually welcome to help.
-In order to be accepted/submitted, it is not necessary that the design
-doc fully specifies all the details, but the idea of the feature and
-how it fits into Gerrit should be sufficiently clear (judged by the
-steering committee). Contributors are expected to keep the design doc
-updated and fill in gaps while they go forward with the implementation.
-We expect that implementing the feature and updating the design doc
-will be an iterative process.
+The design doc does not need to fully specify each detail of the feature,
+but its concept and how it fits into Gerrit should be sufficiently clear,
+as judged by the steering committee. Contributors are expected to keep
+the design doc updated and fill in gaps while they go forward with the
+implementation. We expect that implementing the feature and updating the
+design doc will be an iterative process.
-While the design doc is still in review, contributors may already start
-with the implementation (e.g. do some prototyping to demonstrate parts
-of the proposed design), but those changes should not be submitted
-while the design wasn't approved yet. Another way to demonstrate the
-design can be to add screenshots or the like, early enough in the doc.
+While the design doc is still in review, contributors may start with the
+implementation (e.g. do some prototyping to demonstrate parts of the
+proposed design), but those changes should not be submitted while the
+design is not yet approved. Another way to demonstrate the design can be
+mocking screenshots in the doc.
By approving a design, the steering committee commits to:
* Accepting the feature when it is implemented.
* Supporting the feature by assigning a link:dev-roles.html#mentor[
- mentor,role=external,window=_blank] (if requested, see link:#mentorship[mentorship]).
-
-If the implementation of a feature gets stuck and it's unclear whether
-the feature gets fully done, it should be discussed with the steering
-committee how to proceed. If the contributor cannot commit to finish
-the implementation and no other contributor can take over, changes that
-have already been submitted for the feature might get reverted so that
-there is no unused or half-finished code in the code base.
+ mentor,role=external,window=_blank] if requested (see link:#mentorship[mentorship]).
For contributors, the design-driven contribution process has the
following advantages:
@@ -196,12 +177,11 @@
* By writing a design doc, the feature gets more attention. During the
design review, feedback from various sides can be collected, which
likely leads to improvements of the feature.
-* Once a design was approved by the
+* Once a design is approved by the
link:dev-processes.html#steering-committee[steering committee,role=external,window=_blank],
the contributor can be almost certain that the feature will be accepted.
- Hence, there is only a low risk to invest into implementing a feature
- and see it being rejected later during the code review, as it can
- happen with the lightweight contribution process.
+ Hence, there little risk of the feature being rejected later in code review,
+ as can occur with the lightweight contribution process.
* The contributor can link:#mentorship[get a dedicated mentor assigned]
who provides timely reviews and serves as a contact person for
technical questions and discussing details of the design.
@@ -249,12 +229,11 @@
* done criteria that define when the feature is done and the mentorship
ends
-If a feature is not finished in time, it should be discussed with the
-steering committee how to proceed. If the contributor cannot commit to
-finish the implementation in time and no other contributor can take
-over, changes that have already been submitted for the feature might
-get reverted so that there is no unused or half-finished code in the
-code base.
+If a feature implementation is not completed in time and no contributors
+can commit to finishing the implementation, changes that have already been
+submitted for the feature may be reverted to avoid unused or half-finished
+code in the code base. In these circumstances, the steering committee
+determines how to proceed.
[[esc-dd-evaluation]]
== How the ESC evaluates design documents
@@ -314,7 +293,7 @@
=== Core vs. Plugin decision
Q: `Would this fit better in a plugin?`
-* Yes:The proposed feature or rework is an implementation (e.g. Lucene
+* Yes: The proposed feature or rework is an implementation (e.g. Lucene
is an index implementation) of a generic concept that others
might want to implement differently.
* Yes: The proposed feature or rework is very specific to a custom setup.
diff --git a/Documentation/dev-e2e-tests.txt b/Documentation/dev-e2e-tests.txt
index 8e5463d..1151f1c 100644
--- a/Documentation/dev-e2e-tests.txt
+++ b/Documentation/dev-e2e-tests.txt
@@ -204,6 +204,13 @@
* `-Dcom.google.gerrit.scenarios.context_path=/context`
+==== Authentication
+
+The `authenticated` property allows test scenarios to use authenticated HTTP clones. Its default is
+no authentication:
+
+* `-Dcom.google.gerrit.scenarios.authenticated=false`
+
==== Automatic properties
The link:#_input_file[example keywords,role=external,window=_blank] also include `_PROJECT`,
diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt
index dce5eb0..79febe4 100644
--- a/Documentation/dev-eclipse.txt
+++ b/Documentation/dev-eclipse.txt
@@ -115,11 +115,11 @@
== Testing
-=== The Gerrit web app UI is served by `server.go` process. To launch it,
+=== The Gerrit web app UI is served by `Web Dev Server`. To launch it,
run this command:
----
- $ bazel run polygerrit-ui:devserver
+ $ npm run start
----
=== Running the Daemon
diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt
index f045ab8..6ff064c 100644
--- a/Documentation/dev-readme.txt
+++ b/Documentation/dev-readme.txt
@@ -178,6 +178,9 @@
NOTE: To learn why using `java -jar` isn't sufficient, see
<<special_bazel_java_version,this explanation>>.
+NOTE: When launching the daemong this way, the settings from the `[container]` section from the
+`$GERRIT_SITE/etc/gerrit.config` are not honored.
+
To debug the Gerrit server of this test site:
. Open a debug port (such as port 5005). To do so, insert the following code
@@ -188,6 +191,49 @@
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
----
+=== Running the Daemon honoring the [container] section settings
+
+To run the Daemon and honor the `[container]` section settings use the `gerrit.sh` script:
+
+----
+ $ cd $GERRIT_SITE
+ $ bin/gerrit.sh run
+----
+
+To run the Daemon in debug mode use the `--debug` option:
+
+----
+ $ bin/gerrit.sh run --debug
+----
+
+The default debug port is `8000`. To specify a different debug port use the `--debug-port` option:
+
+----
+ $ bin/gerrit.sh run --debug --debug-port=5005
+----
+
+The `--debug-address` option also exists and is a synonym for the ``--debug-port` option:
+
+----
+ $ bin/gerrit.sh run --debug --debug-address=5005
+----
+
+Note that, by default, the debugger will only accept connections from the localhost. To enable
+debug connections from other host(s) provide also a host name or wildcard in the `--debug-address`
+value:
+
+----
+ $ bin/gerrit.sh run --debug --debug-address=*:5005
+----
+
+Debugging the Daemon startup requires starting the JVM in suspended debug mode. The JVM will await
+for a debugger to attach before proceeding with the start. Use the `--suspend` option for that
+scenario:
+
+----
+ $ bin/gerrit.sh run --debug --suspend
+----
+
=== Running the Daemon with Gerrit Inspector
link:dev-inspector.html[Gerrit Inspector] is an interactive scriptable
diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt
index 0849c56..40470a6 100644
--- a/Documentation/dev-release.txt
+++ b/Documentation/dev-release.txt
@@ -327,6 +327,20 @@
git submodule foreach '[ "$sm_path" == "modules/jgit" ] || git push gerrit-review tag "v$version"'
----
+[[publish-typescript-plugin-api]]
+==== Publish TypeScript Plugin API
+
+Only applies to major and minor releases! Not required for patch releases.
+
+* Publish a new version of the npm package `@gerritcodereview/typescript-api`.
+See link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/api/README.md[api/README.md,role=external,window=_blank]
+for details.
+
+* The plugins in the stable branch of the minor release and the master branch
+be changed to use the new API version, see
+link:https://gerrit-review.googlesource.com/c/gerrit/+/340069[
+example change,role=external,window=_blank]
+
[[upload-documentation]]
==== Upload the Documentation
diff --git a/Documentation/dev-roles.txt b/Documentation/dev-roles.txt
index cecaedc..d8f7e11 100644
--- a/Documentation/dev-roles.txt
+++ b/Documentation/dev-roles.txt
@@ -66,11 +66,12 @@
link:https://groups.google.com/d/forum/repo-discuss[repo-discuss,role=external,window=_blank]
mailing list):
-* become member of the `gerrit-verifiers` group, which allows to:
+* become member of the `gerrit-trusted-contributors` group, which allows to:
** vote on the `Verified` and `Code-Style` labels
** edit hashtags on all changes
** edit topics on all open changes
** abandon changes
+** revert changes
* approve posts to the
link:https://groups.google.com/d/forum/repo-discuss[repo-discuss,role=external,window=_blank]
mailing list
@@ -106,14 +107,14 @@
have. In addition they have signed a link:dev-cla.html[contributor
license agreement] which enables them to push changes.
-Regular contributors can ask to be added to the `gerrit-verifiers`
+Regular contributors can ask to be added to the `gerrit-trusted-contributors`
group, which allows to:
* add patch sets to changes of other users
* propose project config changes (push changes for the
`refs/meta/config` branch
-Being member of the `gerrit-verifiers` group includes further
+Being member of the `gerrit-trusted-contributors` group includes further
permissions (see link:#supporter[supporter] section above).
It's highly appreciated if contributors engage in code reviews,
diff --git a/Documentation/dev-stars.txt b/Documentation/dev-stars.txt
deleted file mode 100644
index 764e326..0000000
--- a/Documentation/dev-stars.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-= Gerrit Code Review - Stars
-
-== Description
-
-Changes can be starred with labels that behave like private hashtags.
-Any label can be applied to a change, but these labels are only visible
-to the user for which the labels have been set.
-
-Stars allow users to categorize changes by self-defined criteria and
-then build link:user-dashboards.html[dashboards] for them by making use
-of the link:#query-stars[star query operators].
-
-[[star-api]]
-== Star API
-
-The link:rest-api-accounts.html#star-endpoints[star REST API] supports:
-
-* link:rest-api-accounts.html#get-stars[
- get star labels from a change]
-* link:rest-api-accounts.html#set-stars[
- update star labels on a change]
-* link:rest-api-accounts.html#get-starred-changes[
- list changes that are starred by any label]
-
-Star labels are also included in
-link:rest-api-changes.html#change-info[ChangeInfo] entities that are
-returned by the link:rest-api-changes.html[changes REST API].
-
-There are link:rest-api-accounts.html#default-star-endpoints[
-additional REST endpoints] for the link:#default-star[default star].
-
-[[default-star]]
-== Default Star
-
-If the default star is set by a user, this user is automatically
-notified by email whenever updates are made to that change.
-
-The default star is the star that is shown in the WebUI and which can
-be updated from there.
-
-The default star is represented by the special star label 'star'.
-
-[[ignore-star]]
-== Ignore Star
-
-If the ignore star is set by a user, this user gets no email
-notifications for updates of that change, even if this user is a
-reviewer of the change or the change is matched by a project watch of
-the user.
-
-Since changes can only be ignored once they are created, users that
-watch a project will always get the email notifications for the change
-creation. Only then the change can be ignored.
-
-Users that are added as reviewer or assignee to a change that they have
-ignored will be notified about this, so that they know about the review
-request. They can then decide to remove the ignore star.
-
-The ignore star is represented by the special star label 'ignore'.
-
-[[query-stars]]
-== Query Stars
-
-There are several query operators to find changes with stars:
-
-* link:user-search.html#is-starred[is:starred] /
- link:user-search.html#has-star[has:star]:
- Matches any change that was starred by the current user with the
- link:#default-star[default star].
-
-[[syntax]]
-== Syntax
-
-Star labels cannot contain whitespace characters. All other characters
-are allowed.
-
-GERRIT
-------
-Part of link:index.html[Gerrit Code Review]
-
-SEARCHBOX
----------
diff --git a/Documentation/intro-gerrit-walkthrough.txt b/Documentation/intro-gerrit-walkthrough.txt
index ff37ffc..345eb1c 100644
--- a/Documentation/intro-gerrit-walkthrough.txt
+++ b/Documentation/intro-gerrit-walkthrough.txt
@@ -130,7 +130,7 @@
In general, the *Code-Review* check requires an individual to look at the code,
while the *Verified* check is done by an automated build server, through a
mechanism such as the
-link:https://wiki.jenkins-ci.org/display/JENKINS/Gerrit+Trigger[Gerrit Trigger
+link:https://plugins.jenkins.io/gerrit-trigger/[Gerrit Trigger
Jenkins Plugin,role=external,window=_blank].
IMPORTANT: The Code-Review and Verified checks require different permissions
@@ -253,7 +253,7 @@
can add custom checks or even remove the Verified check entirely.
Verification is typically an automated process using the
-link:https://wiki.jenkins-ci.org/display/JENKINS/Gerrit+Trigger[Gerrit Trigger Jenkins Plugin,role=external,window=_blank]
+link:https://plugins.jenkins.io/gerrit-trigger/[Gerrit Trigger Jenkins Plugin,role=external,window=_blank]
or a similar mechanism. However, there are still times when a change requires
manual verification, or a reviewer needs to check how or if a change works.
To accommodate these and other similar circumstances, Gerrit exposes each change
diff --git a/Documentation/intro-project-owner.txt b/Documentation/intro-project-owner.txt
index 8a3b10e..f13bc22 100644
--- a/Documentation/intro-project-owner.txt
+++ b/Documentation/intro-project-owner.txt
@@ -316,9 +316,9 @@
A useful feature on labels is the possibility to automatically copy
scores forward to new patch sets if it was a
-link:config-labels.html#label_copyAllScoresOnTrivialRebase[trivial
-rebase] or if link:config-labels.html#label_copyAllScoresIfNoCodeChange[
-there was no code change] (e.g. only the commit message was edited).
+link:config-labels.html#trivial_rebase[trivial rebase] or if
+link:config-labels.html#no_code_change[there was no code change] (e.g.
+only the commit message was edited).
[[submit-rules]]
== Submit Rules
@@ -374,7 +374,7 @@
There are several solutions for integrating continuous integration
systems. The most commonly used are:
-- link:https://wiki.jenkins-ci.org/display/JENKINS/Gerrit+Trigger[
+- link:https://plugins.jenkins.io/gerrit-trigger/[
Gerrit Trigger,role=external,window=_blank] plugin for link:http://jenkins-ci.org/[Jenkins,role=external,window=_blank]
- link:http://www.mediawiki.org/wiki/Continuous_integration/Zuul[
diff --git a/Documentation/intro-user.txt b/Documentation/intro-user.txt
index c3abedb..0f78e1f 100644
--- a/Documentation/intro-user.txt
+++ b/Documentation/intro-user.txt
@@ -368,6 +368,10 @@
project-level]. The project dashboards can be seen in the web UI under
`Projects` > `List` > <project-name> > `Dashboards`.
+All dashboards and search pages allow an action to be applied to multiple
+changes at once. Select the changes with the checkboxes on the left side and
+choose the action from the action bar at the top of the change section.
+
[[submit]]
== Submit a Change
@@ -667,19 +671,6 @@
or build artifacts containing build numbers) can fetch the code
using the commit ID.
-[[ignore]]
-== Ignoring Or Marking Changes As 'Reviewed'
-
-Changes can be ignored, which means they will not appear in the 'Incoming
-Reviews' dashboard and any related email notifications will be suppressed.
-This can be useful when you are added as a reviewer to a change on which
-you do not actively participate in the review, but do not want to completely
-remove yourself.
-
-Alternatively, rather than completely ignoring the change, it can be marked
-as 'Reviewed'. Marking a change as 'Reviewed' means it will not be highlighted
-in the dashboard, until a new patch set is uploaded.
-
[[inline-edit]]
== Inline Edit
diff --git a/Documentation/js_licenses.txt b/Documentation/js_licenses.txt
index 5b7e073..e2afbf5 100644
--- a/Documentation/js_licenses.txt
+++ b/Documentation/js_licenses.txt
@@ -2,6 +2,7 @@
[[Apache2_0]]
Apache2.0
+* fonts:material-icons
* fonts:robotofonts
[[Apache2_0_license]]
@@ -403,6 +404,7 @@
* @polymer/iron-resizable-behavior
* @polymer/iron-selector
* @polymer/iron-validatable-behavior
+* @polymer/marked-element
* @polymer/neon-animation
* @polymer/paper-behaviors
* @polymer/paper-button
@@ -1304,6 +1306,60 @@
----
+[[marked]]
+marked
+
+* marked
+
+[[marked_license]]
+----
+# License information
+
+## Contribution License Agreement
+
+If you contribute code to this project, you are implicitly allowing your code
+to be distributed under the MIT license. You are also implicitly verifying that
+all code is your original work. `</legalese>`
+
+## Marked
+
+Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## Markdown
+
+Copyright © 2004, John Gruber
+http://daringfireball.net/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name “Markdown” nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
+
+----
+
+
[[page]]
page
@@ -1611,6 +1667,219 @@
----
+[[safevalues]]
+safevalues
+
+* safevalues
+
+[[safevalues_license]]
+----
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
+----
+
+
[[tslib]]
tslib
@@ -1633,3 +1902,216 @@
----
+
+[[web-vitals]]
+web-vitals
+
+* web-vitals
+
+[[web-vitals_license]]
+----
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2020 Google LLC
+
+ 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
+
+ https://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.
+
+----
+
diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt
index e5966de..8ccbcab 100644
--- a/Documentation/licenses.txt
+++ b/Documentation/licenses.txt
@@ -42,6 +42,7 @@
[[Apache2_0]]
Apache2.0
+* auto:auto-factory
* auto:auto-value
* auto:auto-value-annotations
* auto:auto-value-gson
@@ -56,6 +57,7 @@
* dropwizard:dropwizard-core
* errorprone:annotations
* flogger:api
+* fonts:material-icons
* fonts:robotofonts
* guice:guice
* guice:guice-assistedinject
@@ -3306,6 +3308,7 @@
* @polymer/iron-resizable-behavior
* @polymer/iron-selector
* @polymer/iron-validatable-behavior
+* @polymer/marked-element
* @polymer/neon-animation
* @polymer/paper-behaviors
* @polymer/paper-button
@@ -4207,6 +4210,60 @@
----
+[[marked]]
+marked
+
+* marked
+
+[[marked_license]]
+----
+# License information
+
+## Contribution License Agreement
+
+If you contribute code to this project, you are implicitly allowing your code
+to be distributed under the MIT license. You are also implicitly verifying that
+all code is your original work. `</legalese>`
+
+## Marked
+
+Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## Markdown
+
+Copyright © 2004, John Gruber
+http://daringfireball.net/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name “Markdown” nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
+
+----
+
+
[[page]]
page
@@ -4514,6 +4571,219 @@
----
+[[safevalues]]
+safevalues
+
+* safevalues
+
+[[safevalues_license]]
+----
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
+----
+
+
[[tslib]]
tslib
@@ -4537,6 +4807,219 @@
----
+[[web-vitals]]
+web-vitals
+
+* web-vitals
+
+[[web-vitals_license]]
+----
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2020 Google LLC
+
+ 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
+
+ https://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.
+
+----
+
+
GERRIT
------
Part of link:index.html[Gerrit Code Review]
diff --git a/Documentation/linux-quickstart.txt b/Documentation/linux-quickstart.txt
index c45de05..13873ed 100644
--- a/Documentation/linux-quickstart.txt
+++ b/Documentation/linux-quickstart.txt
@@ -29,10 +29,10 @@
. Download the desired Gerrit archive.
To view previous archives, see
-link:https://gerrit-releases.storage.googleapis.com/index.html[Gerrit Code Review: Releases,role=external,window=_blank]. The steps below install Gerrit 3.1.3:
+link:https://gerrit-releases.storage.googleapis.com/index.html[Gerrit Code Review: Releases,role=external,window=_blank]. The steps below install Gerrit 3.5.1:
....
-wget https://gerrit-releases.storage.googleapis.com/gerrit-3.1.3.war
+wget https://gerrit-releases.storage.googleapis.com/gerrit-3.5.1.war
....
NOTE: To build and install Gerrit from the source files, see
diff --git a/Documentation/metrics.txt b/Documentation/metrics.txt
index 2da0412..175488c 100644
--- a/Documentation/metrics.txt
+++ b/Documentation/metrics.txt
@@ -457,6 +457,15 @@
=== Group
* `group/guess_relevant_groups_latency`: Latency for guessing relevant groups.
+* `group/handles_count`: Number of calls to GroupBackend.handles.
+* `group/get_count`: Number of calls to GroupBackend.get.
+* `group/suggest_count`: Number of calls to GroupBackend.suggest.
+* `group/contains_count`: Number of calls to GroupMemberships.contains.
+* `group/contains_any_of_count`: Number of calls to
+ GroupMemberships.containsAnyOf.
+* `group/intersection_count`: Number of calls to GroupMemberships.intersection.
+* `group/known_groups_count`: Number of calls to GroupMemberships.getKnownGroups.
+
=== Replication Plugin
diff --git a/Documentation/pg-plugin-dev.txt b/Documentation/pg-plugin-dev.txt
index 381c3e1..61944b6 100644
--- a/Documentation/pg-plugin-dev.txt
+++ b/Documentation/pg-plugin-dev.txt
@@ -128,16 +128,18 @@
Just add code like this to your JavaScript plugin:
``` js
- const styleEl = document.createElement('style');
- styleEl.innerHTML = `
- html {
- --header-background-color: #c3d9ff;
- }
- html.darkTheme {
- --header-background-color: #c3d9ff90;
- }
- `;
- document.head.appendChild(styleEl);
+Gerrit.install(plugin => {
+ const styleEl = document.createElement('style');
+ styleEl.innerHTML = `
+ html {
+ --header-background-color: #c3d9ff;
+ }
+ html.darkTheme {
+ --header-background-color: #c3d9ff90;
+ }
+ `;
+ document.head.appendChild(styleEl);
+});
```
[[high-level-api-concepts]]
diff --git a/Documentation/pg-plugin-endpoints.txt b/Documentation/pg-plugin-endpoints.txt
index f2a72f1..41f544d 100644
--- a/Documentation/pg-plugin-endpoints.txt
+++ b/Documentation/pg-plugin-endpoints.txt
@@ -141,6 +141,11 @@
=== header-title
This endpoint wraps the title-text in the application header.
+=== cherrypick-main
+This endpoint is located in the cherrypick dialog. It has two slots `top`
+and `bottom` and `changes` as a parameter with the list of changes (or
+just the one change) to be cherrypicked.
+
=== confirm-revert-change
This endpoint is inside the confirm revert dialog. By default it displays a
generic confirmation message regarding reverting the change. Plugins may add
diff --git a/Documentation/pgm-daemon.txt b/Documentation/pgm-daemon.txt
index 586f685..560fb92 100644
--- a/Documentation/pgm-daemon.txt
+++ b/Documentation/pgm-daemon.txt
@@ -10,6 +10,10 @@
-d <SITE_PATH>
[--enable-httpd | --disable-httpd]
[--enable-sshd | --disable-sshd]
+ [--debug]
+ [--debug-port]
+ [--debug_address]
+ [--suspend]
[--console-log]
[--replica]
[--headless]
@@ -39,6 +43,17 @@
Enable (or disable) the internal SSH daemon, answering SSH
clients and remotely executed commands. Enabled by default.
+--debug::
+ Start JVM in debug mode.
+
+--debug-port::
+--debug_address:
+ Specify which JVM debug port/address to use. The default debug address is 8000.
+
+--suspend::
+ Start JVM debug in suspended mode. The JVM will await for a debugger
+ to attach before proceeding with the start.
+
--replica::
Run in replica mode, permitting only read operations
by clients. Commands which modify state such as
diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index ae0c0a6..7e06e4a 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -1284,7 +1284,7 @@
)]}'
{
"changes_per_page": 25,
- "theme": "LIGHT",
+ "theme": "AUTO",
"date_format": "STD",
"time_format": "HHMM_12",
"diff_view": "SIDE_BY_SIDE",
@@ -1292,6 +1292,7 @@
"mute_common_path_prefixes": true,
"publish_comments_on_push": true,
"work_in_progress_by_default": true,
+ "allow_browser_notifications": true,
"default_base_for_merges": "FIRST_PARENT",
"my": [
{
@@ -1344,6 +1345,7 @@
"size_bar_in_change_table": true,
"disable_keyboard_shortcuts": true,
"disable_token_highlighting": true,
+ "allow_browser_notifications": false,
"diff_view": "SIDE_BY_SIDE",
"mute_common_path_prefixes": true,
"my": [
@@ -2658,7 +2660,7 @@
Allowed values are `10`, `25`, `50`, `100`.
|`theme` ||
Which theme to use.
-Allowed values are `DARK` or `LIGHT`.
+Allowed values are `AUTO` or `DARK` or `LIGHT`.
|`expand_inline_diffs` |not set if `false`|
Whether to expand diffs inline instead of opening as separate page
(Gerrit web app UI only).
@@ -2686,6 +2688,8 @@
|`signed_off_by` |not set if `false`|
Whether to insert Signed-off-by footer in changes created with the
inline edit feature.
+|`allow_browser_notifications` |not set if `false`|
+Whether to prompt user to enable browser notification in browser.
|`my` ||
The menu items of the `MY` top menu as a list of
link:rest-api-config.html#top-menu-item-info[TopMenuItemInfo] entities.
@@ -2729,7 +2733,7 @@
Allowed values are `10`, `25`, `50`, `100`.
|`theme` |optional|
Which theme to use.
-Allowed values are `DARK` or `LIGHT`.
+Allowed values are `AUTO` or `DARK` or `LIGHT`.
|`expand_inline_diffs` |not set if `false`|
Whether to expand diffs inline instead of opening as separate page
(Gerrit web app UI only).
@@ -2755,6 +2759,8 @@
|`signed_off_by` |optional|
Whether to insert Signed-off-by footer in changes created with the
inline edit feature.
+|`allow_browser_notifications` |not set if `false`|
+Whether to prompt user to enable browser notification in browser.
|`my` |optional|
The menu items of the `MY` top menu as a list of
link:rest-api-config.html#top-menu-item-info[TopMenuItemInfo] entities.
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index f270ac5..ba9c884 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -2579,35 +2579,6 @@
}
----
-[[ignore]]
-=== Ignore
---
-'PUT /changes/link:#change-id[\{change-id\}]/ignore'
---
-
-Marks a change as ignored. The change will not be shown in the incoming
-reviews dashboard, and email notifications will be suppressed. Ignoring
-a change does not cause the change's "updated" timestamp to be modified,
-and the owner is not notified.
-
-.Request
-----
- PUT /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/ignore HTTP/1.0
-----
-
-[[unignore]]
-=== Unignore
---
-'PUT /changes/link:#change-id[\{change-id\}]/unignore'
---
-
-Un-marks a change as ignored.
-
-.Request
-----
- PUT /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/unignore HTTP/1.0
-----
-
[[get-hashtags]]
=== Get Hashtags
--
@@ -2825,8 +2796,18 @@
--
Tests a submit requirement and returns the result as a
-link:#submit-requirement-result-info[SubmitRequirementResultInfo]. The request
-body must contain a link:#submit-requirement-input[SubmitRequirementInput].
+link:#submit-requirement-result-info[SubmitRequirementResultInfo].
+
+The submit requirement can be specified in one of the following ways:
+
+ * In the request body as a link:#submit-requirement-input[SubmitRequirementInput].
+ * By passing the two request parameters `sr-name` and
+ `refs-config-change-id`. The submit requirement will then be loaded from
+ the project config pointed to by the latest patchset of this change ID.
+ The `sr-name` should point to an existing submit-requirement and the
+ `refs-config-change-id` must be a valid change identifier for a change in the
+ refs/meta/config branch, otherwise the request would fail with
+ `400 Bad Request`.
Note that this endpoint does not modify the change resource.
@@ -4047,6 +4028,16 @@
Retrieves related changes of a revision. Related changes are changes that either
depend on, or are dependencies of the revision.
+Additional fields can be obtained by adding `o` parameters. Since these may slow
+down processing they are disabled by default. Currently a single parameter is
+supported:
+
+[[get-related-changes-submittable]]
+--
+* `SUBMITTABLE`: Compute the `submittable` field in the returned
+ link:#related-change-and-commit-info[RelatedChangeAndCommitInfo] entities.
+--
+
.Request
----
GET /changes/gerrit~master~I5e4fc08ce34d33c090c9e0bf320de1b17309f774/revisions/b1cb4caa6be46d12b94c25aa68aebabcbb3f53fe/related HTTP/1.0
@@ -5306,8 +5297,8 @@
}
----
-[[apply-fix]]
-=== Apply Fix
+[[apply-stored-fix]]
+=== Apply Stored Fix
--
'POST /changes/<<change-id,\{change-id\}>>/revisions/<<revision-id,\{revision-id\}>>/fixes/<<fix-id,\{fix-id\}>>/apply'
--
@@ -5374,6 +5365,101 @@
The existing change edit could not be merged with another tree.
----
+[[apply-provided-fix]]
+==== Apply Provided Fix
+--
+'POST /changes/<<change-id,\{change-id\}>>/revisions/<<revision-id,\{revision-id\}>>/fix:apply'
+--
+Applies a list of <<fix-replacement-info,FixReplacementInfo>> loaded from the
+<<apply-provided-fix-input,ApplyProvidedFixInput>> entity. The fixes are passed as part of the request body. The
+application of the fixes creates a new change edit. `Apply Provided Fix` can only be applied on the current
+patchset.
+
+.Request
+----
+ POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/674ac754f91e64a0efb8087e59a176484bd534d1/fix:apply HTTP/1.0
+ Content-Type: application/json; charset=UTF-8
+
+ {
+ "fix_replacement_infos": [
+ {
+ "path": "abcd.txt",
+ "range": {
+ "start_line": 2,
+ "start_character": 2,
+ "end_line": 2,
+ "end_character": 5
+ },
+ "replacement": "abcdefg"
+ }
+ ]
+ }
+----
+
+If the `ApplyProvidedFixInput` was successfully applied, an link:#edit-info[EditInfo] describing the
+resulting change edit is returned.
+
+.Response
+----
+ HTTP/1.1 200 OK
+ Content-Disposition: attachment
+ Content-Type: application/json; charset=UTF-8
+
+ )]}'
+ {
+ "commit": {
+ "commit": "bd43e48c33d2b1a03485040eba38cefc505f7997",
+ "parents": [
+ {
+ "commit": "9825962f8ab6da89afebad3f5034db05fb4b7560"
+ }
+ ],
+ "author": {
+ "name": "John Doe",
+ "email": "john.doe@example.com",
+ "date": "2022-05-07 15:21:27.000000000",
+ "tz": 120
+ },
+ "committer": {
+ "name": "Jane Doe",
+ "email": "jane.doe@example.com",
+ "date": "2022-05-07 15:35:43.000000000",
+ "tz": 120
+ },
+ "subject": "Implement feature X",
+ "message": "Implement feature X\n\nWith this feature ..."
+ },
+ "base_patch_set_number": 1,
+ "base_revision": "86d87686ce0ef7f7c536bfc7e9a66f5a6fa5d658",
+ "ref": "refs/users/01/1000001/edit-1/1"
+ }
+----
+
+If the application failed due to presence of an existing change edit,
+the response "`400 Bad Request`" including an error message in the response body
+is returned.
+
+.Response
+----
+ HTTP/1.1 400 Bad Request
+ Content-Disposition: attachment
+ Content-Type: text/plain; charset=UTF-8
+
+ Change edit already exists. A new change edit can't be created
+----
+
+If the application failed due to application on a previous patch set, the response
+"`409 Conflict`" including an error message in the response body is returned.
+
+.Response
+----
+ HTTP/1.1 409 Conflict
+ Content-Disposition: attachment
+ Content-Type: text/plain; charset=UTF-8
+
+ A change edit may only be created for the current patch set 1,2 (and not for 1,1)
+----
+
[[list-files]]
=== List Files
--
@@ -5730,8 +5816,8 @@
differences are reported in the result. Valid values are `IGNORE_NONE`,
`IGNORE_TRAILING`, `IGNORE_LEADING_AND_TRAILING` or `IGNORE_ALL`.
-[[preview-fix]]
-=== Preview fix
+[[preview-stored-fix]]
+=== Preview Stored Fix
--
'GET /changes/<<change-id,\{change-id\}>>/revisions/<<revision-id,\{revision-id\}>>/fixes/<<fix-id,\{fix-id\}>>/preview'
--
@@ -5741,6 +5827,102 @@
Each link:#diff-info[DiffInfo] is the differences between the patch set indicated by revision-id and a virtual patch set with the applied fix.
+[[preview-provided-fix]]
+=== Preview Provided fix
+--
+'POST /changes/<<change-id,\{change-id\}>>/revisions/<<revision-id,\{revision-id\}>>/fix:preview'
+--
+
+Gets the diffs of all files for a list of <<fix-replacement-info,FixReplacementInfo>> loaded from
+the <<apply-provided-fix-input,ApplyProvidedFixInput>> entity. The fixes are passed as part of the
+request body.
+As response, a map of link:#diff-info[DiffInfo] is returned that describes the diffs.
+
+Each link:#diff-info[DiffInfo] is the differences between the patch set indicated by revision-id
+and a virtual patch set with the applied fix. No content on the server will be modified as part of this request.
+
+.Request
+----
+ POST /changes/myProject~master~Id6f0b9d946791f8aba90ace53074eda565983452/revisions/1/fix:preview HTTP/1.0
+ Content-Type: application/json; charset=UTF-8
+
+ {
+ "fix_replacement_infos": [
+ {
+ "path": "abcd.txt",
+ "range": {
+ "start_line": 2,
+ "start_character": 2,
+ "end_line": 2,
+ "end_character": 5
+ },
+ "replacement": "abcdefg"
+ }
+ ]
+ }
+----
+
+If the `Preview Provided Fix` operation was successful, a link:#diff-info[DiffInfo] previewing the
+change is returned.
+
+.Response
+----
+ HTTP/1.1 200 OK
+ Content-Disposition: attachment
+ Content-Type: application/json; charset=UTF-8
+
+ )]}'
+ {
+ "abcd.txt": {
+ "meta_a": {
+ "name": "abcd.txt",
+ "content_type": "text/plain",
+ "lines": 3
+ },
+ "meta_b": {
+ "name": "abcd.txt",
+ "content_type": "text/plain",
+ "lines": 3
+ },
+ "intraline_status": "OK",
+ "change_type": "MODIFIED",
+ "content": [
+ {
+ "ab": [
+ "ABCDEFGHI"
+ ]
+ },
+ {
+ "a": [
+ "JKLMNOPQR"
+ ],
+ "b": [
+ "JKabcdefgOPQR"
+ ],
+ "edit_a": [
+ [
+ 2,
+ 3
+ ]
+ ],
+ "edit_b": [
+ [
+ 2,
+ 7
+ ]
+ ]
+ },
+ {
+ "ab": [
+ ""
+ ]
+ }
+ ]
+ }
+ }
+----
+
+
[[get-blame]]
=== Get Blame
--
@@ -6650,7 +6832,8 @@
by one of the following REST endpoints: link:#create-change[Create
Change], link:#create-merge-patch-set-for-change[Create Merge Patch Set
For Change], link:#cherry-pick[Cherry Pick Revision],
-link:rest-api-project.html#cherry-pick-commit[Cherry Pick Commit]
+link:rest-api-project.html#cherry-pick-commit[Cherry Pick Commit],
+link:#rebase-change[Rebase Change]
|==================================
[[change-input]]
@@ -7080,6 +7263,9 @@
|`ignore_automatic_attention_set_rules`|optional|
If set to true, ignore all automatic attention set rules described in the
link:#attention-set[attention set]. When not set, the default is false.
+|`reason` |optional|
+The reason why this vote is deleted. Will +
+go into the change message.
|=============================
[[description-input]]
@@ -7207,6 +7393,16 @@
Whether the web link should be shown on the unified diff screen.
|=======================
+[[apply-provided-fix-input]]
+=== ApplyProvidedFixInput
+The `ApplyProvidedFixInput` entity contains the fixes to be applied on a review.
+
+[options="header",cols="1,6"]
+|=======================
+|Field Name |Description
+|`fix_replacement_infos` |A list of <<fix-replacement-info,FixReplacementInfo>>.
+|=======================
+
[[edit-file-info]]
=== EditFileInfo
The `EditFileInfo` entity contains additional information
@@ -7276,12 +7472,12 @@
Number of inserted lines. +
Not set for binary files or if no lines were inserted. +
An empty last line is not included in the count and hence this number can
-differ by one from details provided in <<#diff-info,DiffInfo>>.
+differ by one from details provided in <<diff-info,DiffInfo>>.
|`lines_deleted` |optional|
Number of deleted lines. +
Not set for binary files or if no lines were deleted. +
An empty last line is not included in the count and hence this number can
-differ by one from details provided in <<#diff-info,DiffInfo>>.
+differ by one from details provided in <<diff-info,DiffInfo>>.
|`size_delta` ||
Number of bytes by which the file size increased/decreased.
|`size` ||
@@ -7704,6 +7900,9 @@
|`_current_revision_number`|optional|The current revision number.
|`status` |optional|The status of the change. The status of
the change is one of (`NEW`, `MERGED`, `ABANDONED`).
+|`submittable` |optional|Boolean indicating whether the change is
+submittable. +
+Only populated if link:#get-related-changes-submittable[requested].
|===========================
[[related-changes-info]]
@@ -7754,30 +7953,38 @@
The `RevertInput` entity contains information for reverting a change.
[options="header",cols="1,^1,5"]
-|=============================
-|Field Name ||Description
-|`message` |optional|
+|=================================
+|Field Name ||Description
+|`message` |optional|
Message to be added as review comment to the change when reverting the
change.
-|`notify` |optional|
+|`notify` |optional|
Notify handling that defines to whom email notifications should be sent
for reverting the change. +
Allowed values are `NONE`, `OWNER`, `OWNER_REVIEWERS` and `ALL`. +
If not set, the default is `ALL`.
-|`notify_details`|optional|
+|`notify_details` |optional|
Additional information about whom to notify about the revert as a map
of link:user-notify.html#recipient-types[recipient type] to
link:#notify-info[NotifyInfo] entity.
-|`topic` |optional|
+|`topic` |optional|
Name of the topic for the revert change. If not set, the default for Revert
endpoint is the topic of the change being reverted, and the default for the
RevertSubmission endpoint is `revert-{submission_id}-{timestamp.now}`.
Topic can't contain quotation marks.
-|`work_in_progress` |optional|
+|`work_in_progress` |optional|
When present, change is marked as Work In Progress. The `notify` input is
used if it's present, otherwise it will be overridden to `OWNER`. +
If not set, the default is false.
-|=============================
+|`validation_options`|optional|
+Map with key-value pairs that are forwarded as options to the commit validation
+listeners (e.g. can be used to skip certain validations). Which validation
+options are supported depends on the installed commit validation listeners.
+Gerrit core doesn't support any validation options, but commit validation
+listeners that are implemented in plugins may. Please refer to the
+documentation of the installed plugins to learn whether they support validation
+options. Unknown validation options are silently ignored.
+|=================================
[[revert-submission-info]]
=== RevertSubmissionInfo
@@ -7923,6 +8130,8 @@
|`ready` |optional|
If true, the change was moved from WIP to ready for review as a result of this
action. Not set if false.
+|`error` |optional|
+Error message for non-200 responses.
|============================
[[reviewer-info]]
@@ -8251,6 +8460,13 @@
`branch:refs/heads/foo and label:verified=+1`.
|`fulfilled`||
True if the submit requirement is fulfilled for the change.
+|`status`||
+A string containing the status of evaluating the expression which can be one
+of the following: +
+ * `PASS` - expression was evaluated and result is true. +
+ * `FAIL` - expression was evaluated and result is false. +
+ * `ERROR` - an error occurred while evaluating the expression. +
+ * `NOT_EVALUATED` - expression was not evaluated.
|`passing_atoms`|optional|
A list of passing atoms as strings. For the above expression,
`passing_atoms` can contain ["branch:refs/heads/foo"] if the branch predicate is
@@ -8315,16 +8531,17 @@
submit requirement did not define an applicability expression.
Note that fields `expression`, `passing_atoms` and `failing_atoms` are always
omitted for the `applicability_expression_result`.
-|`submittability_expression_result`|optional|
+|`submittability_expression_result`||
A link:#submit-requirement-expression-info[SubmitRequirementExpressionInfo]
containing the result of evaluating the submittability expression. +
-If the submit requirement does not apply, the expression is not evaluated and
-the field is not set.
+If the submit requirement does not apply, the `status` field of the result
+will be set to `NOT_EVALUATED`.
|`override_expression_result`|optional|
A link:#submit-requirement-expression-info[SubmitRequirementExpressionInfo]
containing the result of evaluating the override expression. +
-Not set if the submit requirement did not define an override expression or
-if it does not apply.
+Not set if the submit requirement did not define an override expression. If the
+submit requirement does not apply, the `status` field of the result will be set
+to `NOT_EVALUATED`.
|===========================
[[submitted-together-info]]
diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index 90e1884..45de1b1 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1380,7 +1380,14 @@
POST /config/server/index.changes HTTP/1.0
Content-Type: application/json; charset=UTF-8
- {changes: ["foo~101", "bar~202"]}
+ {
+ "changes": [
+ "foo~101",
+ "bar~202",
+ "303"
+ ],
+ "delete_missing": "true"
+ }
----
.Response
@@ -1389,6 +1396,9 @@
Content-Disposition: attachment
----
+When `delete_missing` is set to `true` changes to be reindexed which are missing in NoteDb
+will be deleted in the index.
+
[[ids]]
== IDs
@@ -1878,6 +1888,10 @@
|Field Name ||Description
|`changes` ||
List of link:rest-api-changes.html#change-id[change-ids]
+|`delete_missing` |optional|
+Delete changes which are missing in NoteDb from the index. This can be used
+to get rid of stale index entries. Possible values are `true` and `false`.
+By default set to `false`.
|================================
[[jvm-summary-info]]
diff --git a/Documentation/rest-api-projects.txt b/Documentation/rest-api-projects.txt
index 413923f..efc746a 100644
--- a/Documentation/rest-api-projects.txt
+++ b/Documentation/rest-api-projects.txt
@@ -402,12 +402,12 @@
Content-Type: application/json; charset=UTF-8
)]}'
- {
- "test": {
+ [
+ {
"id": "test",
"description": "\u003chtml\u003e is escaped"
}
- }
+ ]
----
[[project-query-limit]]
@@ -3079,9 +3079,7 @@
},
"default_value": 0,
"can_override": true,
- "copy_min_score": true,
- "copy_all_scores_if_no_change": true,
- "copy_all_scores_on_trivial_rebase": true,
+ "copy_condition": "changekind:NO_CHANGE OR changekind:TRIVIAL_REBASE or is:MIN",
"allow_post_submit": true
}
]
@@ -3126,9 +3124,7 @@
},
"default_value": 0,
"can_override": true,
- "copy_min_score": true,
- "copy_all_scores_if_no_change": true,
- "copy_all_scores_on_trivial_rebase": true,
+ "copy_condition": "changekind:NO_CHANGE OR changekind:TRIVIAL_REBASE or is:MIN",
"allow_post_submit": true
},
{
@@ -3144,7 +3140,7 @@
},
"default_value": 0,
"can_override": true,
- "copy_any_score": true,
+ "copy_condition": "is:ANY",
"allow_post_submit": true
}
]
@@ -3189,9 +3185,7 @@
},
"default_value": 0,
"can_override": true,
- "copy_min_score": true,
- "copy_all_scores_if_no_change": true,
- "copy_all_scores_on_trivial_rebase": true,
+ "copy_condition": "changekind:NO_CHANGE OR changekind:TRIVIAL_REBASE OR is:MIN",
"allow_post_submit": true
}
----
@@ -3250,7 +3244,7 @@
},
"default_value": 0,
"can_override": true,
- "copy_all_scores_if_no_change": true,
+ "copy_condition": "changekind:NO_CHANGE",
"allow_post_submit": true
}
----
@@ -3302,9 +3296,7 @@
},
"default_value": 0,
"can_override": true,
- "copy_min_score": true,
- "copy_all_scores_if_no_change": true,
- "copy_all_scores_on_trivial_rebase": true,
+ "copy_condition": "changekind:NO_CHANGE OR changekind:TRIVIAL_REBASE OR is:MIN",
"allow_post_submit": true,
"ignore_self_approval": true
}
@@ -3388,7 +3380,7 @@
"function": "MaxWithBlock"
},
"Baz-Review": {
- "copy_min_score": true
+ "copy_condition": "is:MIN"
}
}
}
@@ -3401,6 +3393,198 @@
HTTP/1.1 200 OK
----
+[[submit-requirement-endpoints]]
+== Submit Requirement Endpoints
+
+[[create-submit-requirement]]
+=== Create Submit Requirement
+
+--
+'PUT /projects/link:#project-name[\{project-name\}]/submit_requirements/link:#submit-requirement-name[\{submit-requirement-name\}]'
+--
+
+Creates a new submit requirement definition in this project.
+
+The calling user must have write access to the `refs/meta/config` branch of the
+project.
+
+If a submit requirement with this name is already defined in this project, this
+submit requirement definition is updated
+(see link:#update-submit-requirement[Update Submit Requirement]).
+
+The submit requirement data must be provided in the request body as
+link:#submit-requirement-input[SubmitRequirementInput].
+
+.Request
+----
+ PUT /projects/My-Project/submit_requirements/Code-Review HTTP/1.0
+ Content-Type: application/json; charset=UTF-8
+
+ {
+ "name": "Code-Review",
+ "description": "At least one maximum vote for the Code-Review label is required",
+ "submittability_expression": "label:Code-Review=+2"
+ }
+----
+
+As response a link:#submit-requirement-info[SubmitRequirementInfo] entity is
+returned that describes the created submit requirement.
+
+.Response
+----
+ HTTP/1.1 200 OK
+ Content-Disposition: attachment
+ Content-Type: application/json; charset=UTF-8
+
+ )]}'
+ {
+ "name": "Code-Review",
+ "description": "At least one maximum vote for the Code-Review label is required",
+ "submittability_expression": "label:Code-Review=+2",
+ "allow_override_in_child_projects": false
+ }
+----
+
+[[update-submit-requirement]]
+=== Update Submit Requirement
+
+--
+'PUT /projects/link:#project-name[\{project-name\}]/submit_requirements/link:#submit-requirement-name[\{submit-requirement-name\}]'
+--
+
+Updates the definition of a submit requirement that is defined in this project.
+
+The calling user must have write access to the `refs/meta/config` branch of the
+project.
+
+The new submit requirement will overwrite the existing submit requirement.
+That is, unspecified attributes will be set to their defaults.
+
+.Request
+----
+ PUT /projects/My-Project/submit_requirements/Code-Review HTTP/1.0
+ Content-Type: application/json; charset=UTF-8
+
+ {
+ "name": "Code-Review",
+ "description": "At least one maximum vote for the Code-Review label is required",
+ "submittability_expression": "label:Code-Review=+2"
+ }
+----
+
+As response a link:#submit-requirement-info[SubmitRequirementInfo] entity is
+returned that describes the created submit requirement.
+
+.Response
+----
+ HTTP/1.1 200 OK
+ Content-Disposition: attachment
+ Content-Type: application/json; charset=UTF-8
+
+ )]}'
+ {
+ "name": "Code-Review",
+ "description": "At least one maximum vote for the Code-Review label is required",
+ "submittability_expression": "label:Code-Review=+2",
+ "allow_override_in_child_projects": false
+ }
+----
+
+[[get-submit-requirement]]
+=== Get Submit Requirement
+--
+'GET /projects/link:#project-name[\{project-name\}]/submit_requirements/link:#submit-requirement-name[\{submit-requirement-name\}]'
+--
+
+Retrieves the definition of a submit requirement that is defined in this project.
+
+The calling user must have read access to the `refs/meta/config` branch of the
+project.
+
+.Request
+----
+ GET /projects/All-Projects/submit-requirement/Code-Review HTTP/1.0
+----
+
+.Response
+----
+ HTTP/1.1 200 OK
+ Content-Disposition: attachment
+ Content-Type: application/json; charset=UTF-8
+
+ )]}'
+ {
+ "name": "Code-Review",
+ "description": "At least one maximum vote for the Code-Review label is required",
+ "submittability_expression": "label:Code-Review=+2",
+ "allow_override_in_child_projects": false
+ }
+----
+
+[[list-submit-requirements]]
+=== List Submit Requirements
+--
+'GET /projects/link:#project-name[\{project-name\}]/submit_requirements'
+--
+
+Retrieves a list of all submit requirements for this project. The `inherited`
+parameter can be supplied to also list submit requirements from parent projects.
+
+The calling user must have read access to the `refs/meta/config` branch of the
+project. If the `inherited` option is used, the caller must have read access to
+the `refs/meta/config` branch of all parent projects as well.
+
+As response a list of link:#submit-requirement-info[SubmitRequirementInfo]
+entities is returned.
+
+.Request
+----
+ GET /projects/All-Projects/submit-requirements HTTP/1.0
+----
+
+.Response
+----
+ HTTP/1.1 200 OK
+ Content-Disposition: attachment
+ Content-Type: application/json; charset=UTF-8
+
+ )]}'
+ [
+ {
+ "name": "Code-Review",
+ "description": "At least one maximum vote for the Code-Review label is required",
+ "submittability_expression": "label:Code-Review=+2",
+ "allow_override_in_child_projects": false
+ }
+ ]
+----
+
+[[delete-submit-requirement]]
+=== Delete Submit Requirement
+--
+'DELETE /projects/link:#project-name[\{project-name\}]/submit_requirements/link:#submit-requirement-name[\{submit-requirement-name\}]'
+--
+
+Deletes the definition of a submit requirement that is defined in this project.
+
+The calling user must have write access to the `refs/meta/config` branch of the
+project. The request would fail with `404 Not Found` if there is no submit
+requirement with this name for this project.
+
+No request body is needed.
+
+.Request
+----
+ DELETE /projects/My-Project/submit_requirements/Foo-Review HTTP/1.0
+ Content-Type: application/json; charset=UTF-8
+----
+
+If a submit requirement was deleted the response is "`204 No Content`".
+
+.Response
+----
+ HTTP/1.1 204 No Content
+----
[[ids]]
== IDs
@@ -3429,6 +3613,11 @@
=== \{label-name\}
The name of a review label.
+[[submit-requirement-name]]
+=== \{submit-requirement-name\}
+The name of a submit requirement.
+
+
[[project-name]]
=== \{project-name\}
The name of the project.
@@ -3609,6 +3798,9 @@
|`link` | |The URL to direct the user to whenever the
regular expression is matched, as documented in
link:config-gerrit.html#commentlink.name.link[commentlink.name.link].
+|`prefix` |optional|Text inserted before the link.
+|`suffix` |optional|Text inserted after the link.
+|`text` |optional|Text of the link.
|`enabled` |optional|Whether the commentlink is enabled, as documented
in link:config-gerrit.html#commentlink.name.enabled[
commentlink.name.enabled]. If not set the commentlink is enabled.
@@ -3628,6 +3820,9 @@
|`link` | |The URL to direct the user to whenever the
regular expression is matched, as documented in
link:config-gerrit.html#commentlink.name.link[commentlink.name.link].
+|`prefix` |optional|Text inserted before the link.
+|`suffix` |optional|Text inserted after the link.
+|`text` |optional|Text of the link.
|`enabled` |optional|Whether the commentlink is enabled, as documented
in link:config-gerrit.html#commentlink.name.enabled[
commentlink.name.enabled]. If not set the commentlink is enabled.
@@ -4015,36 +4210,8 @@
|`can_override` |`false` if not set|
Whether this label can be link:config-labels.html#label_canOverride[overridden]
by child projects.
-|`copy_any_score`|`false` if not set|
-*DEPRECATED* Whether link:config-labels.html#label_copyAnyScore[copyAnyScore]
-is set on the label.
|`copy_condition`|optional|
See link:config-labels.html#label_copyCondition[copyCondition].
-|`copy_min_score`|`false` if not set|
-*DEPRECATED* Whether link:config-labels.html#label_copyMinScore[copyMinScore]
-is set on the label.
-|`copy_max_score`|`false` if not set|
-*DEPRECATED* Whether link:config-labels.html#label_copyMaxScore[copyMaxScore]
-is set on the label.
-|`copy_all_scores_if_no_change`|`false` if not set|
-*DEPRECATED* Whether link:config-labels.html#label_copyAllScoresIfNoChange[
-copyAllScoresIfNoChange] is set on the label.
-|`copy_all_scores_if_no_code_change`|`false` if not set|
-*DEPRECATED* Whether link:config-labels.html#label_copyAllScoresIfNoCodeChange[
-copyAllScoresIfNoCodeChange] is set on the label.
-|`copy_all_scores_on_trivial_rebase`|`false` if not set|
-*DEPRECATED* Whether link:config-labels.html#label_copyAllScoresOnTrivialRebase[
-copyAllScoresOnTrivialRebase] is set on the label.
-|`copy_all_scores_if_list_of_files_did_not_change`|`false` if not set|
-*DEPRECATED* Whether
-link:config-labels.html#label_copyAllScoresIfListOfFilesDidNotChange[
-copyAllScoresIfListOfFilesDidNotChange] is set on the label.
-|`copy_all_scores_on_merge_first_parent_update`|`false` if not set|
-*DEPRECATED* Whether
-link:config-labels.html#label_copyAllScoresOnMergeFirstParentUpdate[
-copyAllScoresOnMergeFirstParentUpdate] is set on the label.
-|`copy_values` |optional|
-List of values that should be copied forward when a new patch set is uploaded.
|`allow_post_submit`|`false` if not set|
Whether link:config-labels.html#label_allowPostSubmit[allowPostSubmit] is set
on the label.
@@ -4091,36 +4258,10 @@
|`can_override` |optional|
Whether this label can be link:config-labels.html#label_canOverride[overridden]
by child projects.
-|`copy_any_score`|optional|
-Whether link:config-labels.html#label_copyAnyScore[copyAnyScore] is set on the
-label.
|`copy_condition`|optional|
See link:config-labels.html#label_copyCondition[copyCondition].
|`unset_copy_condition`|optional|
If true, clears the value stored in `copy_condition`.
-|`copy_min_score`|optional|
-Whether link:config-labels.html#label_copyMinScore[copyMinScore] is set on the
-label.
-|`copy_max_score`|optional|
-Whether link:config-labels.html#label_copyMaxScore[copyMaxScore] is set on the
-label.
-|`copy_all_scores_if_no_change`|optional|
-Whether link:config-labels.html#label_copyAllScoresIfNoChange[
-copyAllScoresIfNoChange] is set on the label.
-|`copy_all_scores_if_no_code_change`|optional|
-Whether link:config-labels.html#label_copyAllScoresIfNoCodeChange[
-copyAllScoresIfNoCodeChange] is set on the label.
-|`copy_all_scores_on_trivial_rebase`|optional|
-Whether link:config-labels.html#label_copyAllScoresOnTrivialRebase[
-copyAllScoresOnTrivialRebase] is set on the label.
-|`copy_all_scores_if_list_of_files_did_not_change`|optional|
-Whether link:config-labels.html#label_copyAllScoresIfListOfFilesDidNotChange[
-copyAllScoresIfListOfFilesDidNotChange] is set on the label.
-|`copy_all_scores_on_merge_first_parent_update`|optional|
-Whether link:config-labels.html#label_copyAllScoresOnMergeFirstParentUpdate[
-copyAllScoresOnMergeFirstParentUpdate] is set on the label.
-|`copy_values` |optional|
-List of values that should be copied forward when a new patch set is uploaded.
|`allow_post_submit`|optional|
Whether link:config-labels.html#label_allowPostSubmit[allowPostSubmit] is set
on the label.
@@ -4374,6 +4515,57 @@
|`size_of_packed_objects` |Size of packed objects in bytes.
|======================================
+[[submit-requirement-info]]
+=== SubmitRequirementInfo
+The `SubmitRequirementInfo` entity describes a submit requirement.
+
+[options="header",cols="1,^1,5"]
+|===========================
+|Field Name ||Description
+|`name`||
+The submit requirement name.
+|`description`|optional|
+Description of the submit requirement.
+|`applicability_expression`|optional|
+Query expression that can be evaluated on any change. If evaluated to true on a
+change, the submit requirement is then applicable for this change.
+If not specified, the submit requirement is applicable for all changes.
+|`submittability_expression`||
+Query expression that can be evaluated on any change. If evaluated to true on a
+change, the submit requirement is fulfilled and not blocking change submission.
+|`override_expression`|optional|
+Query expression that can be evaluated on any change. If evaluated to true on a
+change, the submit requirement is overridden and not blocking change submission.
+|`allow_override_in_child_projects`||
+Whether this submit requirement can be overridden in child projects.
+|===========================
+
+[[submit-requirement-input]]
+=== SubmitRequirementInput
+The `SubmitRequirementInput` entity describes a submit requirement.
+
+[options="header",cols="1,^1,5"]
+|===========================
+|Field Name ||Description
+|`name`||
+The submit requirement name.
+|`description`|optional|
+Description of the submit requirement.
+|`applicability_expression`|optional|
+Query expression that can be evaluated on any change. If evaluated to true on a
+change, the submit requirement is then applicable for this change.
+If not specified, the submit requirement is applicable for all changes.
+|`submittability_expression`||
+Query expression that can be evaluated on any change. If evaluated to true on a
+change, the submit requirement is fulfilled and not blocking change submission.
+|`override_expression`|optional|
+Query expression that can be evaluated on any change. If evaluated to true on a
+change, the submit requirement is overridden and not blocking change submission.
+|`allow_override_in_child_projects`|optional|
+Whether this submit requirement can be overridden in child projects. Default is
+`false`.
+|===========================
+
[[submit-type-info]]
=== SubmitTypeInfo
Information about the link:config-project-config.html#submit-type[default submit
diff --git a/Documentation/user-attention-set.txt b/Documentation/user-attention-set.txt
index 512f784..0a7a77c 100644
--- a/Documentation/user-attention-set.txt
+++ b/Documentation/user-attention-set.txt
@@ -47,6 +47,9 @@
an unresolved comment.
* If another user removed a user's vote, the user with the deleted vote will be
added to the attention set.
+* If a vote becomes outdated by uploading a new patch set (vote is not sticky),
+ the user whose vote has been removed is added to the attention set, as they
+ need to re-review the change and vote newly.
* Only owner, uploader, reviewers and ccs can be in the attention set.
* The rules for service accounts are different, see link:#bots[Bots].
* Users are not added by automatic rules when the change is work in progress.
diff --git a/Documentation/user-notify.txt b/Documentation/user-notify.txt
index 932acab..de5ea57 100644
--- a/Documentation/user-notify.txt
+++ b/Documentation/user-notify.txt
@@ -18,8 +18,8 @@
[[user]]
== User Level Settings
-Individual users can configure email subscriptions by editing
-watched projects through Settings > Watched Projects with the web UI.
+Individual users can configure email subscriptions by editing their
+notifications in the Web UI under `Settings` > `Notifications`.
Specific projects may be watched, or the special project
`All-Projects` can be watched to watch all projects that
diff --git a/Documentation/user-search.txt b/Documentation/user-search.txt
index cc7d5d1..d09717de 100644
--- a/Documentation/user-search.txt
+++ b/Documentation/user-search.txt
@@ -8,16 +8,18 @@
query, execute it, and present the results.
[options="header"]
-|=================================================
-|Description | Default Query
-|All > Open | status:open '(or is:open)'
-|All > Merged | status:merged
-|All > Abandoned | status:abandoned
-|My > Watched Changes | is:watched is:open
-|My > Starred Changes | is:starred
-|My > Draft Comments | has:draft
-|Open changes in Foo | status:open project:Foo
-|=================================================
+|=======================================================
+|Description | Default Query
+|Changes > Open | status:open '(or is:open)'
+|Changes > Merged | status:merged
+|Changes > Abandoned | status:abandoned
+|Your > Watched Changes | is:watched is:open
+|Your > Starred Changes | is:starred
+|Your > Draft Comments | has:draft
+|Your > Edits | has:edit
+|Your > All Visible Changes | is:visible
+|Open changes in Foo | status:open project:Foo
+|=======================================================
== Basic Change Search
@@ -363,7 +365,7 @@
files, use `file:^.*\.java`.
+
The entire regular expression pattern, including the `^` character,
-should be double quoted. For example, to match all XML
+can be double quoted. For example, to match all XML
files named like 'name1.xml', 'name2.xml', and 'name3.xml' use
`file:"^name[1-3].xml"`.
+
@@ -371,8 +373,8 @@
+
*More examples:*
-* `-file:^path/.*` - changes that do not modify files from `path/`.
-* `file:{^~(path/.*)}` - changes that modify files not from `path/` (but may
+* `-path:^path/.*` - changes that do not modify files from `path/`.
+* `path:{^~(path/.*)}` - changes that modify files not from `path/` (but may
contain files from `path/`).
[[file]]
@@ -433,19 +435,6 @@
Matches any change that has a commit message with a footer where the footer
name is equal to 'FOOTERNAME'.The matching is done case-sensitive.
-[[star]]
-star:'LABEL'::
-+
-Matches any change that was starred by the current user with the label
-'LABEL'.
-+
-E.g. if changes that are not interesting are marked with an `ignore`
-star, they could be filtered out by '-star:ignore'.
-+
-'star:star' is the same as 'has:star' and 'is:starred'.
-
-Only "ignore" and "star" are supported labels.
-
[[has]]
has:draft::
+
@@ -454,8 +443,8 @@
[[has-star]]
has:star::
+
-Same as 'is:starred' and 'star:star', true if the change has been
-starred by the current user with the default label.
+Same as 'is:starred', true if the change has been starred by the current user
+with the default label.
has:edit::
+
@@ -558,11 +547,6 @@
link:config-gerrit.html#change.mergeabilityComputationBehavior[change.mergeabilityComputationBehavior]
for details.
-[[ignored]]
-is:ignored::
-+
-True if the change is ignored. Same as `star:ignore`.
-
[[private]]
is:private::
+
@@ -712,17 +696,20 @@
`-is:starred` is the exact opposite of `is:starred` and will
therefore return changes that are *not* starred by the current user.
-The operator `NOT` (in all caps) is a synonym.
+The operator `NOT` (in all caps) or `not` (all lower case) is a
+synonym.
=== AND
-The boolean operator `AND` (in all caps) can be used to join two
-other operators together. This results in a restriction of the
-results, returning only changes that match both operators.
+The boolean operator `AND` (in all caps) or `and` (all lower case)
+can be used to join two other operators together. This results in
+a restriction of the results, returning only changes that match both
+operators.
=== OR
-The boolean operator `OR` (in all caps) can be used to find changes
-that match either operator. This increases the number of results
-that are returned, as more changes are considered.
+The boolean operator `OR` (in all caps) or `or` (all lower case)
+can be used to find changes that match either operator. This
+increases the number of results that are returned, as more changes
+are considered.
[[labels]]
diff --git a/Documentation/user-upload.txt b/Documentation/user-upload.txt
index 2bfc62d..8c51207 100644
--- a/Documentation/user-upload.txt
+++ b/Documentation/user-upload.txt
@@ -340,7 +340,7 @@
To avoid confusion in parsing the git ref, at least the following characters
must be percent-encoded: " %^@.~-+_:/!". Note that some of the reserved
characters (like tilde) are not escaped in the standard URL encoding rules,
-so a language-provided function (e.g. encodeURIComponent(), in javascript)
+so a language-provided function (e.g. encodeURIComponent(), in JavaScript)
might not suffice. To be safest, you might consider percent-encoding all
non-alphanumeric characters (and all multibyte UTF-8 code points).
diff --git a/README.md b/README.md
index 8a4379b..4df9271 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@
On Debian/Ubuntu run:
- apt-get update & apt-get install gerrit=<version>-<release>
+ apt-get update && apt-get install gerrit=<version>-<release>
_NOTE: release is a counter that starts with 1 and indicates the number of packages that have
been released with the same version of the software._
diff --git a/WORKSPACE b/WORKSPACE
index fe6b94e..ca5942b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,29 +1,27 @@
-# npm packages are split into different node_modules directories based on their usage.
-# 1. /node_modules (referenced as @npm) - contains packages to run tests, check code, etc...
-# It is expected that @npm is used ONLY to run tools. No packages from @npm are used by
-# other code in gerrit.
-# 2. @tools_npm (tools/node_tools/node_modules) - the tools/node_tools folder contains self-written tools
-# which are run for building and/or testing. The @tools_npm directory contains all the packages needed to
-# run this tools.
-# 3. @ui_npm (polygerrit-ui/app/node_modules) - packages with source code which are necessary to run polygerrit
-# and to bundle it. Only code from these packages can be included in the final bundle for polygerrit.
-# @ui_npm folder must not have devDependencies. All dev dependencies must be placed in @ui_dev_npm
-# 4. @ui_dev_npm (polygerrit-ui/node_modules) - devDependencies for polygerrit. The packages from these
-# folder can be used for testing, but must not be included in the final bundle.
-# 5. @plugins_npm (plugins/node_modules) - plugin dependencies for polygerrit plugins.
-# The packages here are expected to be used in plugins.
-# Note: separation between @ui_npm and @ui_dev_npm is necessary because with bazel we can't generate
-# two managed directories from the same package.json. At the same time we want to avoid accidental
-# usages of code from devDependencies in polygerrit bundle.
+# npm packages are split into different node_modules directories based on their
+# usage.
+# 1. @npm (node_modules) - contains packages to run tests, check code, etc...
+# It is expected that @npm is used ONLY to run tools. No packages from @npm
+# are used by other code in gerrit.
+# 2. @tools_npm (tools/node_tools/node_modules) - the tools/node_tools folder
+# contains self-written tools which are run for building and/or testing. The
+# @tools_npm directory contains all the packages needed to run this tools.
+# 3. @ui_npm (polygerrit-ui/app/node_modules) - packages with source code which
+# are necessary to run polygerrit and to bundle it. Only code from these
+# packages can be included in the final bundle for polygerrit. @ui_npm folder
+# must not have devDependencies. All devDependencies must be placed in
+# @ui_dev_npm.
+# 4. @ui_dev_npm (polygerrit-ui/node_modules) - devDependencies for polygerrit.
+# The packages from these folder can be used for testing, but must not be
+# included in the final bundle.
+# 5. @plugins_npm (plugins/node_modules) - plugin dependencies for polygerrit
+# plugins. The packages here are expected to be used in plugins.
+# Note: separation between @ui_npm and @ui_dev_npm is necessary because with
+# rules_nodejs we can't generate two external repositories from the same
+# package.json. At the same time we want to avoid accidental usages of code
+# from devDependencies in polygerrit bundle.
workspace(
name = "gerrit",
- managed_directories = {
- "@npm": ["node_modules"],
- "@ui_npm": ["polygerrit-ui/app/node_modules"],
- "@ui_dev_npm": ["polygerrit-ui/node_modules"],
- "@tools_npm": ["tools/node_tools/node_modules"],
- "@plugins_npm": ["plugins/node_modules"],
- },
)
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
@@ -42,13 +40,60 @@
],
)
+# TODO: Remove this when java_tools v12.1 included in regular Bazel release
+# See https://github.com/bazelbuild/bazel/issues/17695
+http_archive(
+ name = "remote_java_tools",
+ sha256 = "0db35ec44745fd15b77d9df954e70a4fcf74554dd5bfe3f6e6cb6bbdc1f1c649",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools-v12.1.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools-v12.1.zip",
+ ],
+)
+
+http_archive(
+ name = "remote_java_tools_linux",
+ sha256 = "093ecac3b42fcbc3621d08edc3ae3c8b0bc2bf56a0d9a85ddcdb1e0bcf10cbc7",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_linux-v12.1.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_linux-v12.1.zip",
+ ],
+)
+
+http_archive(
+ name = "remote_java_tools_windows",
+ sha256 = "1df7cc7fac54f437f43c24c019462e13058f394fdba5a64f566b92e8af18d0cf",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_windows-v12.1.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_windows-v12.1.zip",
+ ],
+)
+
+http_archive(
+ name = "remote_java_tools_darwin_x86_64",
+ sha256 = "16ca145203a62a1fcd6ae50513c0935d938591cb309b9b1172e257c57873f60d",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_x86_64-v12.1.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_darwin_x86_64-v12.1.zip",
+ ],
+)
+
+http_archive(
+ name = "remote_java_tools_darwin_arm64",
+ sha256 = "1d8e575e558782c2ceec0940e424f0e2df56b0df3d7fae68333eaceef2c4e41c",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_arm64-v12.1.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_darwin_arm64-v12.1.zip",
+ ],
+)
+
http_archive(
name = "rbe_jdk11",
- sha256 = "5939e2a4e56d1fc53b6c44c6db97ee068c9f4bd18e86c762f6ab8b4fff5e294b",
- strip_prefix = "rbe_autoconfig-3.0.0",
+ sha256 = "dbcfd6f26589ef506b91fe03a12dc559ca9c84699e4cf6381150522287f0e6f6",
+ strip_prefix = "rbe_autoconfig-3.1.0",
urls = [
- "https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v3.0.0.tar.gz",
- "https://github.com/davido/rbe_autoconfig/archive/v3.0.0.tar.gz",
+ "https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v3.1.0.tar.gz",
+ "https://github.com/davido/rbe_autoconfig/archive/v3.1.0.tar.gz",
],
)
@@ -67,8 +112,8 @@
http_archive(
name = "build_bazel_rules_nodejs",
- sha256 = "c077680a307eb88f3e62b0b662c2e9c6315319385bc8c637a861ffdbed8ca247",
- urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.1.0/rules_nodejs-5.1.0.tar.gz"],
+ sha256 = "0fad45a9bda7dc1990c47b002fd64f55041ea751fafc00cd34efb96107675778",
+ urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz"],
)
load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
@@ -101,55 +146,6 @@
firefox = True,
)
-http_archive(
- name = "rules_pkg",
- sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
- "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
- ],
-)
-
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-
-rules_pkg_dependencies()
-
-# Golang support for PolyGerrit local dev server.
-http_archive(
- name = "io_bazel_rules_go",
- sha256 = "d6b2513456fe2229811da7eb67a444be7785f5323c6708b38d851d2b51e54d83",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
- "https://github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
- ],
-)
-
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-
-go_rules_dependencies()
-
-go_register_toolchains(version = "1.17.6")
-
-http_archive(
- name = "bazel_gazelle",
- sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
- "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
- ],
-)
-
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
-
-gazelle_dependencies()
-
-# Dependencies for PolyGerrit local dev server.
-go_repository(
- name = "com_github_howeyc_fsnotify",
- commit = "441bbc86b167f3c1f4786afae9931403b99fdacf",
- importpath = "github.com/howeyc/fsnotify",
-)
-
register_toolchains("//tools:error_prone_warnings_toolchain_java11_definition")
register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition")
@@ -187,8 +183,8 @@
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
node_repositories(
- node_version = "16.13.2",
- yarn_version = "1.22.17",
+ node_version = "16.15.0",
+ yarn_version = "1.22.18",
)
yarn_install(
diff --git a/antlr3/com/google/gerrit/index/query/Query.g b/antlr3/com/google/gerrit/index/query/Query.g
index 0994d9b..ea521f9 100644
--- a/antlr3/com/google/gerrit/index/query/Query.g
+++ b/antlr3/com/google/gerrit/index/query/Query.g
@@ -142,9 +142,9 @@
| EXACT_PHRASE
;
-AND: 'AND' ;
-OR: 'OR' ;
-NOT: 'NOT' ;
+AND: 'AND' | 'and';
+OR: 'OR' | 'or' ;
+NOT: 'NOT' | 'not' ;
COLON: ':' ;
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
index e26fc00..580ae81 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
@@ -108,7 +108,7 @@
val property = packageName + "." + term
var value = default
default match {
- case _: String | _: Double =>
+ case _: String | _: Double | _: Boolean =>
val propertyValue = Option(System.getProperty(property))
if (propertyValue.nonEmpty) {
value = propertyValue.get
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala
index 5d5f5d5..5885fb0 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala
@@ -14,6 +14,7 @@
package com.google.gerrit.scenarios
+import java.nio.charset.StandardCharsets.UTF_8
import java.io.{File, IOException}
import java.net.URLEncoder
@@ -31,7 +32,10 @@
protected val gitProtocol: GitProtocol = GitProtocol()
override def replaceOverride(in: String): String = {
- var next = replaceKeyWith("_project", URLEncoder.encode(getFullProjectName(projectName), "UTF-8"), in)
+ var next = replaceKeyWith("_project", URLEncoder.encode(getFullProjectName(projectName), UTF_8), in)
+ val authenticated = getProperty("authenticated", false).toBoolean
+ val value = "CONTEXT_PATH" + (if (authenticated) "/a" else "")
+ next = replaceKeyWith("context_path", value, next)
super.replaceOverride(next)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala
index 7d7bed7..3802cea 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala
@@ -14,12 +14,13 @@
package com.google.gerrit.scenarios
+import java.nio.charset.StandardCharsets.UTF_8
import java.net.URLEncoder
class ProjectSimulation extends GerritSimulation {
projectName = "defaultTestProject"
override def replaceOverride(in: String): String = {
- replaceProperty("project", URLEncoder.encode(getFullProjectName(projectName), "UTF-8"), in)
+ replaceProperty("project", URLEncoder.encode(getFullProjectName(projectName), UTF_8), in)
}
}
diff --git a/java/Main.java b/java/Main.java
index 09c8c76..c04db2c 100644
--- a/java/Main.java
+++ b/java/Main.java
@@ -16,6 +16,7 @@
public final class Main {
private static final String FLOGGER_BACKEND_PROPERTY = "flogger.backend_factory";
private static final String FLOGGER_LOGGING_CONTEXT = "flogger.logging_context";
+ private static final Runtime.Version MIN_JAVA_VERSION = Runtime.Version.parse("11.0.10");
// We don't do any real work here because we need to import
// the archive lookup code and we cannot import a class in
@@ -34,11 +35,11 @@
}
private static boolean onSupportedJavaVersion() {
- final String version = System.getProperty("java.specification.version");
- if (1.8 <= parse(version)) {
+ Runtime.Version version = Runtime.version();
+ if (version.compareTo(MIN_JAVA_VERSION) >= 0) {
return true;
}
- System.err.println("fatal: Gerrit Code Review requires Java 8 or later");
+ System.err.println("fatal: Gerrit Code Review requires Java " + MIN_JAVA_VERSION + " or later");
System.err.println(" (trying to run on Java " + version + ")");
return false;
}
@@ -58,22 +59,5 @@
"com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance");
}
- private static double parse(String version) {
- if (version == null || version.length() == 0) {
- return 0.0;
- }
-
- try {
- final int fd = version.indexOf('.');
- final int sd = version.indexOf('.', fd + 1);
- if (0 < sd) {
- version = version.substring(0, sd);
- }
- return Double.parseDouble(version);
- } catch (NumberFormatException e) {
- return 0.0;
- }
- }
-
private Main() {}
}
diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index 903b709..1177734 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -45,7 +45,6 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import com.google.common.jimfs.Jimfs;
import com.google.common.primitives.Chars;
import com.google.common.testing.FakeTicker;
import com.google.gerrit.acceptance.AcceptanceTestRequestScope.Context;
@@ -154,14 +153,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.lang.reflect.Modifier;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.sql.Timestamp;
import java.time.Instant;
import java.util.ArrayList;
@@ -175,6 +167,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.UUID;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -183,7 +176,6 @@
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
@@ -193,11 +185,7 @@
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.transport.FetchResult;
-import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.Transport;
-import org.eclipse.jgit.transport.TransportBundleStream;
-import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.SystemReader;
import org.junit.After;
@@ -966,7 +954,7 @@
repo,
"new subject",
"new file",
- "new content");
+ "new content " + UUID.randomUUID());
return result;
}
@@ -1203,58 +1191,6 @@
assertThat(replyTo.getString()).doesNotContain(email);
}
- /**
- * Fetches each bundle into a newly cloned repository, then it applies the bundle, and returns the
- * resulting tree id.
- *
- * <p>Omits NoteDb meta refs.
- */
- protected Map<BranchNameKey, ObjectId> fetchFromBundles(BinaryResult bundles) throws Exception {
- assertThat(bundles.getContentType()).isEqualTo("application/x-zip");
-
- FileSystem fs = Jimfs.newFileSystem();
- Path previewPath = fs.getPath("preview.zip");
- try (OutputStream out = Files.newOutputStream(previewPath)) {
- bundles.writeTo(out);
- }
- Map<BranchNameKey, ObjectId> ret = new HashMap<>();
- try (FileSystem zipFs = FileSystems.newFileSystem(previewPath, (ClassLoader) null);
- DirectoryStream<Path> dirStream =
- Files.newDirectoryStream(Iterables.getOnlyElement(zipFs.getRootDirectories()))) {
- for (Path p : dirStream) {
- if (!Files.isRegularFile(p)) {
- continue;
- }
- String bundleName = p.getFileName().toString();
- int len = bundleName.length();
- assertThat(bundleName).endsWith(".git");
- String repoName = bundleName.substring(0, len - 4);
- Project.NameKey proj = Project.nameKey(repoName);
- TestRepository<?> localRepo = cloneProject(proj);
-
- try (InputStream bundleStream = Files.newInputStream(p);
- TransportBundleStream tbs =
- new TransportBundleStream(
- localRepo.getRepository(), new URIish(bundleName), bundleStream)) {
- FetchResult fr =
- tbs.fetch(
- NullProgressMonitor.INSTANCE,
- Arrays.asList(new RefSpec("refs/*:refs/preview/*")));
- for (Ref r : fr.getAdvertisedRefs()) {
- String refName = r.getName();
- if (RefNames.isNoteDbMetaRef(refName)) {
- continue;
- }
- RevCommit c = localRepo.getRevWalk().parseCommit(r.getObjectId());
- ret.put(BranchNameKey.create(proj, refName), c.getTree().copy());
- }
- }
- }
- }
- assertThat(ret).isNotEmpty();
- return ret;
- }
-
/** Assert that the given branches have the given tree ids. */
protected void assertTrees(Project.NameKey proj, Map<BranchNameKey, ObjectId> trees)
throws Exception {
diff --git a/java/com/google/gerrit/acceptance/AbstractDynamicOptionsTest.java b/java/com/google/gerrit/acceptance/AbstractDynamicOptionsTest.java
index a4ed80a..4e8d20d 100644
--- a/java/com/google/gerrit/acceptance/AbstractDynamicOptionsTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDynamicOptionsTest.java
@@ -15,6 +15,7 @@
package com.google.gerrit.acceptance;
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
+import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.Lists;
import com.google.gerrit.extensions.annotations.Exports;
@@ -50,7 +51,7 @@
public void display(OutputStream displayOutputStream) throws Exception {
PrintWriter stdout =
- new PrintWriter(new BufferedWriter(new OutputStreamWriter(displayOutputStream, "UTF-8")));
+ new PrintWriter(new BufferedWriter(new OutputStreamWriter(displayOutputStream, UTF_8)));
try {
OutputFormat.JSON
.newGson()
diff --git a/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java b/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java
index 1ff7d0e..5991646 100644
--- a/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java
+++ b/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java
@@ -46,6 +46,10 @@
}
public void assertReindexOf(ChangeInfo info, long expectedCount) {
+ if (expectedCount == 0) {
+ assertThat(countsByChange.asMap()).isEmpty();
+ return;
+ }
assertThat(countsByChange.asMap()).containsExactly(info._number, expectedCount);
clear();
}
diff --git a/java/com/google/gerrit/acceptance/ExtensionRegistry.java b/java/com/google/gerrit/acceptance/ExtensionRegistry.java
index 0acf3bc..3d90bf0 100644
--- a/java/com/google/gerrit/acceptance/ExtensionRegistry.java
+++ b/java/com/google/gerrit/acceptance/ExtensionRegistry.java
@@ -21,6 +21,7 @@
import com.google.gerrit.extensions.config.PluginProjectPermissionDefinition;
import com.google.gerrit.extensions.events.AccountActivationListener;
import com.google.gerrit.extensions.events.AccountIndexedListener;
+import com.google.gerrit.extensions.events.AttentionSetListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.gerrit.extensions.events.CommentAddedListener;
import com.google.gerrit.extensions.events.GitBatchRefUpdateListener;
@@ -103,6 +104,7 @@
private final DynamicSet<OnPostReview> onPostReviews;
private final DynamicSet<ReviewerAddedListener> reviewerAddedListeners;
private final DynamicSet<ReviewerDeletedListener> reviewerDeletedListeners;
+ private final DynamicSet<AttentionSetListener> attentionSetListeners;
private final DynamicMap<ChangeHasOperandFactory> hasOperands;
private final DynamicMap<ChangeIsOperandFactory> isOperands;
@@ -147,7 +149,8 @@
DynamicSet<ReviewerAddedListener> reviewerAddedListeners,
DynamicSet<ReviewerDeletedListener> reviewerDeletedListeners,
DynamicMap<ChangeHasOperandFactory> hasOperands,
- DynamicMap<ChangeIsOperandFactory> isOperands) {
+ DynamicMap<ChangeIsOperandFactory> isOperands,
+ DynamicSet<AttentionSetListener> attentionSetListeners) {
this.accountIndexedListeners = accountIndexedListeners;
this.changeIndexedListeners = changeIndexedListeners;
this.groupIndexedListeners = groupIndexedListeners;
@@ -187,6 +190,7 @@
this.reviewerDeletedListeners = reviewerDeletedListeners;
this.hasOperands = hasOperands;
this.isOperands = isOperands;
+ this.attentionSetListeners = attentionSetListeners;
}
public Registration newRegistration() {
@@ -330,6 +334,10 @@
return add(workInProgressStateChangedListeners, workInProgressStateChangedListener);
}
+ public Registration add(AttentionSetListener attentionSetListener) {
+ return add(attentionSetListeners, attentionSetListener);
+ }
+
public Registration add(CapabilityDefinition capabilityDefinition, String exportName) {
return add(capabilityDefinitions, capabilityDefinition, exportName);
}
diff --git a/java/com/google/gerrit/acceptance/PushOneCommit.java b/java/com/google/gerrit/acceptance/PushOneCommit.java
index d46fb78..99db40a 100644
--- a/java/com/google/gerrit/acceptance/PushOneCommit.java
+++ b/java/com/google/gerrit/acceptance/PushOneCommit.java
@@ -263,7 +263,11 @@
if (changeId != null) {
commitBuilder = testRepo.amendRef("HEAD").insertChangeId(changeId.substring(1));
} else {
- commitBuilder = testRepo.branch("HEAD").commit().insertChangeId(nextChangeId());
+ if (subject.contains("\nChange-Id: ")) {
+ commitBuilder = testRepo.amendRef("HEAD");
+ } else {
+ commitBuilder = testRepo.branch("HEAD").commit().insertChangeId(nextChangeId());
+ }
}
commitBuilder.message(subject).author(i).committer(new PersonIdent(i, testRepo.getDate()));
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/change/ChangeOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/change/ChangeOperationsImpl.java
index 580f10f..c1029be 100644
--- a/java/com/google/gerrit/acceptance/testsuite/change/ChangeOperationsImpl.java
+++ b/java/com/google/gerrit/acceptance/testsuite/change/ChangeOperationsImpl.java
@@ -47,7 +47,6 @@
import com.google.gerrit.server.util.time.TimeUtil;
import com.google.inject.Inject;
import java.io.IOException;
-import java.sql.Timestamp;
import java.time.Instant;
import java.util.Arrays;
import java.util.Objects;
@@ -140,13 +139,14 @@
RevWalk revWalk = new RevWalk(objectInserter.newReader())) {
Instant now = TimeUtil.now();
IdentifiedUser changeOwner = getChangeOwner(changeCreation);
- PersonIdent authorAndCommitter =
- changeOwner.newCommitterIdent(now, serverIdent.getTimeZone());
+ PersonIdent authorAndCommitter = changeOwner.newCommitterIdent(now, serverIdent.getZoneId());
ObjectId commitId =
createCommit(repository, revWalk, objectInserter, changeCreation, authorAndCommitter);
String refName = RefNames.fullName(changeCreation.branch());
ChangeInserter inserter = getChangeInserter(changeId, refName, commitId);
+ changeCreation.topic().ifPresent(t -> inserter.setTopic(t));
+ inserter.setApprovals(changeCreation.approvals());
try (BatchUpdate batchUpdate = batchUpdateFactory.create(project, changeOwner, now)) {
batchUpdate.setRepository(repository, revWalk, objectInserter);
@@ -494,13 +494,10 @@
return Optional.ofNullable(oldPatchsetCommit.getAuthorIdent()).orElse(serverIdent);
}
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
private PersonIdent getCommitter(RevCommit oldPatchsetCommit, Instant now) {
PersonIdent oldPatchsetCommitter =
Optional.ofNullable(oldPatchsetCommit.getCommitterIdent()).orElse(serverIdent);
- if (asSeconds(now) == asSeconds(oldPatchsetCommitter.getWhen().toInstant())) {
+ if (asSeconds(now) == asSeconds(oldPatchsetCommitter.getWhenAsInstant())) {
/* We need to ensure that the resulting commit SHA-1 is different from the old patchset.
* In real situations, this automatically happens as two patchsets won't have exactly the
* same commit timestamp even when the tree and commit message are the same. In tests,
@@ -510,7 +507,7 @@
* here and simply add a second. */
now = now.plusSeconds(1);
}
- return new PersonIdent(oldPatchsetCommitter, Timestamp.from(now));
+ return new PersonIdent(oldPatchsetCommitter, now);
}
private long asSeconds(Instant date) {
diff --git a/java/com/google/gerrit/acceptance/testsuite/change/TestChangeCreation.java b/java/com/google/gerrit/acceptance/testsuite/change/TestChangeCreation.java
index 5871e17..a064d02 100644
--- a/java/com/google/gerrit/acceptance/testsuite/change/TestChangeCreation.java
+++ b/java/com/google/gerrit/acceptance/testsuite/change/TestChangeCreation.java
@@ -16,6 +16,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import com.google.gerrit.acceptance.testsuite.ThrowingFunction;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
@@ -34,6 +35,10 @@
public abstract Optional<Account.Id> owner();
+ public abstract Optional<String> topic();
+
+ public abstract ImmutableMap<String, Short> approvals();
+
public abstract String commitMessage();
public abstract ImmutableList<TreeModification> treeModifications();
@@ -50,7 +55,8 @@
.branch(Constants.R_HEADS + Constants.MASTER)
.commitMessage("A test change")
// Which value we choose here doesn't matter. All relevant code paths set the desired value.
- .mergeStrategy(MergeStrategy.OURS);
+ .mergeStrategy(MergeStrategy.OURS)
+ .approvals(ImmutableMap.of());
}
@AutoValue.Builder
@@ -66,6 +72,15 @@
/** The change owner. Must be an existing user account. */
public abstract Builder owner(Account.Id owner);
+ /** The topic to add this change to. */
+ public abstract Builder topic(String topic);
+
+ /**
+ * The approvals to apply to this change. Map of label name to value. All approvals will be
+ * granted by the uploader.
+ */
+ public abstract Builder approvals(ImmutableMap<String, Short> approvals);
+
/**
* The commit message. The message may contain a {@code Change-Id} footer but does not need to.
* If the footer is absent, it will be generated.
diff --git a/java/com/google/gerrit/asciidoctor/DocIndexer.java b/java/com/google/gerrit/asciidoctor/DocIndexer.java
index 6cbe2a9..acd6aad 100644
--- a/java/com/google/gerrit/asciidoctor/DocIndexer.java
+++ b/java/com/google/gerrit/asciidoctor/DocIndexer.java
@@ -42,8 +42,8 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.store.RAMDirectory;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
@@ -92,9 +92,9 @@
}
}
- private RAMDirectory index()
+ private ByteBuffersDirectory index()
throws IOException, UnsupportedEncodingException, FileNotFoundException {
- RAMDirectory directory = new RAMDirectory();
+ ByteBuffersDirectory directory = new ByteBuffersDirectory();
IndexWriterConfig config = new IndexWriterConfig(new StandardAnalyzer(CharArraySet.EMPTY_SET));
config.setOpenMode(OpenMode.CREATE);
config.setCommitOnClose(true);
@@ -140,7 +140,7 @@
return directory;
}
- private byte[] zip(RAMDirectory dir) throws IOException {
+ private byte[] zip(ByteBuffersDirectory dir) throws IOException {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
try (ZipOutputStream zip = new ZipOutputStream(buf)) {
for (String name : dir.listAll()) {
diff --git a/java/com/google/gerrit/common/UsedAt.java b/java/com/google/gerrit/common/UsedAt.java
index 3e103c8..1b87f32 100644
--- a/java/com/google/gerrit/common/UsedAt.java
+++ b/java/com/google/gerrit/common/UsedAt.java
@@ -14,6 +14,7 @@
package com.google.gerrit.common;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
@@ -25,25 +26,26 @@
import java.lang.annotation.Target;
/**
- * A marker to say a method/type/field is added or is increased to public solely because it is
- * called from inside a project or an organisation using Gerrit.
+ * A marker to say a method/type/field/constructor is added or is increased to public solely because
+ * it is called from inside a project or an organisation using Gerrit.
*/
-@Target({METHOD, TYPE, FIELD})
+@Target({METHOD, TYPE, FIELD, CONSTRUCTOR})
@Retention(RUNTIME)
@Repeatable(UsedAt.Uses.class)
public @interface UsedAt {
/** Enumeration of projects that call a method/type/field. */
enum Project {
- GOOGLE,
COLLABNET,
+ GOOGLE,
+ PLUGINS_ALL, // Use this project if a method/type is generally made available to all plugins.
PLUGIN_CHECKS,
PLUGIN_CODE_OWNERS,
PLUGIN_DELETE_PROJECT,
- PLUGIN_SERVICEUSER,
PLUGIN_HIGH_AVAILABILITY,
PLUGIN_MULTI_SITE,
+ PLUGIN_SERVICEUSER,
PLUGIN_WEBSESSION_FLATFILE,
- PLUGINS_ALL, // Use this project if a method/type is generally made available to all plugins.
+ MODULE_GIT_REFS_FILTER
}
/** Reference to the project that uses the method annotated with this annotation. */
diff --git a/java/com/google/gerrit/entities/Account.java b/java/com/google/gerrit/entities/Account.java
index 303e79f..85dbdeb 100644
--- a/java/com/google/gerrit/entities/Account.java
+++ b/java/com/google/gerrit/entities/Account.java
@@ -46,6 +46,10 @@
*/
@AutoValue
public abstract class Account {
+
+ /** Placeholder for indicating an account-id that does not correspond to any local account */
+ public static final Id UNKNOWN_ACCOUNT_ID = id(0);
+
public static Id id(int id) {
return new AutoValue_Account_Id(id);
}
diff --git a/java/com/google/gerrit/entities/KeyUtil.java b/java/com/google/gerrit/entities/KeyUtil.java
index be28689..0f14cd9 100644
--- a/java/com/google/gerrit/entities/KeyUtil.java
+++ b/java/com/google/gerrit/entities/KeyUtil.java
@@ -14,7 +14,8 @@
package com.google.gerrit.entities;
-import java.io.UnsupportedEncodingException;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.util.Arrays;
public class KeyUtil {
@@ -49,13 +50,7 @@
}
public static String encode(final String key) {
- final byte[] b;
- try {
- b = key.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new IllegalStateException("No UTF-8 support", e);
- }
-
+ final byte[] b = key.getBytes(UTF_8);
final StringBuilder r = new StringBuilder(b.length);
for (int i = 0; i < b.length; i++) {
final int c = b[i] & 0xff;
@@ -99,10 +94,6 @@
} catch (ArrayIndexOutOfBoundsException err) {
throw new IllegalArgumentException("Bad encoding" + key, err);
}
- try {
- return new String(b, 0, bPtr, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new IllegalStateException("No UTF-8 support", e);
- }
+ return new String(b, 0, bPtr, UTF_8);
}
}
diff --git a/java/com/google/gerrit/entities/LabelType.java b/java/com/google/gerrit/entities/LabelType.java
index e36224e..0349a73 100644
--- a/java/com/google/gerrit/entities/LabelType.java
+++ b/java/com/google/gerrit/entities/LabelType.java
@@ -22,7 +22,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.common.Nullable;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Optional;
@@ -30,15 +29,6 @@
public abstract class LabelType {
public static final boolean DEF_ALLOW_POST_SUBMIT = true;
public static final boolean DEF_CAN_OVERRIDE = true;
- public static final boolean DEF_COPY_ALL_SCORES_IF_LIST_OF_FILES_DID_NOT_CHANGE = false;
- public static final boolean DEF_COPY_ALL_SCORES_IF_NO_CHANGE = true;
- public static final boolean DEF_COPY_ALL_SCORES_IF_NO_CODE_CHANGE = false;
- public static final boolean DEF_COPY_ALL_SCORES_ON_TRIVIAL_REBASE = false;
- public static final boolean DEF_COPY_ALL_SCORES_ON_MERGE_FIRST_PARENT_UPDATE = false;
- public static final boolean DEF_COPY_ANY_SCORE = false;
- public static final boolean DEF_COPY_MAX_SCORE = false;
- public static final boolean DEF_COPY_MIN_SCORE = false;
- public static final ImmutableList<Short> DEF_COPY_VALUES = ImmutableList.of();
public static final boolean DEF_IGNORE_SELF_APPROVAL = false;
public static LabelType withDefaultValues(String name) {
@@ -99,24 +89,6 @@
public abstract LabelFunction getFunction();
- public abstract boolean isCopyAnyScore();
-
- public abstract boolean isCopyMinScore();
-
- public abstract boolean isCopyMaxScore();
-
- public abstract boolean isCopyAllScoresIfListOfFilesDidNotChange();
-
- public abstract boolean isCopyAllScoresOnMergeFirstParentUpdate();
-
- public abstract boolean isCopyAllScoresOnTrivialRebase();
-
- public abstract boolean isCopyAllScoresIfNoCodeChange();
-
- public abstract boolean isCopyAllScoresIfNoChange();
-
- public abstract ImmutableList<Short> getCopyValues();
-
public abstract boolean isAllowPostSubmit();
public abstract boolean isIgnoreSelfApproval();
@@ -152,16 +124,6 @@
.setMaxNegative(Short.MIN_VALUE)
.setMaxPositive(Short.MAX_VALUE)
.setCanOverride(DEF_CAN_OVERRIDE)
- .setCopyAllScoresIfListOfFilesDidNotChange(
- DEF_COPY_ALL_SCORES_IF_LIST_OF_FILES_DID_NOT_CHANGE)
- .setCopyAllScoresIfNoChange(DEF_COPY_ALL_SCORES_IF_NO_CHANGE)
- .setCopyAllScoresIfNoCodeChange(DEF_COPY_ALL_SCORES_IF_NO_CODE_CHANGE)
- .setCopyAllScoresOnTrivialRebase(DEF_COPY_ALL_SCORES_ON_TRIVIAL_REBASE)
- .setCopyAllScoresOnMergeFirstParentUpdate(DEF_COPY_ALL_SCORES_ON_MERGE_FIRST_PARENT_UPDATE)
- .setCopyAnyScore(DEF_COPY_ANY_SCORE)
- .setCopyMaxScore(DEF_COPY_MAX_SCORE)
- .setCopyMinScore(DEF_COPY_MIN_SCORE)
- .setCopyValues(DEF_COPY_VALUES)
.setAllowPostSubmit(DEF_ALLOW_POST_SUBMIT)
.setIgnoreSelfApproval(DEF_IGNORE_SELF_APPROVAL);
}
@@ -185,11 +147,19 @@
}
public boolean isMaxNegative(PatchSetApproval ca) {
- return getMaxNegative() == ca.value();
+ return isMaxNegative(ca.value());
+ }
+
+ public boolean isMaxNegative(short value) {
+ return getMaxNegative() == value;
}
public boolean isMaxPositive(PatchSetApproval ca) {
- return getMaxPositive() == ca.value();
+ return isMaxPositive(ca.value());
+ }
+
+ public boolean isMaxPositive(short value) {
+ return getMaxPositive() == value;
}
public LabelValue getValue(short value) {
@@ -250,28 +220,8 @@
public abstract Builder setDefaultValue(short defaultValue);
- public abstract Builder setCopyAnyScore(boolean copyAnyScore);
-
public abstract Builder setCopyCondition(@Nullable String copyCondition);
- public abstract Builder setCopyMinScore(boolean copyMinScore);
-
- public abstract Builder setCopyMaxScore(boolean copyMaxScore);
-
- public abstract Builder setCopyAllScoresIfListOfFilesDidNotChange(
- boolean copyAllScoresIfListOfFilesDidNotChange);
-
- public abstract Builder setCopyAllScoresOnMergeFirstParentUpdate(
- boolean copyAllScoresOnMergeFirstParentUpdate);
-
- public abstract Builder setCopyAllScoresOnTrivialRebase(boolean copyAllScoresOnTrivialRebase);
-
- public abstract Builder setCopyAllScoresIfNoCodeChange(boolean copyAllScoresIfNoCodeChange);
-
- public abstract Builder setCopyAllScoresIfNoChange(boolean copyAllScoresIfNoChange);
-
- public abstract Builder setCopyValues(Collection<Short> copyValues);
-
public abstract Builder setMaxNegative(short maxNegative);
public abstract Builder setMaxPositive(short maxPositive);
@@ -280,8 +230,6 @@
protected abstract String getName();
- protected abstract ImmutableList<Short> getCopyValues();
-
protected abstract Builder setByValue(ImmutableMap<Short, LabelValue> byValue);
@Nullable
@@ -313,8 +261,6 @@
}
setByValue(byValue.build());
- setCopyValues(ImmutableList.sortedCopyOf(getCopyValues()));
-
return autoBuild();
}
}
diff --git a/java/com/google/gerrit/entities/PatchSetApprovals.java b/java/com/google/gerrit/entities/PatchSetApprovals.java
new file mode 100644
index 0000000..8fed9c0
--- /dev/null
+++ b/java/com/google/gerrit/entities/PatchSetApprovals.java
@@ -0,0 +1,59 @@
+// Copyright (C) 2022 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.entities;
+
+import com.google.auto.value.AutoValue;
+import com.google.auto.value.extension.memoized.Memoized;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.Multimaps;
+
+/** All approvals of a change by patch set. */
+@AutoValue
+public abstract class PatchSetApprovals {
+ /**
+ * Returns all approvals by patch set, including copied approvals
+ *
+ * <p>Approvals that have been copied from a previous patch set are returned as part of the
+ * result. These approvals can be identified by looking at {@link PatchSetApproval#copied()}.
+ */
+ public abstract ImmutableListMultimap<PatchSet.Id, PatchSetApproval> all();
+
+ /**
+ * Returns non-copied approvals by patch set.
+ *
+ * <p>Approvals that have been copied from a previous patch set are filtered out.
+ */
+ @Memoized
+ public ImmutableListMultimap<PatchSet.Id, PatchSetApproval> onlyNonCopied() {
+ return ImmutableListMultimap.copyOf(
+ Multimaps.filterEntries(all(), entry -> !entry.getValue().copied()));
+ }
+
+ /**
+ * Returns copied approvals by patch set.
+ *
+ * <p>Approvals that have not been copied from a previous patch set are filtered out.
+ */
+ @Memoized
+ public ImmutableListMultimap<PatchSet.Id, PatchSetApproval> onlyCopied() {
+ return ImmutableListMultimap.copyOf(
+ Multimaps.filterEntries(all(), entry -> entry.getValue().copied()));
+ }
+
+ public static PatchSetApprovals create(
+ ImmutableListMultimap<PatchSet.Id, PatchSetApproval> approvalsByPatchSet) {
+ return new AutoValue_PatchSetApprovals(approvalsByPatchSet);
+ }
+}
diff --git a/java/com/google/gerrit/entities/ProjectChangeKey.java b/java/com/google/gerrit/entities/ProjectChangeKey.java
new file mode 100644
index 0000000..15dc5e9
--- /dev/null
+++ b/java/com/google/gerrit/entities/ProjectChangeKey.java
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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.entities;
+
+import com.google.auto.value.AutoValue;
+
+/** Stores together numeric {@link Change.Id} and a project name for the change */
+@AutoValue
+public abstract class ProjectChangeKey {
+ public static ProjectChangeKey create(Project.NameKey projectName, Change.Id changeId) {
+ return new AutoValue_ProjectChangeKey(projectName, changeId);
+ }
+
+ public abstract Project.NameKey projectName();
+
+ public abstract Change.Id changeId();
+}
diff --git a/java/com/google/gerrit/entities/StoredCommentLinkInfo.java b/java/com/google/gerrit/entities/StoredCommentLinkInfo.java
index dc5abbc..75bc034 100644
--- a/java/com/google/gerrit/entities/StoredCommentLinkInfo.java
+++ b/java/com/google/gerrit/entities/StoredCommentLinkInfo.java
@@ -30,10 +30,38 @@
@Nullable
public abstract String getMatch();
- /** The link to replace the match with. This can only be set if html is {@code null}. */
+ /**
+ * The link to replace the match with. This can only be set if html is {@code null}.
+ *
+ * <p>The constructed link is using {@link #getLink()} {@link #getPrefix()} {@link #getSuffix()}
+ * and {@link #getText()}, and has the shape of
+ *
+ * <p>{@code PREFIX<a href="LINK">TEXT</a>SUFFIX}
+ */
@Nullable
public abstract String getLink();
+ /**
+ * The text before the link tag that the match is replaced with. This can only be set if link is
+ * not {@code null}.
+ */
+ @Nullable
+ public abstract String getPrefix();
+
+ /**
+ * The text after the link tag that the match is replaced with. This can only be set if link is
+ * not {@code null}.
+ */
+ @Nullable
+ public abstract String getSuffix();
+
+ /**
+ * The content of the link tag that the match is replaced with. This can only be set if link is
+ * not {@code null}.
+ */
+ @Nullable
+ public abstract String getText();
+
/** The html to replace the match with. This can only be set if link is {@code null}. */
@Nullable
public abstract String getHtml();
@@ -72,6 +100,9 @@
return builder(src.name)
.setMatch(src.match)
.setLink(src.link)
+ .setPrefix(src.prefix)
+ .setSuffix(src.suffix)
+ .setText(src.text)
.setHtml(src.html)
.setEnabled(enabled)
.setOverrideOnly(false)
@@ -84,6 +115,9 @@
info.name = getName();
info.match = getMatch();
info.link = getLink();
+ info.prefix = getPrefix();
+ info.suffix = getSuffix();
+ info.text = getText();
info.html = getHtml();
info.enabled = getEnabled();
return info;
@@ -97,6 +131,12 @@
public abstract Builder setLink(@Nullable String value);
+ public abstract Builder setPrefix(@Nullable String value);
+
+ public abstract Builder setSuffix(@Nullable String value);
+
+ public abstract Builder setText(@Nullable String value);
+
public abstract Builder setHtml(@Nullable String value);
public abstract Builder setEnabled(@Nullable Boolean value);
@@ -106,6 +146,9 @@
public StoredCommentLinkInfo build() {
checkArgument(getName() != null, "invalid commentlink.name");
setLink(Strings.emptyToNull(getLink()));
+ setPrefix(Strings.emptyToNull(getPrefix()));
+ setSuffix(Strings.emptyToNull(getSuffix()));
+ setText(Strings.emptyToNull(getText()));
setHtml(Strings.emptyToNull(getHtml()));
if (!getOverrideOnly()) {
checkArgument(
@@ -126,6 +169,12 @@
protected abstract String getLink();
+ protected abstract String getPrefix();
+
+ protected abstract String getSuffix();
+
+ protected abstract String getText();
+
protected abstract String getHtml();
protected abstract boolean getOverrideOnly();
diff --git a/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java b/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java
index aff0994..c24227d 100644
--- a/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java
+++ b/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java
@@ -95,10 +95,32 @@
ImmutableList.of());
}
+ public static SubmitRequirementExpressionResult notEvaluated(SubmitRequirementExpression expr) {
+ return SubmitRequirementExpressionResult.create(
+ expr, Status.NOT_EVALUATED, ImmutableList.of(), ImmutableList.of());
+ }
+
public static TypeAdapter<SubmitRequirementExpressionResult> typeAdapter(Gson gson) {
return new AutoValue_SubmitRequirementExpressionResult.GsonTypeAdapter(gson);
}
+ public abstract Builder toBuilder();
+
+ @AutoValue.Builder
+ public abstract static class Builder {
+ public abstract Builder expression(SubmitRequirementExpression expression);
+
+ public abstract Builder status(Status status);
+
+ public abstract Builder errorMessage(Optional<String> errorMessage);
+
+ public abstract Builder passingAtoms(ImmutableList<String> passingAtoms);
+
+ public abstract Builder failingAtoms(ImmutableList<String> failingAtoms);
+
+ public abstract SubmitRequirementExpressionResult build();
+ }
+
public enum Status {
/** Submit requirement expression is fulfilled for a given change. */
PASS,
@@ -107,7 +129,10 @@
FAIL,
/** Submit requirement expression contains invalid syntax and is not parsable. */
- ERROR
+ ERROR,
+
+ /** Submit requirement expression was not evaluated. */
+ NOT_EVALUATED
}
/**
diff --git a/java/com/google/gerrit/extensions/api/access/PluginProjectPermission.java b/java/com/google/gerrit/extensions/api/access/PluginProjectPermission.java
index a62fc63..b3680ea 100644
--- a/java/com/google/gerrit/extensions/api/access/PluginProjectPermission.java
+++ b/java/com/google/gerrit/extensions/api/access/PluginProjectPermission.java
@@ -34,7 +34,7 @@
requireNonNull(pluginName, "pluginName");
requireNonNull(permission, "permission");
checkArgument(
- isValidPluginPermissionName(permission), "invalid plugin permission name: ", permission);
+ isValidPluginPermissionName(permission), "invalid plugin permission name: %s", permission);
this.pluginName = pluginName;
this.permission = permission;
diff --git a/java/com/google/gerrit/extensions/api/changes/ChangeApi.java b/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
index 2224649..018a6cf 100644
--- a/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
+++ b/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
@@ -128,20 +128,6 @@
}
/**
- * Ignore or un-ignore this change.
- *
- * @param ignore ignore the change if true
- */
- void ignore(boolean ignore) throws RestApiException;
-
- /**
- * Check if this change is ignored.
- *
- * @return true if the change is ignored
- */
- boolean ignored() throws RestApiException;
-
- /**
* Create a new change that reverts this change.
*
* @see Changes#id(int)
@@ -427,6 +413,39 @@
ChangeInfo check(FixInput fix) throws RestApiException;
+ abstract class CheckSubmitRequirementRequest {
+ /** Submit requirement name. */
+ private String name;
+
+ /**
+ * A change ID for a change in {@link com.google.gerrit.entities.RefNames#REFS_CONFIG} branch
+ * from which the submit-requirement will be loaded.
+ */
+ private String refsConfigChangeId;
+
+ public abstract SubmitRequirementResultInfo get() throws RestApiException;
+
+ public CheckSubmitRequirementRequest srName(String srName) {
+ this.name = srName;
+ return this;
+ }
+
+ public CheckSubmitRequirementRequest refsConfigChangeId(String changeId) {
+ this.refsConfigChangeId = changeId;
+ return this;
+ }
+
+ protected String srName() {
+ return name;
+ }
+
+ protected String getRefsConfigChangeId() {
+ return refsConfigChangeId;
+ }
+ }
+
+ CheckSubmitRequirementRequest checkSubmitRequirementRequest() throws RestApiException;
+
/** Returns the result of evaluating the {@link SubmitRequirementInput} input on the change. */
SubmitRequirementResultInfo checkSubmitRequirement(SubmitRequirementInput input)
throws RestApiException;
@@ -767,6 +786,11 @@
}
@Override
+ public CheckSubmitRequirementRequest checkSubmitRequirementRequest() throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
public SubmitRequirementResultInfo checkSubmitRequirement(SubmitRequirementInput input)
throws RestApiException {
throw new NotImplementedException();
@@ -800,16 +824,6 @@
}
@Override
- public void ignore(boolean ignore) throws RestApiException {
- throw new NotImplementedException();
- }
-
- @Override
- public boolean ignored() throws RestApiException {
- throw new NotImplementedException();
- }
-
- @Override
public PureRevertInfo pureRevert() throws RestApiException {
throw new NotImplementedException();
}
diff --git a/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java b/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java
index 8432c8f..f75443e 100644
--- a/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java
+++ b/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java
@@ -14,6 +14,7 @@
package com.google.gerrit.extensions.api.changes;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.restapi.DefaultInput;
import java.util.Map;
@@ -31,4 +32,7 @@
* are added to the attention set upon deletion of their vote by other users.
*/
public boolean ignoreAutomaticAttentionSetRules;
+
+ /** Reason for this vote deletion. Will appear in the change message. */
+ @Nullable public String reason;
}
diff --git a/tools/polygerrit-updater/src/utils/unexpectedValue.ts b/java/com/google/gerrit/extensions/api/changes/GetRelatedOption.java
similarity index 66%
rename from tools/polygerrit-updater/src/utils/unexpectedValue.ts
rename to java/com/google/gerrit/extensions/api/changes/GetRelatedOption.java
index 690c283..ab81c60 100644
--- a/tools/polygerrit-updater/src/utils/unexpectedValue.ts
+++ b/java/com/google/gerrit/extensions/api/changes/GetRelatedOption.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 The Android Open Source Project
+// Copyright (C) 2022 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.
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-export function unexpectedValue<T>(x: T): never {
- throw new Error(`Unexpected value '${x}'`);
+package com.google.gerrit.extensions.api.changes;
+
+/** Options for "Get Related Changes" requests. */
+public enum GetRelatedOption {
+ /** Compute submittability boolean for all returned changes. */
+ SUBMITTABLE
}
diff --git a/java/com/google/gerrit/extensions/api/changes/RelatedChangeAndCommitInfo.java b/java/com/google/gerrit/extensions/api/changes/RelatedChangeAndCommitInfo.java
index 5bf22aa..740caa8 100644
--- a/java/com/google/gerrit/extensions/api/changes/RelatedChangeAndCommitInfo.java
+++ b/java/com/google/gerrit/extensions/api/changes/RelatedChangeAndCommitInfo.java
@@ -25,6 +25,7 @@
public Integer _revisionNumber;
public Integer _currentRevisionNumber;
public String status;
+ public Boolean submittable;
public RelatedChangeAndCommitInfo() {}
@@ -38,6 +39,7 @@
.add("_revisionNumber", _revisionNumber)
.add("_currentRevisionNumber", _currentRevisionNumber)
.add("status", status)
+ .add("submittable", submittable)
.toString();
}
}
diff --git a/java/com/google/gerrit/extensions/api/changes/RevertInput.java b/java/com/google/gerrit/extensions/api/changes/RevertInput.java
index 148d24a..613e48e 100644
--- a/java/com/google/gerrit/extensions/api/changes/RevertInput.java
+++ b/java/com/google/gerrit/extensions/api/changes/RevertInput.java
@@ -36,4 +36,6 @@
* {@link NotifyHandling#OWNER}
*/
public boolean workInProgress;
+
+ public Map<String, String> validationOptions;
}
diff --git a/java/com/google/gerrit/extensions/api/changes/RevisionApi.java b/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
index b659cca..73fc170 100644
--- a/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
+++ b/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
@@ -19,6 +19,7 @@
import com.google.gerrit.extensions.client.ArchiveFormat;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.ActionInfo;
+import com.google.gerrit.extensions.common.ApplyProvidedFixInput;
import com.google.gerrit.extensions.common.ApprovalInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.CommentInfo;
@@ -33,6 +34,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.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -117,8 +119,20 @@
*/
EditInfo applyFix(String fixId) throws RestApiException;
+ /**
+ * Applies fix similar to {@code applyFix} method. Instead of using a fix stored in the server,
+ * this applies the fix provided in {@code ApplyProvidedFixInput}
+ *
+ * @param applyProvidedFixInput The fix(es) to apply to a new change edit.
+ * @throws RestApiException if the fix couldn't be applied.
+ */
+ EditInfo applyFix(ApplyProvidedFixInput applyProvidedFixInput) throws RestApiException;
+
Map<String, DiffInfo> getFixPreview(String fixId) throws RestApiException;
+ Map<String, DiffInfo> getFixPreview(ApplyProvidedFixInput applyProvidedFixInput)
+ throws RestApiException;
+
DraftApi createDraft(DraftInput in) throws RestApiException;
DraftApi draft(String id) throws RestApiException;
@@ -146,6 +160,8 @@
RelatedChangesInfo related() throws RestApiException;
+ RelatedChangesInfo related(EnumSet<GetRelatedOption> listOptions) throws RestApiException;
+
/** Returns votes on the revision. */
ListMultimap<String, ApprovalInfo> votes() throws RestApiException;
@@ -313,11 +329,22 @@
}
@Override
+ public EditInfo applyFix(ApplyProvidedFixInput applyProvidedFixInput) throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
public Map<String, DiffInfo> getFixPreview(String fixId) throws RestApiException {
throw new NotImplementedException();
}
@Override
+ public Map<String, DiffInfo> getFixPreview(ApplyProvidedFixInput applyProvidedFixInput)
+ throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
public Map<String, List<CommentInfo>> drafts() throws RestApiException {
throw new NotImplementedException();
}
@@ -383,6 +410,11 @@
}
@Override
+ public RelatedChangesInfo related(EnumSet<GetRelatedOption> options) throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
public ListMultimap<String, ApprovalInfo> votes() throws RestApiException {
throw new NotImplementedException();
}
diff --git a/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java b/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java
index 23849e4..b45fcee 100644
--- a/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java
+++ b/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java
@@ -17,9 +17,13 @@
import com.google.common.base.MoreObjects;
import java.util.Objects;
+/** See {@link com.google.gerrit.entities.StoredCommentLinkInfo} for field documentation. */
public class CommentLinkInfo {
public String match;
public String link;
+ public String prefix;
+ public String suffix;
+ public String text;
public String html;
public Boolean enabled; // null means true
@@ -34,6 +38,9 @@
CommentLinkInfo that = (CommentLinkInfo) o;
return Objects.equals(this.match, that.match)
&& Objects.equals(this.link, that.link)
+ && Objects.equals(this.prefix, that.prefix)
+ && Objects.equals(this.suffix, that.suffix)
+ && Objects.equals(this.text, that.text)
&& Objects.equals(this.html, that.html)
&& Objects.equals(this.enabled, that.enabled);
}
@@ -51,6 +58,9 @@
.add("name", name)
.add("match", match)
.add("link", link)
+ .add("prefix", prefix)
+ .add("suffix", suffix)
+ .add("text", text)
.add("html", html)
.add("enabled", enabled)
.toString();
diff --git a/java/com/google/gerrit/extensions/api/projects/CommentLinkInput.java b/java/com/google/gerrit/extensions/api/projects/CommentLinkInput.java
index 3aad7e1..1c964a4 100644
--- a/java/com/google/gerrit/extensions/api/projects/CommentLinkInput.java
+++ b/java/com/google/gerrit/extensions/api/projects/CommentLinkInput.java
@@ -14,14 +14,22 @@
package com.google.gerrit.extensions.api.projects;
-/*
+/**
* Input for a commentlink configuration on a project.
+ *
+ * <p>See {@link com.google.gerrit.entities.StoredCommentLinkInfo} for additional details.
*/
public class CommentLinkInput {
/** A JavaScript regular expression to match positions to be replaced with a hyperlink. */
public String match;
/** The URL to direct the user to whenever the regular expression is matched. */
public String link;
+ /** Text inserted before the link if the regular expression is matched. */
+ public String prefix;
+ /** Text inserted after the link if the regular expression is matched. */
+ public String suffix;
+ /** Text of the link. */
+ public String text;
/** Whether the commentlink is enabled. */
public Boolean enabled;
}
diff --git a/java/com/google/gerrit/extensions/api/projects/ProjectApi.java b/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
index 59475a4..f6408b6 100644
--- a/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
+++ b/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
@@ -22,6 +22,7 @@
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.LabelDefinitionInfo;
import com.google.gerrit.extensions.common.ProjectInfo;
+import com.google.gerrit.extensions.common.SubmitRequirementInfo;
import com.google.gerrit.extensions.restapi.NotImplementedException;
import com.google.gerrit.extensions.restapi.RestApiException;
import java.util.Collection;
@@ -227,6 +228,21 @@
LabelApi label(String labelName) throws RestApiException;
+ ListSubmitRequirementsRequest submitRequirements() throws RestApiException;
+
+ abstract class ListSubmitRequirementsRequest {
+ protected boolean inherited;
+
+ public abstract List<SubmitRequirementInfo> get() throws RestApiException;
+
+ public ListSubmitRequirementsRequest withInherited(boolean inherited) {
+ this.inherited = inherited;
+ return this;
+ }
+ }
+
+ SubmitRequirementApi submitRequirement(String name) throws RestApiException;
+
/**
* Adds, updates and deletes label definitions in a batch.
*
@@ -421,11 +437,21 @@
}
@Override
+ public ListSubmitRequirementsRequest submitRequirements() throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
public LabelApi label(String labelName) throws RestApiException {
throw new NotImplementedException();
}
@Override
+ public SubmitRequirementApi submitRequirement(String name) throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
public void labels(BatchLabelInput input) throws RestApiException {
throw new NotImplementedException();
}
diff --git a/java/com/google/gerrit/extensions/api/projects/SubmitRequirementApi.java b/java/com/google/gerrit/extensions/api/projects/SubmitRequirementApi.java
new file mode 100644
index 0000000..a6e79db
--- /dev/null
+++ b/java/com/google/gerrit/extensions/api/projects/SubmitRequirementApi.java
@@ -0,0 +1,60 @@
+// Copyright (C) 2022 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.SubmitRequirementInfo;
+import com.google.gerrit.extensions.common.SubmitRequirementInput;
+import com.google.gerrit.extensions.restapi.NotImplementedException;
+import com.google.gerrit.extensions.restapi.RestApiException;
+
+public interface SubmitRequirementApi {
+ /** Create a new submit requirement. */
+ SubmitRequirementApi create(SubmitRequirementInput input) throws RestApiException;
+
+ /** Get existing submit requirement. */
+ SubmitRequirementInfo get() throws RestApiException;
+
+ /** Update existing submit requirement. */
+ SubmitRequirementInfo update(SubmitRequirementInput input) throws RestApiException;
+
+ /** Delete existing submit requirement. */
+ void delete() throws RestApiException;
+
+ /**
+ * A default implementation which allows source compatibility when adding new methods to the
+ * interface.
+ */
+ class NotImplemented implements SubmitRequirementApi {
+ @Override
+ public SubmitRequirementApi create(SubmitRequirementInput input) throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public SubmitRequirementInfo get() throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public SubmitRequirementInfo update(SubmitRequirementInput input) throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public void delete() throws RestApiException {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/java/com/google/gerrit/extensions/client/ChangeKind.java b/java/com/google/gerrit/extensions/client/ChangeKind.java
index e58e005..6240bba 100644
--- a/java/com/google/gerrit/extensions/client/ChangeKind.java
+++ b/java/com/google/gerrit/extensions/client/ChangeKind.java
@@ -29,5 +29,42 @@
NO_CODE_CHANGE,
/** Same tree, parent tree, same commit message. */
- NO_CHANGE
+ NO_CHANGE;
+
+ public boolean matches(ChangeKind changeKind, boolean isMerge) {
+ switch (changeKind) {
+ case REWORK:
+ // REWORK inlcudes all other change kinds, since those are just more trivial cases of a
+ // rework
+ return true;
+ case TRIVIAL_REBASE:
+ return isTrivialRebase();
+ case MERGE_FIRST_PARENT_UPDATE:
+ return isMergeFirstParentUpdate(isMerge);
+ case NO_CHANGE:
+ return this == NO_CHANGE;
+ case NO_CODE_CHANGE:
+ return isNoCodeChange();
+ }
+ throw new IllegalStateException("unexpected change kind: " + changeKind);
+ }
+
+ public boolean isNoCodeChange() {
+ // NO_CHANGE is a more trivial case of NO_CODE_CHANGE and hence matched as well
+ return this == NO_CHANGE || this == NO_CODE_CHANGE;
+ }
+
+ public boolean isTrivialRebase() {
+ // NO_CHANGE is a more trivial case of TRIVIAL_REBASE and hence matched as well
+ return this == NO_CHANGE || this == TRIVIAL_REBASE;
+ }
+
+ public boolean isMergeFirstParentUpdate(boolean isMerge) {
+ if (!isMerge) {
+ return false;
+ }
+
+ // NO_CHANGE is a more trivial case of MERGE_FIRST_PARENT_UPDATE and hence matched as well
+ return this == NO_CHANGE || this == MERGE_FIRST_PARENT_UPDATE;
+ }
}
diff --git a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java
index 6acf3f4..1ee2cd8 100644
--- a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java
+++ b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java
@@ -102,6 +102,7 @@
}
public enum Theme {
+ AUTO,
DARK,
LIGHT
}
@@ -149,6 +150,7 @@
public Boolean workInProgressByDefault;
public List<MenuItem> my;
public List<String> changeTable;
+ public Boolean allowBrowserNotifications;
public DateFormat getDateFormat() {
if (dateFormat == null) {
@@ -189,7 +191,7 @@
GeneralPreferencesInfo p = new GeneralPreferencesInfo();
p.changesPerPage = DEFAULT_PAGESIZE;
p.downloadScheme = null;
- p.theme = Theme.LIGHT;
+ p.theme = Theme.AUTO;
p.dateFormat = DateFormat.STD;
p.timeFormat = TimeFormat.HHMM_12;
p.expandInlineDiffs = false;
@@ -207,6 +209,7 @@
p.disableKeyboardShortcuts = false;
p.disableTokenHighlighting = false;
p.workInProgressByDefault = false;
+ p.allowBrowserNotifications = true;
return p;
}
}
diff --git a/java/com/google/gerrit/extensions/common/ApplyProvidedFixInput.java b/java/com/google/gerrit/extensions/common/ApplyProvidedFixInput.java
new file mode 100644
index 0000000..cd28d83
--- /dev/null
+++ b/java/com/google/gerrit/extensions/common/ApplyProvidedFixInput.java
@@ -0,0 +1,27 @@
+// Copyright (C) 2022 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.common;
+
+import java.util.List;
+
+/**
+ * Input containing fix definitions to apply the provided fix to the change, on the patchset
+ * specified by revision id.
+ */
+public class ApplyProvidedFixInput {
+ public ApplyProvidedFixInput() {}
+
+ public List<FixReplacementInfo> fixReplacementInfos;
+}
diff --git a/java/com/google/gerrit/extensions/common/LabelDefinitionInfo.java b/java/com/google/gerrit/extensions/common/LabelDefinitionInfo.java
index d3baecd..975061b 100644
--- a/java/com/google/gerrit/extensions/common/LabelDefinitionInfo.java
+++ b/java/com/google/gerrit/extensions/common/LabelDefinitionInfo.java
@@ -26,16 +26,7 @@
public short defaultValue;
public List<String> branches;
public Boolean canOverride;
- public Boolean copyAnyScore;
public String copyCondition;
- public Boolean copyMinScore;
- public Boolean copyMaxScore;
- public Boolean copyAllScoresIfListOfFilesDidNotChange;
- public Boolean copyAllScoresIfNoChange;
- public Boolean copyAllScoresIfNoCodeChange;
- public Boolean copyAllScoresOnTrivialRebase;
- public Boolean copyAllScoresOnMergeFirstParentUpdate;
- public List<Short> copyValues;
public Boolean allowPostSubmit;
public Boolean ignoreSelfApproval;
}
diff --git a/java/com/google/gerrit/extensions/common/LabelDefinitionInput.java b/java/com/google/gerrit/extensions/common/LabelDefinitionInput.java
index 1d580bb..277fccd 100644
--- a/java/com/google/gerrit/extensions/common/LabelDefinitionInput.java
+++ b/java/com/google/gerrit/extensions/common/LabelDefinitionInput.java
@@ -25,17 +25,8 @@
public Short defaultValue;
public List<String> branches;
public Boolean canOverride;
- public Boolean copyAnyScore;
public String copyCondition;
public Boolean unsetCopyCondition;
- public Boolean copyMinScore;
- public Boolean copyMaxScore;
- public Boolean copyAllScoresIfListOfFilesDidNotChange;
- public Boolean copyAllScoresIfNoChange;
- public Boolean copyAllScoresIfNoCodeChange;
- public Boolean copyAllScoresOnTrivialRebase;
- public Boolean copyAllScoresOnMergeFirstParentUpdate;
- public List<Short> copyValues;
public Boolean allowPostSubmit;
public Boolean ignoreSelfApproval;
}
diff --git a/java/com/google/gerrit/extensions/common/SubmitRequirementExpressionInfo.java b/java/com/google/gerrit/extensions/common/SubmitRequirementExpressionInfo.java
index b4731f2..742d0c8 100644
--- a/java/com/google/gerrit/extensions/common/SubmitRequirementExpressionInfo.java
+++ b/java/com/google/gerrit/extensions/common/SubmitRequirementExpressionInfo.java
@@ -17,7 +17,10 @@
import java.util.List;
import java.util.Objects;
-/** Result of evaluating a single submit requirement expression. */
+/**
+ * Result of evaluating a single submit requirement expression. This API entity is populated from
+ * {@link com.google.gerrit.entities.SubmitRequirementExpressionResult}.
+ */
public class SubmitRequirementExpressionInfo {
/** Submit requirement expression as a String. */
@@ -26,6 +29,9 @@
/** A boolean indicating if the expression is fulfilled on a change. */
public boolean fulfilled;
+ /** A status indicating if the expression is fulfilled, non-fulfilled or not evaluated. */
+ public Status status;
+
/**
* A list of all atoms that are passing, for example query "branch:refs/heads/foo and project:bar"
* has two atoms: ["branch:refs/heads/foo", "project:bar"].
@@ -44,6 +50,24 @@
*/
public String errorMessage;
+ /**
+ * Values in this enum should match with values in {@link
+ * com.google.gerrit.entities.SubmitRequirementExpressionResult.Status}.
+ */
+ public enum Status {
+ /** Expression was evaluated and the result was true. */
+ PASS,
+
+ /** Expression was evaluated and the result was false. */
+ FAIL,
+
+ /** An error occurred while evaluating the expression. */
+ ERROR,
+
+ /** Expression was not evaluated. */
+ NOT_EVALUATED
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/java/com/google/gerrit/extensions/common/SubmitRequirementInfo.java b/java/com/google/gerrit/extensions/common/SubmitRequirementInfo.java
new file mode 100644
index 0000000..9347e7e
--- /dev/null
+++ b/java/com/google/gerrit/extensions/common/SubmitRequirementInfo.java
@@ -0,0 +1,45 @@
+// Copyright (C) 2022 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.common;
+
+public class SubmitRequirementInfo {
+ /** Name of the submit requirement. */
+ public String name;
+
+ /** Description of the submit requirement. */
+ public String description;
+
+ /**
+ * Expression string to be evaluated on a change. Decides if this submit requirement is applicable
+ * on the given change.
+ */
+ public String applicabilityExpression;
+
+ /**
+ * Expression string to be evaluated on a change. When evaluated to true, this submit requirement
+ * becomes fulfilled for this change.
+ */
+ public String submittabilityExpression;
+
+ /**
+ * Expression string to be evaluated on a change. When evaluated to true, this submit requirement
+ * becomes fulfilled for this change regardless of the evaluation of the {@link
+ * #submittabilityExpression}.
+ */
+ public String overrideExpression;
+
+ /** Boolean indicating if this submit requirement can be overridden in child projects. */
+ public boolean allowOverrideInChildProjects;
+}
diff --git a/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java b/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
index cb9d855..f75ec66 100644
--- a/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
@@ -72,14 +72,14 @@
// TODO(issue-15508): Migrate timestamp fields in *Info/*Input classes from type Timestamp to
// Instant
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
@SuppressWarnings("JdkObsolete")
public void matches(PersonIdent ident) {
isNotNull();
name().isEqualTo(ident.getName());
email().isEqualTo(ident.getEmailAddress());
- check("roundedDate()").that(gitPerson.date.getTime()).isEqualTo(ident.getWhen().getTime());
+ check("roundedDate()")
+ .that(gitPerson.date.getTime())
+ .isEqualTo(ident.getWhenAsInstant().toEpochMilli());
tz().isEqualTo(ident.getTimeZoneOffset());
}
}
diff --git a/java/com/google/gerrit/extensions/events/AttentionSetListener.java b/java/com/google/gerrit/extensions/events/AttentionSetListener.java
new file mode 100644
index 0000000..ada30ce
--- /dev/null
+++ b/java/com/google/gerrit/extensions/events/AttentionSetListener.java
@@ -0,0 +1,46 @@
+// Copyright (C) 2022 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.events;
+
+import com.google.gerrit.extensions.annotations.ExtensionPoint;
+import java.util.Set;
+
+/** Notified whenever the attention set is changed. */
+@ExtensionPoint
+public interface AttentionSetListener {
+ interface Event extends ChangeEvent {
+
+ /**
+ * Returns the users added to the attention set because of this change
+ *
+ * @return Account IDs
+ */
+ Set<Integer> usersAdded();
+
+ /**
+ * Returns the users removed from the attention set because of this change
+ *
+ * @return Account IDs
+ */
+ Set<Integer> usersRemoved();
+ }
+
+ /**
+ * This function will be called when the attention set changes
+ *
+ * @param event The event that changed the attention set
+ */
+ void onAttentionSetChanged(Event event);
+}
diff --git a/java/com/google/gerrit/gpg/BUILD b/java/com/google/gerrit/gpg/BUILD
index 9f804c4..0ee5212 100644
--- a/java/com/google/gerrit/gpg/BUILD
+++ b/java/com/google/gerrit/gpg/BUILD
@@ -13,6 +13,7 @@
"//java/com/google/gerrit/server/api",
"//lib:guava",
"//lib:jgit",
+ "//lib/auto:auto-factory",
"//lib/bouncycastle:bcpg-neverlink",
"//lib/bouncycastle:bcprov-neverlink",
"//lib/flogger:api",
diff --git a/java/com/google/gerrit/gpg/GerritPushCertificateChecker.java b/java/com/google/gerrit/gpg/GerritPushCertificateChecker.java
index c3dec61..874f1dc 100644
--- a/java/com/google/gerrit/gpg/GerritPushCertificateChecker.java
+++ b/java/com/google/gerrit/gpg/GerritPushCertificateChecker.java
@@ -14,28 +14,24 @@
package com.google.gerrit.gpg;
+import com.google.auto.factory.AutoFactory;
+import com.google.auto.factory.Provided;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager;
-import com.google.inject.Inject;
-import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
import org.eclipse.jgit.lib.Repository;
+@AutoFactory
public class GerritPushCertificateChecker extends PushCertificateChecker {
- public interface Factory {
- GerritPushCertificateChecker create(IdentifiedUser expectedUser);
- }
-
private final GitRepositoryManager repoManager;
private final AllUsersName allUsers;
- @Inject
GerritPushCertificateChecker(
- GerritPublicKeyChecker.Factory keyCheckerFactory,
- GitRepositoryManager repoManager,
- AllUsersName allUsers,
- @Assisted IdentifiedUser expectedUser) {
+ @Provided GerritPublicKeyChecker.Factory keyCheckerFactory,
+ @Provided GitRepositoryManager repoManager,
+ @Provided AllUsersName allUsers,
+ IdentifiedUser expectedUser) {
super(keyCheckerFactory.create().setExpectedUser(expectedUser));
this.repoManager = repoManager;
this.allUsers = allUsers;
diff --git a/java/com/google/gerrit/gpg/GpgModule.java b/java/com/google/gerrit/gpg/GpgModule.java
index 45c1ab5..623b5f0 100644
--- a/java/com/google/gerrit/gpg/GpgModule.java
+++ b/java/com/google/gerrit/gpg/GpgModule.java
@@ -42,7 +42,6 @@
}
if (enableSignedPush) {
install(new SignedPushModule());
- factory(GerritPushCertificateChecker.Factory.class);
}
install(new GpgApiModule(enableSignedPush && configEditGpgKeys));
}
diff --git a/java/com/google/gerrit/gpg/SignedPushPreReceiveHook.java b/java/com/google/gerrit/gpg/SignedPushPreReceiveHook.java
index 21a5b6e..abc51c2 100644
--- a/java/com/google/gerrit/gpg/SignedPushPreReceiveHook.java
+++ b/java/com/google/gerrit/gpg/SignedPushPreReceiveHook.java
@@ -48,11 +48,11 @@
}
private final Provider<IdentifiedUser> user;
- private final GerritPushCertificateChecker.Factory checkerFactory;
+ private final GerritPushCertificateCheckerFactory checkerFactory;
@Inject
public SignedPushPreReceiveHook(
- Provider<IdentifiedUser> user, GerritPushCertificateChecker.Factory checkerFactory) {
+ Provider<IdentifiedUser> user, GerritPushCertificateCheckerFactory checkerFactory) {
this.user = user;
this.checkerFactory = checkerFactory;
}
diff --git a/java/com/google/gerrit/gpg/api/GpgApiAdapterImpl.java b/java/com/google/gerrit/gpg/api/GpgApiAdapterImpl.java
index 652afea..6ae0334 100644
--- a/java/com/google/gerrit/gpg/api/GpgApiAdapterImpl.java
+++ b/java/com/google/gerrit/gpg/api/GpgApiAdapterImpl.java
@@ -22,7 +22,7 @@
import com.google.gerrit.extensions.common.PushCertificateInfo;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.RestApiException;
-import com.google.gerrit.gpg.GerritPushCertificateChecker;
+import com.google.gerrit.gpg.GerritPushCertificateCheckerFactory;
import com.google.gerrit.gpg.PushCertificateChecker;
import com.google.gerrit.gpg.server.GpgKeys;
import com.google.gerrit.gpg.server.PostGpgKeys;
@@ -44,14 +44,14 @@
private final Provider<PostGpgKeys> postGpgKeys;
private final Provider<GpgKeys> gpgKeys;
private final GpgKeyApiImpl.Factory gpgKeyApiFactory;
- private final GerritPushCertificateChecker.Factory pushCertCheckerFactory;
+ private final GerritPushCertificateCheckerFactory pushCertCheckerFactory;
@Inject
GpgApiAdapterImpl(
Provider<PostGpgKeys> postGpgKeys,
Provider<GpgKeys> gpgKeys,
GpgKeyApiImpl.Factory gpgKeyApiFactory,
- GerritPushCertificateChecker.Factory pushCertCheckerFactory) {
+ GerritPushCertificateCheckerFactory pushCertCheckerFactory) {
this.postGpgKeys = postGpgKeys;
this.gpgKeys = gpgKeys;
this.gpgKeyApiFactory = gpgKeyApiFactory;
diff --git a/java/com/google/gerrit/httpd/GitOverHttpServlet.java b/java/com/google/gerrit/httpd/GitOverHttpServlet.java
index 189d081..e1ead59 100644
--- a/java/com/google/gerrit/httpd/GitOverHttpServlet.java
+++ b/java/com/google/gerrit/httpd/GitOverHttpServlet.java
@@ -432,14 +432,14 @@
requestListeners.runEach(l -> l.onRequest(requestInfo));
try {
- perm.check(ProjectPermission.RUN_UPLOAD_PACK);
- } catch (AuthException e) {
- GitSmartHttpTools.sendError(
- (HttpServletRequest) request,
- responseWrapper,
- HttpServletResponse.SC_FORBIDDEN,
- "upload-pack not permitted on this server");
- return;
+ if (!perm.test(ProjectPermission.RUN_UPLOAD_PACK)) {
+ GitSmartHttpTools.sendError(
+ (HttpServletRequest) request,
+ responseWrapper,
+ HttpServletResponse.SC_FORBIDDEN,
+ "upload-pack not permitted on this server");
+ return;
+ }
} catch (PermissionBackendException e) {
responseWrapper.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
throw new ServletException(e);
@@ -591,18 +591,18 @@
Capable canUpload;
try {
try {
- permissionBackend
+ if (!permissionBackend
.currentUser()
.project(state.getNameKey())
- .check(ProjectPermission.RUN_RECEIVE_PACK);
+ .test(ProjectPermission.RUN_RECEIVE_PACK)) {
+ GitSmartHttpTools.sendError(
+ httpRequest,
+ responseWrapper,
+ HttpServletResponse.SC_FORBIDDEN,
+ "receive-pack not permitted on this server");
+ return;
+ }
canUpload = arc.canUpload();
- } catch (AuthException e) {
- GitSmartHttpTools.sendError(
- httpRequest,
- responseWrapper,
- HttpServletResponse.SC_FORBIDDEN,
- "receive-pack not permitted on this server");
- return;
} catch (PermissionBackendException e) {
throw new RuntimeException(e);
}
diff --git a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
index ce22ae8..72bfe40 100644
--- a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
+++ b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
@@ -39,6 +39,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
@@ -68,8 +69,10 @@
staticTemplateData(
canonicalURL, cdnPath, faviconPath, urlParameterMap, urlInScriptTagOrdainer))
.putAll(dynamicTemplateData(gerritApi, requestedURL));
- Set<String> enabledExperiments = experimentFeatures.getEnabledExperimentFeatures();
-
+ Set<String> enabledExperiments = new HashSet<>();
+ enabledExperiments.addAll(experimentFeatures.getEnabledExperimentFeatures());
+ // Add all experiments enabled through url
+ enabledExperiments.addAll(IndexHtmlUtil.experimentData(urlParameterMap));
if (!enabledExperiments.isEmpty()) {
data.put("enabledExperiments", serializeObject(GSON, enabledExperiments).toString());
}
@@ -90,18 +93,13 @@
IndexPreloadingUtil.RequestedPage page = IndexPreloadingUtil.parseRequestedPage(requestedPath);
switch (page) {
case CHANGE:
- data.put(
- "defaultChangeDetailHex", ListOption.toHex(IndexPreloadingUtil.CHANGE_DETAIL_OPTIONS));
- data.put(
- "changeRequestsPath",
- IndexPreloadingUtil.computeChangeRequestsPath(requestedPath, page).get());
- break;
case DIFF:
data.put(
"defaultChangeDetailHex", ListOption.toHex(IndexPreloadingUtil.CHANGE_DETAIL_OPTIONS));
data.put(
"changeRequestsPath",
IndexPreloadingUtil.computeChangeRequestsPath(requestedPath, page).get());
+ data.put("changeNum", IndexPreloadingUtil.computeChangeNum(requestedPath, page).get());
break;
case DASHBOARD:
// Dashboard is preloaded queries are added later when we check user is authenticated.
diff --git a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
index fa9a820..1c6e058 100644
--- a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
+++ b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
@@ -59,16 +59,15 @@
public static final String DASHBOARD_HAS_UNPUBLISHED_DRAFTS_QUERY = "has:draft limit:10";
public static final String YOUR_TURN = "attention:${user} limit:25";
public static final String DASHBOARD_ASSIGNED_QUERY =
- "assignee:${user} (-is:wip OR " + "owner:self OR assignee:self) is:open -is:ignored limit:25";
+ "assignee:${user} (-is:wip OR " + "owner:self OR assignee:self) is:open limit:25";
public static final String DASHBOARD_WORK_IN_PROGRESS_QUERY =
"is:open owner:${user} is:wip limit:25";
- public static final String DASHBOARD_OUTGOING_QUERY =
- "is:open owner:${user} -is:wip -is:ignored limit:25";
+ public static final String DASHBOARD_OUTGOING_QUERY = "is:open owner:${user} -is:wip limit:25";
public static final String DASHBOARD_INCOMING_QUERY =
- "is:open -owner:${user} -is:wip -is:ignored (reviewer:${user} OR assignee:${user}) limit:25";
- public static final String CC_QUERY = "is:open -is:ignored -is:wip cc:${user} limit:10";
+ "is:open -owner:${user} -is:wip (reviewer:${user} OR assignee:${user}) limit:25";
+ public static final String CC_QUERY = "is:open -is:wip cc:${user} limit:10";
public static final String DASHBOARD_RECENTLY_CLOSED_QUERY =
- "is:closed -is:ignored (-is:wip OR owner:self) "
+ "is:closed (-is:wip OR owner:self) "
+ "(owner:${user} OR reviewer:${user} OR assignee:${user} "
+ "OR cc:${user}) -age:4w limit:10";
public static final String NEW_USER = "owner:${user} limit:1";
@@ -168,6 +167,30 @@
return Optional.empty();
}
+ public static Optional<Integer> computeChangeNum(String requestedURL, RequestedPage page) {
+ Matcher matcher;
+ switch (page) {
+ case CHANGE:
+ matcher = CHANGE_URL_PATTERN.matcher(requestedURL);
+ break;
+ case DIFF:
+ matcher = DIFF_URL_PATTERN.matcher(requestedURL);
+ break;
+ case DASHBOARD:
+ case PAGE_WITHOUT_PRELOADING:
+ default:
+ return Optional.empty();
+ }
+
+ if (matcher.matches()) {
+ Integer changeNum = Ints.tryParse(matcher.group("changeNum"));
+ if (changeNum != null) {
+ return Optional.of(changeNum);
+ }
+ }
+ return Optional.empty();
+ }
+
public static List<String> computeDashboardQueryList(Server serverApi) throws RestApiException {
List<String> queryList = new ArrayList<>();
queryList.add(SELF_DASHBOARD_HAS_UNPUBLISHED_DRAFTS_QUERY);
diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java
index 8e8a9d2..15dcf42 100644
--- a/java/com/google/gerrit/httpd/raw/StaticModule.java
+++ b/java/com/google/gerrit/httpd/raw/StaticModule.java
@@ -99,6 +99,7 @@
private static final String DOC_SERVLET = "DocServlet";
private static final String FAVICON_SERVLET = "FaviconServlet";
+ private static final String SERVICE_WORKER_SERVLET = "ServiceWorkerServlet";
private static final String POLYGERRIT_INDEX_SERVLET = "PolyGerritUiIndexServlet";
private static final String ROBOTS_TXT_SERVLET = "RobotsTxtServlet";
@@ -167,6 +168,7 @@
public void configureServlets() {
serve("/robots.txt").with(named(ROBOTS_TXT_SERVLET));
serve("/favicon.ico").with(named(FAVICON_SERVLET));
+ serve("/service-worker.js").with(named(SERVICE_WORKER_SERVLET));
}
@Provides
@@ -201,6 +203,19 @@
return new SingleFileServlet(cache, webappSourcePath("favicon.ico"), true);
}
+ @Provides
+ @Singleton
+ @Named(SERVICE_WORKER_SERVLET)
+ HttpServlet getServiceWorkerServlet(@Named(CACHE) Cache<Path, Resource> cache) {
+ Paths p = getPaths();
+ if (p.warFs != null) {
+ return new SingleFileServlet(
+ cache, p.warFs.getPath("/polygerrit_ui/workers/service-worker.js"), false);
+ }
+ return new SingleFileServlet(
+ cache, webappSourcePath("polygerrit_ui/workers/service-worker.js"), true);
+ }
+
private Path webappSourcePath(String name) {
Paths p = getPaths();
if (p.unpackedWar != null) {
diff --git a/java/com/google/gerrit/index/BUILD b/java/com/google/gerrit/index/BUILD
index 95b3581..ba1c8bd 100644
--- a/java/com/google/gerrit/index/BUILD
+++ b/java/com/google/gerrit/index/BUILD
@@ -28,9 +28,11 @@
"//java/com/google/gerrit/git",
"//java/com/google/gerrit/json",
"//java/com/google/gerrit/metrics",
+ "//java/com/google/gerrit/proto",
"//java/com/google/gerrit/server/logging",
"//lib:guava",
"//lib:jgit",
+ "//lib:protobuf",
"//lib/antlr:java-runtime",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
diff --git a/java/com/google/gerrit/index/FieldDef.java b/java/com/google/gerrit/index/FieldDef.java
index 76aa7cc..1c2074b 100644
--- a/java/com/google/gerrit/index/FieldDef.java
+++ b/java/com/google/gerrit/index/FieldDef.java
@@ -21,6 +21,9 @@
import com.google.common.base.CharMatcher;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.exceptions.StorageException;
+import com.google.gerrit.index.SchemaFieldDefs.Getter;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
+import com.google.gerrit.index.SchemaFieldDefs.Setter;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.Optional;
@@ -28,11 +31,18 @@
/**
* Definition of a field stored in the secondary index.
*
+ * <p>{@link FieldDef}-s must not be changed once introduced to the codebase. Instead, a new
+ * FieldDef must be added and the old one removed from the schema (in two upgrade steps, see {@code
+ * com.google.gerrit.index.IndexUpgradeValidator}).
+ *
+ * <p>Note that {@link FieldDef} does not override {@link Object#equals(Object)}. It relies on
+ * instances being singletons so that the default (i.e. reference) comparison works.
+ *
* @param <I> input type from which documents are created and search results are returned.
* @param <T> type that should be extracted from the input object when converting to an index
* document.
*/
-public final class FieldDef<I, T> {
+public final class FieldDef<I, T> implements SchemaField<I, T> {
public static FieldDef.Builder<String> exact(String name) {
return new FieldDef.Builder<>(FieldType.EXACT, name);
}
@@ -61,17 +71,6 @@
return new FieldDef.Builder<>(FieldType.TIMESTAMP, name);
}
- @FunctionalInterface
- public interface Getter<I, T> {
- @Nullable
- T get(I input) throws IOException;
- }
-
- @FunctionalInterface
- public interface Setter<I, T> {
- void set(I object, T value);
- }
-
public static class Builder<T> {
private final FieldType<T> type;
private final String name;
@@ -139,16 +138,19 @@
}
/** Returns name of the field. */
+ @Override
public String getName() {
return name;
}
/** Returns type of the field; for repeatable fields, the inner type, not the iterable type. */
+ @Override
public FieldType<?> getType() {
return type;
}
/** Returns whether the field should be stored in the index. */
+ @Override
public boolean isStored() {
return stored;
}
@@ -159,6 +161,7 @@
* @param input input object.
* @return the field value(s) to index.
*/
+ @Override
@Nullable
public T get(I input) {
try {
@@ -177,6 +180,7 @@
* @return {@code true} if the field was set, {@code false} otherwise
*/
@SuppressWarnings("unchecked")
+ @Override
public boolean setIfPossible(I object, StoredValue doc) {
if (!setter.isPresent()) {
return false;
@@ -204,6 +208,7 @@
}
/** Returns whether the field is repeatable. */
+ @Override
public boolean isRepeatable() {
return repeatable;
}
diff --git a/java/com/google/gerrit/index/IndexedField.java b/java/com/google/gerrit/index/IndexedField.java
new file mode 100644
index 0000000..e44f562
--- /dev/null
+++ b/java/com/google/gerrit/index/IndexedField.java
@@ -0,0 +1,515 @@
+// Copyright (C) 2022 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.index;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.base.CharMatcher;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.reflect.TypeToken;
+import com.google.gerrit.common.Nullable;
+import com.google.gerrit.entities.converter.ProtoConverter;
+import com.google.gerrit.exceptions.StorageException;
+import com.google.gerrit.index.SchemaFieldDefs.Getter;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
+import com.google.gerrit.index.SchemaFieldDefs.Setter;
+import com.google.gerrit.proto.Protos;
+import com.google.protobuf.MessageLite;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.StreamSupport;
+
+/**
+ * Definition of a field stored in the secondary index.
+ *
+ * <p>Each IndexedField, stored in index, may have multiple {@link SearchSpec} which defines how it
+ * can be searched and how the index tokens are generated.
+ *
+ * <p>Index implementations may choose to store IndexedField and {@link SearchSpec} (search tokens)
+ * separately, however {@link com.google.gerrit.index.query.IndexedQuery} always issues the queries
+ * to {@link SearchSpec}.
+ *
+ * <p>This allows index implementations to store IndexedField once, while enabling multiple
+ * tokenization strategies on the same IndexedField with {@link SearchSpec}
+ *
+ * @param <I> input type from which documents are created and search results are returned.
+ * @param <T> type that should be extracted from the input object when converting to an index
+ * document.
+ */
+// TODO(mariasavtchouk): revisit the class name after migration is done.
+@SuppressWarnings("serial")
+@AutoValue
+public abstract class IndexedField<I, T> {
+
+ public static final TypeToken<Integer> INTEGER_TYPE = new TypeToken<>() {};
+ public static final TypeToken<Iterable<Integer>> ITERABLE_INTEGER_TYPE = new TypeToken<>() {};
+ public static final TypeToken<Long> LONG_TYPE = new TypeToken<>() {};
+ public static final TypeToken<Iterable<Long>> ITERABLE_LONG_TYPE = new TypeToken<>() {};
+ public static final TypeToken<String> STRING_TYPE = new TypeToken<>() {};
+ public static final TypeToken<Iterable<String>> ITERABLE_STRING_TYPE = new TypeToken<>() {};
+ public static final TypeToken<byte[]> BYTE_ARRAY_TYPE = new TypeToken<>() {};
+ public static final TypeToken<Iterable<byte[]>> ITERABLE_BYTE_ARRAY_TYPE = new TypeToken<>() {};
+ public static final TypeToken<Timestamp> TIMESTAMP_TYPE = new TypeToken<>() {};
+
+ // Should not be used directly, only used to check if the proto is stored
+ private static final TypeToken<MessageLite> MESSAGE_TYPE = new TypeToken<>() {};
+
+ public static <I, T> Builder<I, T> builder(String name, TypeToken<T> fieldType) {
+ return new AutoValue_IndexedField.Builder<I, T>()
+ .name(name)
+ .fieldType(fieldType)
+ .stored(false)
+ .required(false);
+ }
+
+ public static <I> Builder<I, Iterable<String>> iterableStringBuilder(String name) {
+ return builder(name, IndexedField.ITERABLE_STRING_TYPE);
+ }
+
+ public static <I> Builder<I, String> stringBuilder(String name) {
+ return builder(name, IndexedField.STRING_TYPE);
+ }
+
+ public static <I> Builder<I, Integer> integerBuilder(String name) {
+ return builder(name, IndexedField.INTEGER_TYPE);
+ }
+
+ public static <I> Builder<I, Long> longBuilder(String name) {
+ return builder(name, IndexedField.LONG_TYPE);
+ }
+
+ public static <I> Builder<I, Iterable<Integer>> iterableIntegerBuilder(String name) {
+ return builder(name, IndexedField.ITERABLE_INTEGER_TYPE);
+ }
+
+ public static <I> Builder<I, Timestamp> timestampBuilder(String name) {
+ return builder(name, IndexedField.TIMESTAMP_TYPE);
+ }
+
+ public static <I> Builder<I, byte[]> byteArrayBuilder(String name) {
+ return builder(name, IndexedField.BYTE_ARRAY_TYPE);
+ }
+
+ public static <I> Builder<I, Iterable<byte[]>> iterableByteArrayBuilder(String name) {
+ return builder(name, IndexedField.ITERABLE_BYTE_ARRAY_TYPE);
+ }
+
+ /**
+ * Defines how {@link IndexedField} can be searched and how the index tokens are generated.
+ *
+ * <p>Multiple {@link SearchSpec} can be defined on single {@link IndexedField}.
+ *
+ * <p>Depending on the implementation, indexes can choose to store {@link IndexedField} and {@link
+ * SearchSpec} separately. The searches are issues to {@link SearchSpec}.
+ */
+ public class SearchSpec implements SchemaField<I, T> {
+ private final String name;
+ private final SearchOption searchOption;
+
+ public SearchSpec(String name, SearchOption searchOption) {
+ checkName(name);
+ this.name = name;
+ this.searchOption = searchOption;
+ }
+
+ @Override
+ public boolean isStored() {
+ return getField().stored();
+ }
+
+ @Override
+ public boolean isRepeatable() {
+ return getField().repeatable();
+ }
+
+ @Override
+ @Nullable
+ public T get(I obj) {
+ return getField().get(obj);
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public FieldType<?> getType() {
+ SearchOption searchOption = getSearchOption();
+ TypeToken<?> fieldType = getField().fieldType();
+ if (searchOption.equals(SearchOption.STORE_ONLY)) {
+ return FieldType.STORED_ONLY;
+ } else if ((fieldType.equals(IndexedField.INTEGER_TYPE)
+ || fieldType.equals(IndexedField.ITERABLE_INTEGER_TYPE))
+ && searchOption.equals(SearchOption.EXACT)) {
+ return FieldType.INTEGER;
+ } else if (fieldType.equals(IndexedField.INTEGER_TYPE)
+ && searchOption.equals(SearchOption.RANGE)) {
+ return FieldType.INTEGER_RANGE;
+ } else if (fieldType.equals(IndexedField.LONG_TYPE)) {
+ return FieldType.LONG;
+ } else if (fieldType.equals(IndexedField.TIMESTAMP_TYPE)) {
+ return FieldType.TIMESTAMP;
+ } else if (fieldType.equals(IndexedField.STRING_TYPE)
+ || fieldType.equals(IndexedField.ITERABLE_STRING_TYPE)) {
+ if (searchOption.equals(SearchOption.EXACT)) {
+ return FieldType.EXACT;
+ } else if (searchOption.equals(SearchOption.FULL_TEXT)) {
+ return FieldType.FULL_TEXT;
+ } else if (searchOption.equals(SearchOption.PREFIX)) {
+ return FieldType.PREFIX;
+ }
+ }
+ throw new IllegalArgumentException(
+ String.format(
+ "search spec [%s, %s] is not supported on field [%s, %s]",
+ getName(), getSearchOption(), getField().name(), getField().fieldType()));
+ }
+
+ @Override
+ public boolean setIfPossible(I object, StoredValue doc) {
+ return getField().setIfPossible(object, doc);
+ }
+
+ /**
+ * Returns {@link SearchOption} enabled on this field.
+ *
+ * @return {@link SearchOption}
+ */
+ public SearchOption getSearchOption() {
+ return searchOption;
+ }
+
+ /**
+ * Returns {@link IndexedField} on which this spec was created.
+ *
+ * @return original {@link IndexedField} of this spec.
+ */
+ public IndexedField<I, T> getField() {
+ return IndexedField.this;
+ }
+
+ private String checkName(String name) {
+ CharMatcher m = CharMatcher.anyOf("abcdefghijklmnopqrstuvwxyz0123456789_");
+ checkArgument(name != null && m.matchesAllOf(name), "illegal field name: %s", name);
+ return name;
+ }
+ }
+
+ /**
+ * Adds {@link SearchSpec} to this {@link IndexedField}
+ *
+ * @param name the name to use for in the search.
+ * @param searchOption the tokenization option, enabled by the new {@link SearchSpec}
+ * @return the added {@link SearchSpec}.
+ */
+ public SearchSpec addSearchSpec(String name, SearchOption searchOption) {
+ SearchSpec searchSpec = new SearchSpec(name, searchOption);
+ checkArgument(
+ !searchSpecs.containsKey(searchSpec.getName()),
+ "Can not add search spec %s, because it is already defined on field %s",
+ searchSpec.getName(),
+ name());
+ searchSpecs.put(searchSpec.getName(), searchSpec);
+ return searchSpec;
+ }
+
+ public SearchSpec exact(String name) {
+ return addSearchSpec(name, SearchOption.EXACT);
+ }
+
+ public SearchSpec fullText(String name) {
+ return addSearchSpec(name, SearchOption.FULL_TEXT);
+ }
+
+ public SearchSpec range(String name) {
+ return addSearchSpec(name, SearchOption.RANGE);
+ }
+
+ public SearchSpec integerRange(String name) {
+ checkState(fieldType().equals(INTEGER_TYPE));
+ return addSearchSpec(name, SearchOption.RANGE);
+ }
+
+ public SearchSpec integer(String name) {
+ checkState(fieldType().equals(INTEGER_TYPE) || fieldType().equals(ITERABLE_INTEGER_TYPE));
+ return addSearchSpec(name, SearchOption.EXACT);
+ }
+
+ public SearchSpec longSearch(String name) {
+ checkState(fieldType().equals(LONG_TYPE) || fieldType().equals(ITERABLE_LONG_TYPE));
+ return addSearchSpec(name, SearchOption.EXACT);
+ }
+
+ public SearchSpec prefix(String name) {
+ return addSearchSpec(name, SearchOption.PREFIX);
+ }
+
+ public SearchSpec storedOnly(String name) {
+ checkState(stored());
+ return addSearchSpec(name, SearchOption.STORE_ONLY);
+ }
+
+ public SearchSpec timestamp(String name) {
+ checkState(fieldType().equals(TIMESTAMP_TYPE));
+ return addSearchSpec(name, SearchOption.RANGE);
+ }
+
+ /** A builder for {@link IndexedField}. */
+ @AutoValue.Builder
+ public abstract static class Builder<I, T> {
+
+ public abstract IndexedField.Builder<I, T> name(String name);
+
+ public abstract IndexedField.Builder<I, T> description(Optional<String> description);
+
+ public abstract IndexedField.Builder<I, T> description(String description);
+
+ public abstract Builder<I, T> required(boolean required);
+
+ public Builder<I, T> required() {
+ required(true);
+ return this;
+ }
+
+ /** Allow reading the actual data from the index. */
+ public abstract Builder<I, T> stored(boolean stored);
+
+ public Builder<I, T> stored() {
+ stored(true);
+ return this;
+ }
+
+ abstract Builder<I, T> repeatable(boolean repeatable);
+
+ public abstract Builder<I, T> size(Optional<Integer> value);
+
+ public abstract Builder<I, T> size(Integer value);
+
+ public abstract Builder<I, T> getter(Getter<I, T> getter);
+
+ public abstract Builder<I, T> fieldSetter(Optional<Setter<I, T>> setter);
+
+ abstract TypeToken<T> fieldType();
+
+ public abstract Builder<I, T> fieldType(TypeToken<T> type);
+
+ public abstract Builder<I, T> protoConverter(
+ Optional<ProtoConverter<? extends MessageLite, ?>> value);
+
+ abstract IndexedField<I, T> autoBuild(); // not public
+
+ public final IndexedField<I, T> build() {
+ boolean isRepeatable = fieldType().isSubtypeOf(Iterable.class);
+ repeatable(isRepeatable);
+ IndexedField<I, T> field = autoBuild();
+ checkName(field.name());
+ checkArgument(!field.size().isPresent() || field.size().get() > 0);
+ return field;
+ }
+
+ public final IndexedField<I, T> build(Getter<I, T> getter, Setter<I, T> setter) {
+ return this.getter(getter).fieldSetter(Optional.of(setter)).build();
+ }
+
+ public final IndexedField<I, T> build(
+ Getter<I, T> getter,
+ Setter<I, T> setter,
+ ProtoConverter<? extends MessageLite, ?> protoConverter) {
+ return this.getter(getter)
+ .fieldSetter(Optional.of(setter))
+ .protoConverter(Optional.of(protoConverter))
+ .build();
+ }
+
+ public final IndexedField<I, T> build(Getter<I, T> getter) {
+ return this.getter(getter).fieldSetter(Optional.empty()).build();
+ }
+
+ private static String checkName(String name) {
+ String allowedCharacters = "abcdefghijklmnopqrstuvwxyz0123456789_";
+ CharMatcher m = CharMatcher.anyOf(allowedCharacters + allowedCharacters.toUpperCase());
+ checkArgument(name != null && m.matchesAllOf(name), "illegal field name: %s", name);
+ return name;
+ }
+ }
+
+ private Map<String, SearchSpec> searchSpecs = new HashMap<>();
+
+ /** The name to store this field under. */
+ public abstract String name();
+
+ /** Optional description of the field data. */
+ public abstract Optional<String> description();
+
+ /** True if this field is mandatory. Default is false. */
+ public abstract boolean required();
+
+ /** Allow reading the actual data from the index. Default is false. */
+ public abstract boolean stored();
+
+ /** True if this field is repeatable. */
+ public abstract boolean repeatable();
+
+ /**
+ * Optional size constrain on the field. The size is not constrained if this property is {@link
+ * Optional#empty()}
+ */
+ public abstract Optional<Integer> size();
+
+ /** See {@link Getter} */
+ public abstract Getter<I, T> getter();
+
+ /** See {@link Setter} */
+ public abstract Optional<Setter<I, T>> fieldSetter();
+
+ /**
+ * The {@link TypeToken} describing the contents of the field. See static constants for the common
+ * supported types.
+ *
+ * @return {@link TypeToken} of this field.
+ */
+ public abstract TypeToken<T> fieldType();
+
+ /** If the {@link #fieldType()} is proto, the converter to use on byte/proto conversions. */
+ public abstract Optional<ProtoConverter<? extends MessageLite, ?>> protoConverter();
+
+ /**
+ * Returns all {@link SearchSpec}, enabled on this field.
+ *
+ * <p>Note: weather or not a search is supported by the index depends on {@link Schema} version.
+ */
+ public ImmutableMap<String, SearchSpec> getSearchSpecs() {
+ return ImmutableMap.copyOf(searchSpecs);
+ }
+
+ /**
+ * Get the field contents from the input object.
+ *
+ * @param input input object.
+ * @return the field value(s) to index.
+ */
+ @Nullable
+ public T get(I input) {
+ try {
+ return getter().get(input);
+ } catch (IOException e) {
+ throw new StorageException(e);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public boolean setIfPossible(I object, StoredValue doc) {
+ if (!fieldSetter().isPresent()) {
+ return false;
+ }
+
+ if (this.fieldType().equals(STRING_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asString());
+ return true;
+ } else if (this.fieldType().equals(ITERABLE_STRING_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asStrings());
+ return true;
+ } else if (this.fieldType().equals(INTEGER_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asInteger());
+ return true;
+ } else if (this.fieldType().equals(ITERABLE_INTEGER_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asIntegers());
+ return true;
+ } else if (this.fieldType().equals(LONG_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asLong());
+ return true;
+ } else if (this.fieldType().equals(ITERABLE_LONG_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asLongs());
+ return true;
+ } else if (this.fieldType().equals(BYTE_ARRAY_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asByteArray());
+ return true;
+ } else if (this.fieldType().equals(ITERABLE_BYTE_ARRAY_TYPE)) {
+ fieldSetter().get().set(object, (T) doc.asByteArrays());
+ return true;
+ } else if (this.fieldType().equals(TIMESTAMP_TYPE)) {
+ checkState(!repeatable(), "can't repeat timestamp values");
+ fieldSetter().get().set(object, (T) doc.asTimestamp());
+ return true;
+ } else if (isProtoType()) {
+ MessageLite proto = doc.asProto();
+ if (proto != null) {
+ fieldSetter().get().set(object, (T) proto);
+ return true;
+ }
+ byte[] bytes = doc.asByteArray();
+ if (bytes != null && protoConverter().isPresent()) {
+ fieldSetter().get().set(object, (T) parseProtoFrom(bytes));
+ return true;
+ }
+ } else if (isProtoIterableType()) {
+ Iterable<MessageLite> protos = doc.asProtos();
+ if (protos != null) {
+ fieldSetter().get().set(object, (T) protos);
+ return true;
+ }
+ Iterable<byte[]> bytes = doc.asByteArrays();
+ if (bytes != null && protoConverter().isPresent()) {
+ fieldSetter().get().set(object, (T) decodeProtos(bytes));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** Returns true if the {@link #fieldType} is a proto message. */
+ public boolean isProtoType() {
+ if (repeatable()) {
+ return false;
+ }
+ return MESSAGE_TYPE.isSupertypeOf(fieldType());
+ }
+
+ /** Returns true if the {@link #fieldType} is a list of proto messages. */
+ public boolean isProtoIterableType() {
+ if (!repeatable()) {
+ return false;
+ }
+ if (!(fieldType().getType() instanceof ParameterizedType)) {
+ return false;
+ }
+ ParameterizedType parameterizedType = (ParameterizedType) fieldType().getType();
+ if (parameterizedType.getActualTypeArguments().length != 1) {
+ return false;
+ }
+ Type type = parameterizedType.getActualTypeArguments()[0];
+ return MESSAGE_TYPE.isSupertypeOf(type);
+ }
+
+ private ImmutableList<MessageLite> decodeProtos(Iterable<byte[]> raw) {
+ return StreamSupport.stream(raw.spliterator(), false)
+ .map(bytes -> parseProtoFrom(bytes))
+ .collect(toImmutableList());
+ }
+
+ private MessageLite parseProtoFrom(byte[] bytes) {
+ return Protos.parseUnchecked(protoConverter().get().getParser(), bytes);
+ }
+}
diff --git a/java/com/google/gerrit/index/Schema.java b/java/com/google/gerrit/index/Schema.java
index 91c3f70..403be35 100644
--- a/java/com/google/gerrit/index/Schema.java
+++ b/java/com/google/gerrit/index/Schema.java
@@ -14,67 +14,134 @@
package com.google.gerrit.index;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.exceptions.StorageException;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
/** Specific version of a secondary index schema. */
public class Schema<T> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
public static class Builder<T> {
- private final List<FieldDef<T, ?>> fields = new ArrayList<>();
- private boolean useLegacyNumericFields;
+ private final List<SchemaField<T, ?>> searchFields = new ArrayList<>();
+ private final List<IndexedField<T, ?>> indexedFields = new ArrayList<>();
+
+ private Optional<Integer> version = Optional.empty();
+
+ public Builder<T> version(int version) {
+ this.version = Optional.of(version);
+ return this;
+ }
public Builder<T> add(Schema<T> schema) {
- this.fields.addAll(schema.getFields().values());
+ this.indexedFields.addAll(schema.getIndexFields().values());
+ this.searchFields.addAll(schema.getSchemaFields().values());
+ if (!version.isPresent()) {
+ version(schema.getVersion() + 1);
+ }
return this;
}
@SafeVarargs
public final Builder<T> add(FieldDef<T, ?>... fields) {
- this.fields.addAll(Arrays.asList(fields));
+ return add(ImmutableList.copyOf(fields));
+ }
+
+ public final Builder<T> add(ImmutableList<FieldDef<T, ?>> fields) {
+ this.searchFields.addAll(fields);
return this;
}
@SafeVarargs
public final Builder<T> remove(FieldDef<T, ?>... fields) {
- this.fields.removeAll(Arrays.asList(fields));
+ this.searchFields.removeAll(Arrays.asList(fields));
return this;
}
- public Builder<T> legacyNumericFields(boolean useLegacyNumericFields) {
- this.useLegacyNumericFields = useLegacyNumericFields;
+ @SafeVarargs
+ public final Builder<T> addSearchSpecs(IndexedField<T, ?>.SearchSpec... searchSpecs) {
+ return addSearchSpecs(ImmutableList.copyOf(searchSpecs));
+ }
+
+ public Builder<T> addSearchSpecs(ImmutableList<IndexedField<T, ?>.SearchSpec> searchSpecs) {
+ for (IndexedField<T, ?>.SearchSpec searchSpec : searchSpecs) {
+ checkArgument(
+ this.indexedFields.contains(searchSpec.getField()),
+ "%s spec can only be added to the schema that contains %s field",
+ searchSpec.getName(),
+ searchSpec.getField().name());
+ }
+ this.searchFields.addAll(searchSpecs);
+ return this;
+ }
+
+ @SafeVarargs
+ public final Builder<T> addIndexedFields(IndexedField<T, ?>... fields) {
+ return addIndexedFields(ImmutableList.copyOf(fields));
+ }
+
+ public Builder<T> addIndexedFields(ImmutableList<IndexedField<T, ?>> indexedFields) {
+ this.indexedFields.addAll(indexedFields);
+ return this;
+ }
+
+ @SafeVarargs
+ public final Builder<T> remove(IndexedField<T, ?>.SearchSpec... searchSpecs) {
+ this.searchFields.removeAll(Arrays.asList(searchSpecs));
+ return this;
+ }
+
+ @SafeVarargs
+ public final Builder<T> remove(IndexedField<T, ?>... indexedFields) {
+ for (IndexedField<T, ?> field : indexedFields) {
+ ImmutableMap<String, ? extends IndexedField<T, ?>.SearchSpec> searchSpecs =
+ field.getSearchSpecs();
+ checkArgument(
+ !searchSpecs.values().stream().anyMatch(this.searchFields::contains),
+ "Field %s can be only removed from schema after all of its searches are removed.",
+ field.name());
+ }
+ this.indexedFields.removeAll(Arrays.asList(indexedFields));
return this;
}
public Schema<T> build() {
- return new Schema<>(useLegacyNumericFields, ImmutableList.copyOf(fields));
+ checkState(version.isPresent());
+ return new Schema<>(
+ version.get(), ImmutableList.copyOf(indexedFields), ImmutableList.copyOf(searchFields));
}
}
public static class Values<T> {
- private final FieldDef<T, ?> field;
+ private final SchemaField<T, ?> field;
private final Iterable<?> values;
- private Values(FieldDef<T, ?> field, Iterable<?> values) {
+ private Values(SchemaField<T, ?> field, Iterable<?> values) {
this.field = field;
this.values = values;
}
- public FieldDef<T, ?> getField() {
+ public SchemaField<T, ?> getField() {
return field;
}
@@ -83,59 +150,67 @@
}
}
- private static <T> FieldDef<T, ?> checkSame(FieldDef<T, ?> f1, FieldDef<T, ?> f2) {
+ private static <T> SchemaField<T, ?> checkSame(SchemaField<T, ?> f1, SchemaField<T, ?> f2) {
checkState(f1 == f2, "Mismatched %s fields: %s != %s", f1.getName(), f1, f2);
return f1;
}
- private final ImmutableMap<String, FieldDef<T, ?>> fields;
- private final ImmutableMap<String, FieldDef<T, ?>> storedFields;
- private final boolean useLegacyNumericFields;
+ private final ImmutableSet<String> storedFields;
+
+ private final ImmutableMap<String, SchemaField<T, ?>> schemaFields;
+ private final ImmutableMap<String, IndexedField<T, ?>> indexedFields;
private int version;
- public Schema(boolean useLegacyNumericFields, Iterable<FieldDef<T, ?>> fields) {
- this(0, useLegacyNumericFields, fields);
- }
-
- public Schema(int version, boolean useLegacyNumericFields, Iterable<FieldDef<T, ?>> fields) {
+ private Schema(
+ int version,
+ ImmutableList<IndexedField<T, ?>> indexedFields,
+ ImmutableList<SchemaField<T, ?>> schemaFields) {
this.version = version;
- ImmutableMap.Builder<String, FieldDef<T, ?>> b = ImmutableMap.builder();
- ImmutableMap.Builder<String, FieldDef<T, ?>> sb = ImmutableMap.builder();
- for (FieldDef<T, ?> f : fields) {
- b.put(f.getName(), f);
- if (f.isStored()) {
- sb.put(f.getName(), f);
- }
- }
- this.fields = b.build();
- this.storedFields = sb.build();
- this.useLegacyNumericFields = useLegacyNumericFields;
+
+ this.indexedFields =
+ indexedFields.stream().collect(toImmutableMap(IndexedField::name, Function.identity()));
+ this.schemaFields =
+ schemaFields.stream().collect(toImmutableMap(SchemaField::getName, Function.identity()));
+
+ Set<String> duplicateKeys =
+ Sets.intersection(this.schemaFields.keySet(), this.indexedFields.keySet());
+ checkArgument(
+ duplicateKeys.isEmpty(),
+ "DuplicateKeys found %s, indexFields:%s, schemaFields: %s",
+ duplicateKeys,
+ this.indexedFields.keySet(),
+ this.schemaFields.keySet());
+ this.storedFields =
+ schemaFields.stream()
+ .filter(SchemaField::isStored)
+ .map(SchemaField::getName)
+ .collect(toImmutableSet());
}
public final int getVersion() {
return version;
}
- public final boolean useLegacyNumericFields() {
- return useLegacyNumericFields;
- }
-
/**
* Get all fields in this schema.
*
* <p>This is primarily useful for iteration. Most callers should prefer one of the helper methods
- * {@link #getField(FieldDef, FieldDef...)} or {@link #hasField(FieldDef)} to looking up fields by
- * name
+ * {@link #getField(SchemaField, SchemaField...)} or {@link #hasField(SchemaField)} to looking up
+ * fields by name
*
* @return all fields in this schema indexed by name.
*/
- public final ImmutableMap<String, FieldDef<T, ?>> getFields() {
- return fields;
+ public final ImmutableMap<String, SchemaField<T, ?>> getSchemaFields() {
+ return ImmutableMap.copyOf(schemaFields);
+ }
+
+ public final ImmutableMap<String, IndexedField<T, ?>> getIndexFields() {
+ return indexedFields;
}
/** Returns all fields in this schema where {@link FieldDef#isStored()} is true. */
- public final ImmutableMap<String, FieldDef<T, ?>> getStoredFields() {
+ public final ImmutableSet<String> getStoredFields() {
return storedFields;
}
@@ -148,13 +223,14 @@
* absent if no field matches.
*/
@SafeVarargs
- public final Optional<FieldDef<T, ?>> getField(FieldDef<T, ?> first, FieldDef<T, ?>... rest) {
- FieldDef<T, ?> field = fields.get(first.getName());
+ public final Optional<SchemaField<T, ?>> getField(
+ SchemaField<T, ?> first, SchemaField<T, ?>... rest) {
+ SchemaField<T, ?> field = getSchemaField(first);
if (field != null) {
return Optional.of(checkSame(field, first));
}
- for (FieldDef<T, ?> f : rest) {
- field = fields.get(f.getName());
+ for (SchemaField<T, ?> f : rest) {
+ field = getSchemaField(first);
if (field != null) {
return Optional.of(checkSame(field, f));
}
@@ -168,8 +244,8 @@
* @param field field to look up.
* @return whether the field is present.
*/
- public final boolean hasField(FieldDef<T, ?> field) {
- FieldDef<T, ?> f = fields.get(field.getName());
+ public final boolean hasField(SchemaField<T, ?> field) {
+ SchemaField<T, ?> f = getSchemaField(field);
if (f == null) {
return false;
}
@@ -177,7 +253,20 @@
return true;
}
- private Values<T> fieldValues(T obj, FieldDef<T, ?> f, ImmutableSet<String> skipFields) {
+ public final boolean hasField(String fieldName) {
+ return this.getSchemaField(fieldName) != null;
+ }
+
+ private SchemaField<T, ?> getSchemaField(SchemaField<T, ?> field) {
+ return getSchemaField(field.getName());
+ }
+
+ public SchemaField<T, ?> getSchemaField(String fieldName) {
+ return schemaFields.get(fieldName);
+ }
+
+ private @Nullable Values<T> fieldValues(
+ T obj, SchemaField<T, ?> f, ImmutableSet<String> skipFields) {
if (skipFields.contains(f.getName())) {
return null;
}
@@ -215,10 +304,11 @@
*/
public final Iterable<Values<T>> buildFields(T obj, ImmutableSet<String> skipFields) {
try {
- return fields.values().stream()
+ return schemaFields.values().stream()
.map(f -> fieldValues(obj, f, skipFields))
.filter(Objects::nonNull)
.collect(toImmutableList());
+
} catch (StorageException e) {
return ImmutableList.of();
}
@@ -226,10 +316,9 @@
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).addValue(fields.keySet()).toString();
- }
-
- public void setVersion(int version) {
- this.version = version;
+ return MoreObjects.toStringHelper(this)
+ .addValue(indexedFields.keySet())
+ .addValue(schemaFields.keySet())
+ .toString();
}
}
diff --git a/java/com/google/gerrit/index/SchemaDefinitions.java b/java/com/google/gerrit/index/SchemaDefinitions.java
index e8efd22..4e58d91 100644
--- a/java/com/google/gerrit/index/SchemaDefinitions.java
+++ b/java/com/google/gerrit/index/SchemaDefinitions.java
@@ -42,6 +42,7 @@
return name;
}
+ /** Returns all schemas sorted by version (ascending). */
public final ImmutableSortedMap<Integer, Schema<V>> getSchemas() {
return schemas;
}
diff --git a/java/com/google/gerrit/index/SchemaFieldDefs.java b/java/com/google/gerrit/index/SchemaFieldDefs.java
new file mode 100644
index 0000000..e0b5dd2
--- /dev/null
+++ b/java/com/google/gerrit/index/SchemaFieldDefs.java
@@ -0,0 +1,103 @@
+// Copyright (C) 2022 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.index;
+
+import com.google.gerrit.common.Nullable;
+import java.io.IOException;
+
+/** Interfaces that define properties of fields in {@link Schema}. */
+public class SchemaFieldDefs {
+
+ /**
+ * Definition of a field stored in the secondary index.
+ *
+ * <p>{@link SchemaField}-s must not be changed once introduced to the codebase. Instead, a new
+ * FieldDef must be added and the old one removed from the schema (in two upgrade steps, see
+ * {@code com.google.gerrit.index.IndexUpgradeValidator}).
+ *
+ * @param <I> input type from which documents are created and search results are returned.
+ * @param <T> type that should be extracted from the input object when converting to an index
+ * document.
+ */
+ public interface SchemaField<T, I> {
+
+ /** Returns whether the field should be stored in the index. */
+ boolean isStored();
+
+ /** Returns whether the field is repeatable. */
+ boolean isRepeatable();
+
+ /**
+ * Get the field contents from the input object.
+ *
+ * @param input input object.
+ * @return the field value(s) to index.
+ */
+ @Nullable
+ I get(T input);
+
+ /** Returns the name of the field. */
+ String getName();
+
+ /**
+ * Returns type of the field; for repeatable fields, the inner type, not the iterable type.
+ * TODO(mariasavtchuk): remove after migrating to the new field formats
+ */
+ FieldType<?> getType();
+
+ /**
+ * Set the field contents back to an object. Used to reconstruct fields from indexed values.
+ * No-op if the field can't be reconstructed.
+ *
+ * @param object input object.
+ * @param doc indexed document
+ * @return {@code true} if the field was set, {@code false} otherwise
+ */
+ boolean setIfPossible(T object, StoredValue doc);
+ }
+
+ /**
+ * Getter to extract value that should be stored in index from the input object.
+ *
+ * <p>This interface allows to specify a method or lambda for populating an index field. Note that
+ * for existing fields, changing the code of either the {@link Getter} implementation or the
+ * method(s) that it calls would invalidate existing index data. Therefore, instead of changing
+ * the semantics of an existing field, a new field must be added using the new semantics from the
+ * start. The old field can be removed in another upgrade step (cf. {@code
+ * com.google.gerrit.index.IndexUpgradeValidator}).
+ *
+ * @param <I> type from which documents are created and search results are returned.
+ * @param <T> type that should be extracted from the input object to an index field.
+ */
+ @FunctionalInterface
+ public interface Getter<I, T> {
+ @Nullable
+ T get(I input) throws IOException;
+ }
+
+ /**
+ * Setter to reconstruct fields from indexed values back to an object.
+ *
+ * <p>See {@link Getter} for restrictions on changing the implementation.
+ *
+ * @param <I> type from which documents are created and search results are returned.
+ * @param <T> type that should be extracted from the input object when converting toto an index
+ * field.
+ */
+ @FunctionalInterface
+ public interface Setter<I, T> {
+ void set(I object, T value);
+ }
+}
diff --git a/java/com/google/gerrit/index/SchemaUtil.java b/java/com/google/gerrit/index/SchemaUtil.java
index 9599d6a..8f47cf5 100644
--- a/java/com/google/gerrit/index/SchemaUtil.java
+++ b/java/com/google/gerrit/index/SchemaUtil.java
@@ -25,7 +25,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -49,7 +48,12 @@
@SuppressWarnings("unchecked")
Schema<V> schema = (Schema<V>) f.get(null);
checkArgument(f.getName().startsWith("V"));
- schema.setVersion(Integer.parseInt(f.getName().substring(1)));
+ int versionName = Integer.parseInt(f.getName().substring(1));
+ checkArgument(
+ versionName == schema.getVersion(),
+ "Schema version %s does not match its name %s",
+ schema.getVersion(),
+ f.getName());
schemas.put(schema.getVersion(), schema);
} catch (IllegalAccessException e) {
throw new IllegalArgumentException(e);
@@ -66,29 +70,56 @@
return ImmutableSortedMap.copyOf(schemas);
}
- public static <V> Schema<V> schema(Collection<FieldDef<V, ?>> fields) {
- return new Schema<>(true, ImmutableList.copyOf(fields));
+ @SafeVarargs
+ public static <V> Schema<V> schema(FieldDef<V, ?>... fields) {
+ return new Schema.Builder<V>().version(0).add(fields).build();
}
- public static <V> Schema<V> schema(Schema<V> schema, boolean useLegacyNumericFields) {
- return new Schema<>(
- useLegacyNumericFields,
- new ImmutableList.Builder<FieldDef<V, ?>>().addAll(schema.getFields().values()).build());
+ @SafeVarargs
+ public static <V> Schema<V> schema(int version, FieldDef<V, ?>... fields) {
+ return new Schema.Builder<V>().version(version).add(fields).build();
+ }
+
+ public static <V> Schema<V> schema(int version, ImmutableList<FieldDef<V, ?>> fields) {
+ return new Schema.Builder<V>().version(version).add(fields).build();
}
@SafeVarargs
public static <V> Schema<V> schema(Schema<V> schema, FieldDef<V, ?>... moreFields) {
- return new Schema<>(
- true,
- new ImmutableList.Builder<FieldDef<V, ?>>()
- .addAll(schema.getFields().values())
- .addAll(ImmutableList.copyOf(moreFields))
- .build());
+ return new Schema.Builder<V>().add(schema).add(moreFields).build();
}
- @SafeVarargs
- public static <V> Schema<V> schema(FieldDef<V, ?>... fields) {
- return new Schema<>(true, ImmutableList.copyOf(fields));
+ public static <V> Schema<V> schema(
+ int version,
+ ImmutableList<FieldDef<V, ?>> fieldDefs,
+ ImmutableList<IndexedField<V, ?>> indexedFields,
+ ImmutableList<IndexedField<V, ?>.SearchSpec> searchSpecs) {
+ return new Schema.Builder<V>()
+ .version(version)
+ .add(fieldDefs)
+ .addIndexedFields(indexedFields)
+ .addSearchSpecs(searchSpecs)
+ .build();
+ }
+
+ public static <V> Schema<V> schema(
+ Schema<V> schema,
+ ImmutableList<FieldDef<V, ?>> fieldDefs,
+ ImmutableList<IndexedField<V, ?>> indexedFields,
+ ImmutableList<IndexedField<V, ?>.SearchSpec> searchSpecs) {
+ return new Schema.Builder<V>()
+ .add(schema)
+ .add(fieldDefs)
+ .addIndexedFields(indexedFields)
+ .addSearchSpecs(searchSpecs)
+ .build();
+ }
+
+ public static <V> Schema<V> schema(
+ ImmutableList<FieldDef<V, ?>> fieldDefs,
+ ImmutableList<IndexedField<V, ?>> indexFields,
+ ImmutableList<IndexedField<V, ?>.SearchSpec> searchSpecs) {
+ return schema(/* version= */ 0, fieldDefs, indexFields, searchSpecs);
}
public static Set<String> getPersonParts(PersonIdent person) {
diff --git a/java/com/google/gerrit/index/SearchOption.java b/java/com/google/gerrit/index/SearchOption.java
new file mode 100644
index 0000000..3fbb68a
--- /dev/null
+++ b/java/com/google/gerrit/index/SearchOption.java
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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.index;
+
+/** Tokenization options enabled on {@link IndexedField}. */
+public enum SearchOption {
+ /** Enables range queries on the field. */
+ RANGE,
+ /** Enables prefix-match search on the field. */
+ PREFIX,
+ /** Enables exact-match search on the field. */
+ EXACT,
+ /** Enables fuzzy-match search on the field. */
+ FULL_TEXT,
+ /** The field can not be searched and is only returned as a payload from the index. */
+ STORE_ONLY,
+}
diff --git a/java/com/google/gerrit/index/StoredValue.java b/java/com/google/gerrit/index/StoredValue.java
index fe790c5..a7e7c26 100644
--- a/java/com/google/gerrit/index/StoredValue.java
+++ b/java/com/google/gerrit/index/StoredValue.java
@@ -14,6 +14,8 @@
package com.google.gerrit.index;
+import com.google.gerrit.common.Nullable;
+import com.google.protobuf.MessageLite;
import java.sql.Timestamp;
/**
@@ -47,4 +49,22 @@
/** Returns the {@code byte[]} values of the field. */
Iterable<byte[]> asByteArrays();
+
+ /**
+ * Returns the {@code MessageLite} value of the field.
+ *
+ * <p>Returns {@code null} if value is not stored as protos (e.g. stored as bytes). {@link
+ * #asByteArray} can be called instead to obtain the value.
+ */
+ @Nullable
+ MessageLite asProto();
+
+ /**
+ * Returns the {@code MessageLite} values of the field.
+ *
+ * <p>Returns {@code null} if value is not stored as protos (e.g. stored as bytes). {@link
+ * #asByteArrays} can be called instead to obtain the value.
+ */
+ @Nullable
+ Iterable<MessageLite> asProtos();
}
diff --git a/java/com/google/gerrit/index/project/ProjectField.java b/java/com/google/gerrit/index/project/ProjectField.java
index c2c8986..3114b4c 100644
--- a/java/com/google/gerrit/index/project/ProjectField.java
+++ b/java/com/google/gerrit/index/project/ProjectField.java
@@ -26,7 +26,12 @@
import com.google.gerrit.index.RefState;
import com.google.gerrit.index.SchemaUtil;
-/** Index schema for projects. */
+/**
+ * Index schema for projects.
+ *
+ * <p>Note that this class does not override {@link Object#equals(Object)}. It relies on instances
+ * being singletons so that the default (i.e. reference) comparison works.
+ */
public class ProjectField {
private static byte[] toRefState(Project project) {
return RefState.create(RefNames.REFS_CONFIG, project.getConfigRefState())
diff --git a/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java b/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java
index 3cc5f9b..0619566 100644
--- a/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java
+++ b/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java
@@ -19,12 +19,18 @@
import com.google.gerrit.index.Schema;
import com.google.gerrit.index.SchemaDefinitions;
-/** Definition of project index versions (schemata). See {@link SchemaDefinitions}. */
+/**
+ * Definition of project index versions (schemata). See {@link SchemaDefinitions}.
+ *
+ * <p>Upgrades are subject to constraints, see {@code
+ * com.google.gerrit.index.IndexUpgradeValidator}.
+ */
public class ProjectSchemaDefinitions extends SchemaDefinitions<ProjectData> {
@Deprecated
static final Schema<ProjectData> V1 =
schema(
+ /* version= */ 1,
ProjectField.NAME,
ProjectField.DESCRIPTION,
ProjectField.PARENT_NAME,
@@ -38,7 +44,10 @@
@Deprecated static final Schema<ProjectData> V3 = schema(V2);
// Lucene index was changed to add an additional field for sorting.
- static final Schema<ProjectData> V4 = schema(V3);
+ @Deprecated static final Schema<ProjectData> V4 = schema(V3);
+
+ // Upgrade Lucene to 7.x requires reindexing.
+ static final Schema<ProjectData> V5 = schema(V4);
/**
* Name of the project index to be used when contacting index backends or loading configurations.
diff --git a/java/com/google/gerrit/index/query/FieldBundle.java b/java/com/google/gerrit/index/query/FieldBundle.java
index 6ecb6e6..60881df 100644
--- a/java/com/google/gerrit/index/query/FieldBundle.java
+++ b/java/com/google/gerrit/index/query/FieldBundle.java
@@ -19,7 +19,7 @@
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
-import com.google.gerrit.index.FieldDef;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
/** FieldBundle is an abstraction that allows retrieval of raw values from different sources. */
public class FieldBundle {
@@ -34,8 +34,8 @@
/**
* Get a field's value based on the field definition.
*
- * @param fieldDef the definition of the field of which the value should be retrieved. The field
- * must be stored and contained in the result set as specified by {@link
+ * @param schemaField the definition of the field of which the value should be retrieved. The
+ * field must be stored and contained in the result set as specified by {@link
* com.google.gerrit.index.QueryOptions}.
* @param <T> Data type of the returned object based on the field definition
* @return Either a single element or an Iterable based on the field definition. An empty list is
@@ -44,16 +44,16 @@
* check is only enforced on non-repeatable fields.
*/
@SuppressWarnings("unchecked")
- public <T> T getValue(FieldDef<?, T> fieldDef) {
- checkArgument(fieldDef.isStored(), "Field must be stored");
+ public <T> T getValue(SchemaField<?, T> schemaField) {
+ checkArgument(schemaField.isStored(), "Field must be stored");
checkArgument(
- fields.containsKey(fieldDef.getName()) || fieldDef.isRepeatable(),
+ fields.containsKey(schemaField.getName()) || schemaField.isRepeatable(),
"Field %s is not in result set %s",
- fieldDef.getName(),
+ schemaField.getName(),
fields.keySet());
- Iterable<Object> result = fields.get(fieldDef.getName());
- if (fieldDef.isRepeatable()) {
+ Iterable<Object> result = fields.get(schemaField.getName());
+ if (schemaField.isRepeatable()) {
return (T) result;
}
return (T) Iterables.getOnlyElement(result);
diff --git a/java/com/google/gerrit/index/query/IndexPredicate.java b/java/com/google/gerrit/index/query/IndexPredicate.java
index b65fb96..de81c47 100644
--- a/java/com/google/gerrit/index/query/IndexPredicate.java
+++ b/java/com/google/gerrit/index/query/IndexPredicate.java
@@ -21,8 +21,8 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.FieldType;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import java.util.Objects;
import java.util.Set;
import java.util.stream.StreamSupport;
@@ -37,19 +37,19 @@
*/
private static final Splitter FULL_TEXT_SPLITTER = Splitter.on(CharMatcher.anyOf(" ,.-:\\/_=\n"));
- private final FieldDef<I, ?> def;
+ private final SchemaField<I, ?> def;
- protected IndexPredicate(FieldDef<I, ?> def, String value) {
+ protected IndexPredicate(SchemaField<I, ?> def, String value) {
super(def.getName(), value);
this.def = def;
}
- protected IndexPredicate(FieldDef<I, ?> def, String name, String value) {
+ protected IndexPredicate(SchemaField<I, ?> def, String name, String value) {
super(name, value);
this.def = def;
}
- public FieldDef<I, ?> getField() {
+ public SchemaField<I, ?> getField() {
return def;
}
diff --git a/java/com/google/gerrit/index/query/QueryProcessor.java b/java/com/google/gerrit/index/query/QueryProcessor.java
index 21d4c2e..959694b 100644
--- a/java/com/google/gerrit/index/query/QueryProcessor.java
+++ b/java/com/google/gerrit/index/query/QueryProcessor.java
@@ -367,7 +367,7 @@
return requestedFields;
}
Index<?, T> index = indexes.getSearchIndex();
- return index != null ? index.getSchema().getStoredFields().keySet() : ImmutableSet.of();
+ return index != null ? index.getSchema().getStoredFields() : ImmutableSet.of();
}
/**
diff --git a/java/com/google/gerrit/index/query/TooManyTermsInQueryException.java b/java/com/google/gerrit/index/query/TooManyTermsInQueryException.java
index b0a394e..9158a39 100644
--- a/java/com/google/gerrit/index/query/TooManyTermsInQueryException.java
+++ b/java/com/google/gerrit/index/query/TooManyTermsInQueryException.java
@@ -14,16 +14,24 @@
package com.google.gerrit.index.query;
+import com.google.gerrit.common.UsedAt;
+
public class TooManyTermsInQueryException extends QueryParseException {
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "too many terms in query";
+ @UsedAt(UsedAt.Project.GOOGLE)
public TooManyTermsInQueryException() {
super(MESSAGE);
}
+ @UsedAt(UsedAt.Project.GOOGLE)
public TooManyTermsInQueryException(Throwable why) {
super(MESSAGE, why);
}
+
+ public TooManyTermsInQueryException(int numTerms, int maxConfiguredTerms) {
+ super(MESSAGE + String.format(": %d terms (max = %d)", numTerms, maxConfiguredTerms));
+ }
}
diff --git a/java/com/google/gerrit/index/testing/AbstractFakeIndex.java b/java/com/google/gerrit/index/testing/AbstractFakeIndex.java
index 4241828..50efef0 100644
--- a/java/com/google/gerrit/index/testing/AbstractFakeIndex.java
+++ b/java/com/google/gerrit/index/testing/AbstractFakeIndex.java
@@ -25,10 +25,10 @@
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.InternalGroup;
import com.google.gerrit.entities.Project;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.Index;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.project.ProjectData;
import com.google.gerrit.index.project.ProjectIndex;
import com.google.gerrit.index.query.DataSource;
@@ -165,7 +165,7 @@
K searchAfter = null;
for (V result : results) {
ImmutableListMultimap.Builder<String, Object> fields = ImmutableListMultimap.builder();
- for (FieldDef<V, ?> field : getSchema().getFields().values()) {
+ for (SchemaField<V, ?> field : getSchema().getSchemaFields().values()) {
if (field.get(result) == null) {
continue;
}
@@ -249,7 +249,7 @@
@Override
protected Map<String, Object> docFor(ChangeData value) {
ImmutableMap.Builder<String, Object> doc = ImmutableMap.builder();
- for (FieldDef<ChangeData, ?> field : getSchema().getFields().values()) {
+ for (SchemaField<ChangeData, ?> field : getSchema().getSchemaFields().values()) {
if (ChangeField.MERGEABLE.getName().equals(field.getName()) && skipMergable) {
continue;
}
@@ -267,7 +267,7 @@
changeDataFactory.create(
Project.nameKey((String) doc.get(ChangeField.PROJECT.getName())),
Change.id(Integer.valueOf((String) doc.get(ChangeField.LEGACY_ID_STR.getName()))));
- for (FieldDef<ChangeData, ?> field : getSchema().getFields().values()) {
+ for (SchemaField<ChangeData, ?> field : getSchema().getSchemaFields().values()) {
field.setIfPossible(cd, new FakeStoredValue(doc.get(field.getName())));
}
return cd;
diff --git a/java/com/google/gerrit/index/testing/BUILD b/java/com/google/gerrit/index/testing/BUILD
index a30eaca..9af2598 100644
--- a/java/com/google/gerrit/index/testing/BUILD
+++ b/java/com/google/gerrit/index/testing/BUILD
@@ -23,5 +23,6 @@
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
+ "//proto:entities_java_proto",
],
)
diff --git a/java/com/google/gerrit/index/testing/FakeStoredValue.java b/java/com/google/gerrit/index/testing/FakeStoredValue.java
index 5091068..133e0ab 100644
--- a/java/com/google/gerrit/index/testing/FakeStoredValue.java
+++ b/java/com/google/gerrit/index/testing/FakeStoredValue.java
@@ -14,15 +14,29 @@
package com.google.gerrit.index.testing;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.index.StoredValue;
+import com.google.protobuf.MessageLite;
import java.sql.Timestamp;
/** Bridge to recover fields from the fake index. */
public class FakeStoredValue implements StoredValue {
private final Object field;
+ /**
+ * Some index implementations store protos, some convert them to bytes first.
+ *
+ * <p>This property is true if field is stored in proto format.
+ */
+ private final boolean isProto;
public FakeStoredValue(Object field) {
this.field = field;
+ this.isProto = false;
+ }
+
+ public FakeStoredValue(Object field, boolean isProto) {
+ this.field = field;
+ this.isProto = isProto;
}
@Override
@@ -69,6 +83,25 @@
}
@Override
+ @Nullable
+ public MessageLite asProto() {
+ if (isProto) {
+ return (MessageLite) field;
+ }
+ return null;
+ }
+
+ @Override
+ @Nullable
+ @SuppressWarnings("unchecked")
+ public Iterable<MessageLite> asProtos() {
+ if (isProto) {
+ return (Iterable<MessageLite>) field;
+ }
+ return null;
+ }
+
+ @Override
@SuppressWarnings("unchecked")
public Iterable<byte[]> asByteArrays() {
return (Iterable<byte[]>) field;
diff --git a/java/com/google/gerrit/index/testing/TestIndexedFields.java b/java/com/google/gerrit/index/testing/TestIndexedFields.java
new file mode 100644
index 0000000..f80b8a1
--- /dev/null
+++ b/java/com/google/gerrit/index/testing/TestIndexedFields.java
@@ -0,0 +1,209 @@
+// Copyright (C) 2022 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.index.testing;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gerrit.entities.converter.ChangeProtoConverter;
+import com.google.gerrit.index.IndexedField;
+import com.google.gerrit.index.SchemaFieldDefs.Getter;
+import com.google.gerrit.index.SchemaFieldDefs.Setter;
+import com.google.gerrit.proto.Entities;
+import com.google.gerrit.proto.Entities.Change;
+import com.google.gerrit.proto.Entities.Change_Id;
+import java.io.IOException;
+import java.sql.Timestamp;
+
+/**
+ * Collection of {@link IndexedField}, used in unit tests.
+ *
+ * <p>The list of {@link IndexedField} below are field types, that are currently supported and used
+ * in different index implementations
+ *
+ * <p>They are used in unit tests to make sure these types can be extracted to index and assigned
+ * back to object.
+ */
+public final class TestIndexedFields {
+
+ /** Test input object for {@link IndexedField} */
+ public static class TestIndexedData {
+
+ /** Key that is used to index to identify indexed object */
+ private Object key;
+
+ /** Field value that is extracted from this indexed object to the index document. */
+ private Object testFieldValue;
+
+ public Object getTestField() {
+ return testFieldValue;
+ }
+
+ public void setTestFieldValue(Object testFieldValue) {
+ this.testFieldValue = testFieldValue;
+ }
+
+ public Object getKey() {
+ return key;
+ }
+
+ public void setKey(Object key) {
+ this.key = key;
+ }
+ }
+
+ /** Setter for {@link TestIndexedData} */
+ private static class TestIndexedDataSetter<T> implements Setter<TestIndexedData, T> {
+ @Override
+ public void set(TestIndexedData testIndexedData, T value) {
+ testIndexedData.setTestFieldValue(value);
+ }
+ }
+
+ /** Getter for {@link TestIndexedData} */
+ @SuppressWarnings("unchecked")
+ private static class TestIndexedDataGetter<T> implements Getter<TestIndexedData, T> {
+ @Override
+ public T get(TestIndexedData input) throws IOException {
+ return (T) input.getTestField();
+ }
+ }
+
+ public static <T> TestIndexedDataSetter<T> setter() {
+ return new TestIndexedDataSetter<>();
+ }
+
+ public static <T> TestIndexedDataGetter<T> getter() {
+ return new TestIndexedDataGetter<>();
+ }
+
+ public static final IndexedField<TestIndexedData, Integer> INTEGER_FIELD =
+ IndexedField.<TestIndexedData>integerBuilder("IntegerTestField").build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, Integer>.SearchSpec INTEGER_FIELD_SPEC =
+ INTEGER_FIELD.integer("integer_test");
+
+ public static final IndexedField<TestIndexedData, Iterable<Integer>> ITERABLE_INTEGER_FIELD =
+ IndexedField.<TestIndexedData>iterableIntegerBuilder("IterableIntegerTestField")
+ .build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, Iterable<Integer>>.SearchSpec
+ ITERABLE_INTEGER_FIELD_SPEC = ITERABLE_INTEGER_FIELD.integer("iterable_integer_test");
+
+ public static final IndexedField<TestIndexedData, Integer> INTEGER_RANGE_FIELD =
+ IndexedField.<TestIndexedData>integerBuilder("IntegerRangeTestField")
+ .build(TestIndexedFields.getter(), TestIndexedFields.setter());
+ public static final IndexedField<TestIndexedData, Integer>.SearchSpec INTEGER_RANGE_FIELD_SPEC =
+ INTEGER_RANGE_FIELD.range("integer_range_test");
+
+ public static final IndexedField<TestIndexedData, Iterable<Integer>>
+ ITERABLE_INTEGER_RANGE_FIELD =
+ IndexedField.<TestIndexedData>iterableIntegerBuilder("IterableIntegerRangeTestField")
+ .build(TestIndexedFields.getter(), TestIndexedFields.setter());
+
+ public static final IndexedField<TestIndexedData, Iterable<Integer>>.SearchSpec
+ ITERABLE_INTEGER_RANGE_FIELD_SPEC =
+ ITERABLE_INTEGER_RANGE_FIELD.range("iterable_integer_range_test");
+
+ public static final IndexedField<TestIndexedData, Long> LONG_FIELD =
+ IndexedField.<TestIndexedData>longBuilder("LongTestField").build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, Long>.SearchSpec LONG_FIELD_SPEC =
+ LONG_FIELD.longSearch("long_test");
+
+ public static final IndexedField<TestIndexedData, Iterable<Long>> ITERABLE_LONG_FIELD =
+ IndexedField.<TestIndexedData, Iterable<Long>>builder(
+ "IterableLongTestField", IndexedField.ITERABLE_LONG_TYPE)
+ .build(TestIndexedFields.getter(), TestIndexedFields.setter());
+
+ public static final IndexedField<TestIndexedData, Iterable<Long>>.SearchSpec
+ ITERABLE_LONG_FIELD_SPEC = ITERABLE_LONG_FIELD.longSearch("iterable_long_test");
+
+ public static final IndexedField<TestIndexedData, Long> LONG_RANGE_FIELD =
+ IndexedField.<TestIndexedData>longBuilder("LongRangeTestField")
+ .build(TestIndexedFields.getter(), TestIndexedFields.setter());
+
+ public static final IndexedField<TestIndexedData, Long>.SearchSpec LONG_RANGE_FIELD_SPEC =
+ LONG_RANGE_FIELD.range("long_range_test");
+
+ public static final IndexedField<TestIndexedData, Iterable<Long>> ITERABLE_LONG_RANGE_FIELD =
+ IndexedField.<TestIndexedData, Iterable<Long>>builder(
+ "IterableLongRangeTestField", IndexedField.ITERABLE_LONG_TYPE)
+ .build(TestIndexedFields.getter(), TestIndexedFields.setter());
+
+ public static final IndexedField<TestIndexedData, Iterable<Long>>.SearchSpec
+ ITERABLE_LONG_RANGE_FIELD_SPEC = ITERABLE_LONG_RANGE_FIELD.range("iterable_long_range_test");
+
+ public static final IndexedField<TestIndexedData, Timestamp> TIMESTAMP_FIELD =
+ IndexedField.<TestIndexedData>timestampBuilder("TimestampTestField")
+ .build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, Timestamp>.SearchSpec TIMESTAMP_FIELD_SPEC =
+ TIMESTAMP_FIELD.timestamp("timestamp_test");
+
+ public static final IndexedField<TestIndexedData, Iterable<String>> ITERABLE_STRING_FIELD =
+ IndexedField.<TestIndexedData>iterableStringBuilder("IterableStringTestField")
+ .build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, Iterable<String>>.SearchSpec
+ ITERABLE_STRING_FIELD_SPEC = ITERABLE_STRING_FIELD.fullText("iterable_test_string");
+
+ public static final IndexedField<TestIndexedData, String> STRING_FIELD =
+ IndexedField.<TestIndexedData>stringBuilder("StringTestField").build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, String>.SearchSpec STRING_FIELD_SPEC =
+ STRING_FIELD.fullText("string_test");
+
+ public static final IndexedField<TestIndexedData, Iterable<byte[]>> ITERABLE_STORED_BYTE_FIELD =
+ IndexedField.<TestIndexedData>iterableByteArrayBuilder("IterableByteTestField")
+ .stored()
+ .build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, Iterable<byte[]>>.SearchSpec
+ ITERABLE_STORED_BYTE_SPEC = ITERABLE_STORED_BYTE_FIELD.storedOnly("iterable_byte_test");
+
+ public static final IndexedField<TestIndexedData, byte[]> STORED_BYTE_FIELD =
+ IndexedField.<TestIndexedData>byteArrayBuilder("ByteTestField")
+ .stored()
+ .build(getter(), setter());
+
+ public static final IndexedField<TestIndexedData, byte[]>.SearchSpec STORED_BYTE_SPEC =
+ STORED_BYTE_FIELD.storedOnly("byte_test");
+
+ public static final IndexedField<TestIndexedData, Entities.Change> STORED_PROTO_FIELD =
+ IndexedField.<TestIndexedData, Entities.Change>builder(
+ "TestChange", new TypeToken<Entities.Change>() {})
+ .stored()
+ .build(getter(), setter(), ChangeProtoConverter.INSTANCE);
+
+ public static final IndexedField<TestIndexedData, Entities.Change>.SearchSpec
+ STORED_PROTO_FIELD_SPEC = STORED_PROTO_FIELD.storedOnly("test_change");
+
+ public static final IndexedField<TestIndexedData, Iterable<Entities.Change>>
+ ITERABLE_STORED_PROTO_FIELD =
+ IndexedField.<TestIndexedData, Iterable<Entities.Change>>builder(
+ "IterableTestChange", new TypeToken<Iterable<Entities.Change>>() {})
+ .stored()
+ .build(getter(), setter(), ChangeProtoConverter.INSTANCE);
+
+ public static final IndexedField<TestIndexedData, Iterable<Entities.Change>>.SearchSpec
+ ITERABLE_PROTO_FIELD_SPEC = ITERABLE_STORED_PROTO_FIELD.storedOnly("iterable_test_change");
+
+ public static Change createChangeProto(int id) {
+ return Entities.Change.newBuilder()
+ .setChangeId(Change_Id.newBuilder().setId(id).build())
+ .build();
+ }
+
+ private TestIndexedFields() {}
+}
diff --git a/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
index 586887b..7b47248 100644
--- a/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
+++ b/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
@@ -33,12 +33,12 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.FieldType;
import com.google.gerrit.index.Index;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
import com.google.gerrit.index.Schema.Values;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.query.DataSource;
import com.google.gerrit.index.query.FieldBundle;
import com.google.gerrit.index.query.ListResultSet;
@@ -50,7 +50,6 @@
import com.google.gerrit.server.logging.LoggingContextAwareScheduledExecutorService;
import java.io.IOException;
import java.sql.Timestamp;
-import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
@@ -66,8 +65,6 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.IntPoint;
-import org.apache.lucene.document.LegacyIntField;
-import org.apache.lucene.document.LegacyLongField;
import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
@@ -88,11 +85,10 @@
import org.apache.lucene.store.Directory;
/** Basic Lucene index implementation. */
-@SuppressWarnings("deprecation")
public abstract class AbstractLuceneIndex<K, V> implements Index<K, V> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
- static String sortFieldName(FieldDef<?, ?> f) {
+ static String sortFieldName(SchemaField<?, ?> f) {
return f.getName() + "_SORT";
}
@@ -348,13 +344,9 @@
if (type == FieldType.INTEGER || type == FieldType.INTEGER_RANGE) {
for (Object value : values.getValues()) {
Integer intValue = (Integer) value;
- if (schema.useLegacyNumericFields()) {
- doc.add(new LegacyIntField(name, intValue, store));
- } else {
- doc.add(new IntPoint(name, intValue));
- if (store == Store.YES) {
- doc.add(new StoredField(name, intValue));
- }
+ doc.add(new IntPoint(name, intValue));
+ if (store == Store.YES) {
+ doc.add(new StoredField(name, intValue));
}
}
} else if (type == FieldType.LONG) {
@@ -383,22 +375,17 @@
}
private void addLongField(Document doc, String name, Store store, Long longValue) {
- if (schema.useLegacyNumericFields()) {
- doc.add(new LegacyLongField(name, longValue, store));
- } else {
- doc.add(new LongPoint(name, longValue));
- if (store == Store.YES) {
- doc.add(new StoredField(name, longValue));
- }
+ doc.add(new LongPoint(name, longValue));
+ if (store == Store.YES) {
+ doc.add(new StoredField(name, longValue));
}
}
protected FieldBundle toFieldBundle(Document doc) {
- Map<String, FieldDef<V, ?>> allFields = getSchema().getFields();
ListMultimap<String, Object> rawFields = ArrayListMultimap.create();
for (IndexableField field : doc.getFields()) {
- checkArgument(allFields.containsKey(field.name()), "Unrecognized field " + field.name());
- FieldType<?> type = allFields.get(field.name()).getType();
+ checkArgument(getSchema().hasField(field.name()), "Unrecognized field " + field.name());
+ FieldType<?> type = getSchema().getSchemaField(field.name()).getType();
if (type == FieldType.EXACT || type == FieldType.FULL_TEXT || type == FieldType.PREFIX) {
rawFields.put(field.name(), field.stringValue());
} else if (type == FieldType.INTEGER || type == FieldType.INTEGER_RANGE) {
@@ -416,7 +403,7 @@
return new FieldBundle(rawFields);
}
- private static Field.Store store(FieldDef<?, ?> f) {
+ private static Field.Store store(SchemaField<?, ?> f) {
return f.isStored() ? Field.Store.YES : Field.Store.NO;
}
diff --git a/java/com/google/gerrit/lucene/ChangeSubIndex.java b/java/com/google/gerrit/lucene/ChangeSubIndex.java
index 475dac4..ce50473 100644
--- a/java/com/google/gerrit/lucene/ChangeSubIndex.java
+++ b/java/com/google/gerrit/lucene/ChangeSubIndex.java
@@ -15,18 +15,17 @@
package com.google.gerrit.lucene;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.gerrit.lucene.LuceneChangeIndex.ID2_SORT_FIELD;
-import static com.google.gerrit.lucene.LuceneChangeIndex.ID_SORT_FIELD;
+import static com.google.gerrit.lucene.LuceneChangeIndex.ID_STR_SORT_FIELD;
import static com.google.gerrit.lucene.LuceneChangeIndex.MERGED_ON_SORT_FIELD;
import static com.google.gerrit.lucene.LuceneChangeIndex.UPDATED_SORT_FIELD;
import static com.google.gerrit.server.index.change.ChangeSchemaDefinitions.NAME;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
import com.google.gerrit.index.Schema.Values;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.query.DataSource;
import com.google.gerrit.index.query.FieldBundle;
import com.google.gerrit.index.query.Predicate;
@@ -119,13 +118,10 @@
@Override
void add(Document doc, Values<ChangeData> values) {
// Add separate DocValues fields for those fields needed for sorting.
- FieldDef<ChangeData, ?> f = values.getField();
- if (f == ChangeField.LEGACY_ID) {
- int v = (Integer) getOnlyElement(values.getValues());
- doc.add(new NumericDocValuesField(ID_SORT_FIELD, v));
- } else if (f == ChangeField.LEGACY_ID_STR) {
+ SchemaField<ChangeData, ?> f = values.getField();
+ if (f == ChangeField.LEGACY_ID_STR) {
String v = (String) getOnlyElement(values.getValues());
- doc.add(new NumericDocValuesField(ID2_SORT_FIELD, Integer.valueOf(v)));
+ doc.add(new NumericDocValuesField(ID_STR_SORT_FIELD, Integer.valueOf(v)));
} else if (f == ChangeField.UPDATED) {
long t = ((Timestamp) getOnlyElement(values.getValues())).getTime();
doc.add(new NumericDocValuesField(UPDATED_SORT_FIELD, t));
diff --git a/java/com/google/gerrit/lucene/LuceneAccountIndex.java b/java/com/google/gerrit/lucene/LuceneAccountIndex.java
index c4a5240..2e1771f 100644
--- a/java/com/google/gerrit/lucene/LuceneAccountIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneAccountIndex.java
@@ -15,18 +15,18 @@
package com.google.gerrit.lucene;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.gerrit.server.index.account.AccountField.FULL_NAME;
-import static com.google.gerrit.server.index.account.AccountField.ID;
-import static com.google.gerrit.server.index.account.AccountField.ID_STR;
-import static com.google.gerrit.server.index.account.AccountField.PREFERRED_EMAIL_EXACT;
+import static com.google.gerrit.server.index.account.AccountField.FULL_NAME_SPEC;
+import static com.google.gerrit.server.index.account.AccountField.ID_FIELD_SPEC;
+import static com.google.gerrit.server.index.account.AccountField.ID_STR_FIELD_SPEC;
+import static com.google.gerrit.server.index.account.AccountField.PREFERRED_EMAIL_EXACT_SPEC;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.entities.Account;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
import com.google.gerrit.index.Schema.Values;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.query.DataSource;
import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.index.query.QueryParseException;
@@ -50,9 +50,9 @@
import org.apache.lucene.search.SearcherFactory;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.BytesRef;
import org.eclipse.jgit.lib.Config;
@@ -60,19 +60,20 @@
implements AccountIndex {
private static final String ACCOUNTS = "accounts";
- private static final String FULL_NAME_SORT_FIELD = sortFieldName(FULL_NAME);
- private static final String EMAIL_SORT_FIELD = sortFieldName(PREFERRED_EMAIL_EXACT);
- private static final String ID_SORT_FIELD = sortFieldName(ID);
- private static final String ID2_SORT_FIELD = sortFieldName(ID_STR);
+ private static final String FULL_NAME_SORT_FIELD = sortFieldName(FULL_NAME_SPEC);
+ private static final String EMAIL_SORT_FIELD = sortFieldName(PREFERRED_EMAIL_EXACT_SPEC);
+ private static final String ID_SORT_FIELD = sortFieldName(ID_FIELD_SPEC);
+ private static final String ID2_SORT_FIELD = sortFieldName(ID_STR_FIELD_SPEC);
private static Term idTerm(boolean useLegacyNumericFields, AccountState as) {
return idTerm(useLegacyNumericFields, as.account().id());
}
private static Term idTerm(boolean useLegacyNumericFields, Account.Id id) {
- FieldDef<AccountState, ?> idField = useLegacyNumericFields ? ID : ID_STR;
+ SchemaField<AccountState, ?> idField =
+ useLegacyNumericFields ? ID_FIELD_SPEC : ID_STR_FIELD_SPEC;
if (useLegacyNumericFields) {
- return QueryBuilder.intTerm(idField.getName(), id.get());
+ return QueryBuilder.intTerm(idField.getName());
}
return QueryBuilder.stringTerm(idField.getName(), Integer.toString(id.get()));
}
@@ -84,7 +85,7 @@
private static Directory dir(Schema<AccountState> schema, Config cfg, SitePaths sitePaths)
throws IOException {
if (LuceneIndexModule.isInMemoryTest(cfg)) {
- return new RAMDirectory();
+ return new ByteBuffersDirectory();
}
Path indexDir = LuceneVersionManager.getDir(sitePaths, ACCOUNTS, schema);
return FSDirectory.open(indexDir);
@@ -117,17 +118,17 @@
@Override
void add(Document doc, Values<AccountState> values) {
// Add separate DocValues fields for those fields needed for sorting.
- FieldDef<AccountState, ?> f = values.getField();
- if (f == ID) {
+ SchemaField<AccountState, ?> f = values.getField();
+ if (f == ID_FIELD_SPEC) {
int v = (Integer) getOnlyElement(values.getValues());
doc.add(new NumericDocValuesField(ID_SORT_FIELD, v));
- } else if (f == ID_STR) {
+ } else if (f == ID_STR_FIELD_SPEC) {
String v = (String) getOnlyElement(values.getValues());
doc.add(new NumericDocValuesField(ID2_SORT_FIELD, Integer.valueOf(v)));
- } else if (f == FULL_NAME) {
+ } else if (f == FULL_NAME_SPEC) {
String value = (String) getOnlyElement(values.getValues());
doc.add(new SortedDocValuesField(FULL_NAME_SORT_FIELD, new BytesRef(value)));
- } else if (f == PREFERRED_EMAIL_EXACT) {
+ } else if (f == PREFERRED_EMAIL_EXACT_SPEC) {
String value = (String) getOnlyElement(values.getValues());
doc.add(new SortedDocValuesField(EMAIL_SORT_FIELD, new BytesRef(value)));
}
@@ -137,7 +138,7 @@
@Override
public void replace(AccountState as) {
try {
- replace(idTerm(getSchema().useLegacyNumericFields(), as), toDocument(as)).get();
+ replace(idTerm(getSchema().hasField(ID_FIELD_SPEC), as), toDocument(as)).get();
} catch (ExecutionException | InterruptedException e) {
throw new StorageException(e);
}
@@ -155,7 +156,7 @@
@Override
public void delete(Account.Id key) {
try {
- delete(idTerm(getSchema().useLegacyNumericFields(), key)).get();
+ delete(idTerm(getSchema().hasField(ID_FIELD_SPEC), key)).get();
} catch (ExecutionException | InterruptedException e) {
throw new StorageException(e);
}
@@ -164,15 +165,14 @@
@Override
public DataSource<AccountState> getSource(Predicate<AccountState> p, QueryOptions opts)
throws QueryParseException {
- queryBuilder.getSchema().useLegacyNumericFields();
return new LuceneQuerySource(
- opts.filterFields(o -> IndexUtils.accountFields(o, getSchema().useLegacyNumericFields())),
+ opts.filterFields(o -> IndexUtils.accountFields(o, getSchema().hasField(ID_FIELD_SPEC))),
queryBuilder.toQuery(p),
getSort());
}
private Sort getSort() {
- String idSortField = getSchema().useLegacyNumericFields() ? ID_SORT_FIELD : ID2_SORT_FIELD;
+ String idSortField = getSchema().hasField(ID_FIELD_SPEC) ? ID_SORT_FIELD : ID2_SORT_FIELD;
return new Sort(
new SortField(FULL_NAME_SORT_FIELD, SortField.Type.STRING, false),
new SortField(EMAIL_SORT_FIELD, SortField.Type.STRING, false),
@@ -181,10 +181,11 @@
@Override
protected AccountState fromDocument(Document doc) {
- FieldDef<AccountState, ?> idField = getSchema().useLegacyNumericFields() ? ID : ID_STR;
+ SchemaField<AccountState, ?> idField =
+ getSchema().hasField(ID_FIELD_SPEC) ? ID_STR_FIELD_SPEC : ID_STR_FIELD_SPEC;
Account.Id id =
Account.id(
- getSchema().useLegacyNumericFields()
+ getSchema().hasField(ID_FIELD_SPEC)
? doc.getField(idField.getName()).numericValue().intValue()
: Integer.valueOf(doc.getField(idField.getName()).stringValue()));
// Use the AccountCache rather than depending on any stored fields in the document (of which
diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index daa921c..c28e948b 100644
--- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -17,7 +17,6 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.gerrit.lucene.AbstractLuceneIndex.sortFieldName;
import static com.google.gerrit.server.git.QueueProvider.QueueType.INTERACTIVE;
-import static com.google.gerrit.server.index.change.ChangeField.LEGACY_ID;
import static com.google.gerrit.server.index.change.ChangeField.LEGACY_ID_STR;
import static com.google.gerrit.server.index.change.ChangeField.PROJECT;
import static com.google.gerrit.server.index.change.ChangeIndexRewriter.CLOSED_STATUSES;
@@ -39,10 +38,10 @@
import com.google.gerrit.entities.converter.ChangeProtoConverter;
import com.google.gerrit.entities.converter.ProtoConverter;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.PaginationType;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.query.FieldBundle;
import com.google.gerrit.index.query.HasCardinality;
import com.google.gerrit.index.query.Predicate;
@@ -89,7 +88,7 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopFieldDocs;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.util.BytesRef;
import org.eclipse.jgit.lib.Config;
@@ -105,30 +104,19 @@
static final String UPDATED_SORT_FIELD = sortFieldName(ChangeField.UPDATED);
static final String MERGED_ON_SORT_FIELD = sortFieldName(ChangeField.MERGED_ON);
- static final String ID_SORT_FIELD = sortFieldName(ChangeField.LEGACY_ID);
- static final String ID2_SORT_FIELD = sortFieldName(ChangeField.LEGACY_ID_STR);
+ static final String ID_STR_SORT_FIELD = sortFieldName(ChangeField.LEGACY_ID_STR);
private static final String CHANGES = "changes";
private static final String CHANGES_OPEN = "open";
private static final String CHANGES_CLOSED = "closed";
private static final String CHANGE_FIELD = ChangeField.CHANGE.getName();
- @FunctionalInterface
- interface IdTerm {
- Term get(String name, int id);
+ static Term idTerm(ChangeData cd) {
+ return idTerm(cd.getVirtualId());
}
- static Term idTerm(IdTerm idTerm, FieldDef<ChangeData, ?> idField, ChangeData cd) {
- return idTerm(idTerm, idField, cd.getId());
- }
-
- static Term idTerm(IdTerm idTerm, FieldDef<ChangeData, ?> idField, Change.Id id) {
- return idTerm.get(idField.getName(), id.get());
- }
-
- @FunctionalInterface
- interface ChangeIdExtractor {
- Change.Id extract(IndexableField f);
+ static Term idTerm(Change.Id id) {
+ return QueryBuilder.stringTerm(LEGACY_ID_STR.getName(), Integer.toString(id.get()));
}
private final ListeningExecutorService executor;
@@ -137,12 +125,6 @@
private final QueryBuilder<ChangeData> queryBuilder;
private final ChangeSubIndex openIndex;
private final ChangeSubIndex closedIndex;
-
- // TODO(davido): Remove the below fields when support for legacy numeric fields is removed.
- private final FieldDef<ChangeData, ?> idField;
- private final String idSortFieldName;
- private final IdTerm idTerm;
- private final ChangeIdExtractor extractor;
private final ImmutableSet<String> skipFields;
@Inject
@@ -173,7 +155,7 @@
new ChangeSubIndex(
schema,
sitePaths,
- new RAMDirectory(),
+ new ByteBuffersDirectory(),
"ramOpen",
skipFields,
openConfig,
@@ -183,7 +165,7 @@
new ChangeSubIndex(
schema,
sitePaths,
- new RAMDirectory(),
+ new ByteBuffersDirectory(),
"ramClosed",
skipFields,
closedConfig,
@@ -210,20 +192,6 @@
searcherFactory,
autoFlush);
}
-
- idField = this.schema.useLegacyNumericFields() ? LEGACY_ID : LEGACY_ID_STR;
- idSortFieldName = schema.useLegacyNumericFields() ? ID_SORT_FIELD : ID2_SORT_FIELD;
- idTerm =
- (name, id) ->
- this.schema.useLegacyNumericFields()
- ? QueryBuilder.intTerm(name, id)
- : QueryBuilder.stringTerm(name, Integer.toString(id));
- extractor =
- (f) ->
- Change.id(
- this.schema.useLegacyNumericFields()
- ? f.numericValue().intValue()
- : Integer.valueOf(f.stringValue()));
}
@Override
@@ -242,7 +210,7 @@
@Override
public void replace(ChangeData cd) {
- Term id = LuceneChangeIndex.idTerm(idTerm, idField, cd);
+ Term id = LuceneChangeIndex.idTerm(cd);
// toDocument is essentially static and doesn't depend on the specific
// sub-index, so just pick one.
Document doc = openIndex.toDocument(cd);
@@ -275,9 +243,9 @@
@Override
public void delete(Change.Id changeId) {
- Term id = LuceneChangeIndex.idTerm(idTerm, idField, changeId);
+ Term idTerm = LuceneChangeIndex.idTerm(changeId);
try {
- Futures.allAsList(openIndex.delete(id), closedIndex.delete(id)).get();
+ Futures.allAsList(openIndex.delete(idTerm), closedIndex.delete(idTerm)).get();
} catch (ExecutionException | InterruptedException e) {
throw new StorageException(e);
}
@@ -314,7 +282,7 @@
return new Sort(
new SortField(UPDATED_SORT_FIELD, SortField.Type.LONG, true),
new SortField(MERGED_ON_SORT_FIELD, SortField.Type.LONG, true),
- new SortField(idSortFieldName, SortField.Type.LONG, true));
+ new SortField(ID_STR_SORT_FIELD, SortField.Type.LONG, true));
}
private class QuerySource implements ChangeDataSource {
@@ -368,7 +336,7 @@
throw new StorageException("interrupted");
}
- final Set<String> fields = IndexUtils.changeFields(opts, schema.useLegacyNumericFields());
+ final Set<String> fields = IndexUtils.changeFields(opts);
return new ChangeDataResults(
executor.submit(
new Callable<Results>() {
@@ -391,7 +359,7 @@
Map<ChangeSubIndex, ScoreDoc> searchAfterBySubIndex;
try {
- Results r = doRead(IndexUtils.changeFields(opts, schema.useLegacyNumericFields()));
+ Results r = doRead(IndexUtils.changeFields(opts));
documents = r.docs;
searchAfterBySubIndex = r.searchAfterBySubIndex;
} catch (IOException e) {
@@ -530,7 +498,7 @@
ImmutableList.Builder<ChangeData> result =
ImmutableList.builderWithExpectedSize(docs.size());
for (Document doc : docs) {
- result.add(toChangeData(fields(doc, fields), fields, idField.getName()));
+ result.add(toChangeData(fields(doc, fields), fields, LEGACY_ID_STR.getName()));
}
return result.build();
} catch (InterruptedException e) {
@@ -577,12 +545,13 @@
} else {
IndexableField f = Iterables.getFirst(doc.get(idFieldName), null);
+ Change.Id id = Change.id(Integer.valueOf(f.stringValue()));
// IndexUtils#changeFields ensures either CHANGE or PROJECT is always present.
IndexableField project = doc.get(PROJECT.getName()).iterator().next();
- cd = changeDataFactory.create(Project.nameKey(project.stringValue()), extractor.extract(f));
+ cd = changeDataFactory.create(Project.nameKey(project.stringValue()), id);
}
- for (FieldDef<ChangeData, ?> field : getSchema().getFields().values()) {
+ for (SchemaField<ChangeData, ?> field : getSchema().getSchemaFields().values()) {
if (fields.contains(field.getName()) && doc.get(field.getName()) != null) {
field.setIfPossible(cd, new LuceneStoredValue(doc.get(field.getName())));
}
diff --git a/java/com/google/gerrit/lucene/LuceneGroupIndex.java b/java/com/google/gerrit/lucene/LuceneGroupIndex.java
index f7a2248..d475ab7 100644
--- a/java/com/google/gerrit/lucene/LuceneGroupIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneGroupIndex.java
@@ -15,16 +15,16 @@
package com.google.gerrit.lucene;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.gerrit.server.index.group.GroupField.UUID;
+import static com.google.gerrit.server.index.group.GroupField.UUID_FIELD_SPEC;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.InternalGroup;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
import com.google.gerrit.index.Schema.Values;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.query.DataSource;
import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.index.query.QueryParseException;
@@ -46,9 +46,9 @@
import org.apache.lucene.search.SearcherFactory;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.BytesRef;
import org.eclipse.jgit.lib.Config;
@@ -57,14 +57,14 @@
private static final String GROUPS = "groups";
- private static final String UUID_SORT_FIELD = sortFieldName(UUID);
+ private static final String UUID_SORT_FIELD = sortFieldName(UUID_FIELD_SPEC);
private static Term idTerm(InternalGroup group) {
return idTerm(group.getGroupUUID());
}
private static Term idTerm(AccountGroup.UUID uuid) {
- return QueryBuilder.stringTerm(UUID.getName(), uuid.get());
+ return QueryBuilder.stringTerm(UUID_FIELD_SPEC.getName(), uuid.get());
}
private final GerritIndexWriterConfig indexWriterConfig;
@@ -74,7 +74,7 @@
private static Directory dir(Schema<?> schema, Config cfg, SitePaths sitePaths)
throws IOException {
if (LuceneIndexModule.isInMemoryTest(cfg)) {
- return new RAMDirectory();
+ return new ByteBuffersDirectory();
}
Path indexDir = LuceneVersionManager.getDir(sitePaths, GROUPS, schema);
return FSDirectory.open(indexDir);
@@ -107,8 +107,8 @@
@Override
void add(Document doc, Values<InternalGroup> values) {
// Add separate DocValues field for the field that is needed for sorting.
- FieldDef<InternalGroup, ?> f = values.getField();
- if (f == UUID) {
+ SchemaField<InternalGroup, ?> f = values.getField();
+ if (f == UUID_FIELD_SPEC) {
String value = (String) getOnlyElement(values.getValues());
doc.add(new SortedDocValuesField(UUID_SORT_FIELD, new BytesRef(value)));
}
@@ -153,7 +153,8 @@
@Override
protected InternalGroup fromDocument(Document doc) {
- AccountGroup.UUID uuid = AccountGroup.uuid(doc.getField(UUID.getName()).stringValue());
+ AccountGroup.UUID uuid =
+ AccountGroup.uuid(doc.getField(UUID_FIELD_SPEC.getName()).stringValue());
// Use the GroupCache rather than depending on any stored fields in the
// document (of which there shouldn't be any).
return groupCache.get().get(uuid).orElse(null);
diff --git a/java/com/google/gerrit/lucene/LuceneProjectIndex.java b/java/com/google/gerrit/lucene/LuceneProjectIndex.java
index 11707be..96b22db 100644
--- a/java/com/google/gerrit/lucene/LuceneProjectIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneProjectIndex.java
@@ -20,10 +20,10 @@
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.entities.Project;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
import com.google.gerrit.index.Schema.Values;
+import com.google.gerrit.index.SchemaFieldDefs.SchemaField;
import com.google.gerrit.index.project.ProjectData;
import com.google.gerrit.index.project.ProjectIndex;
import com.google.gerrit.index.query.DataSource;
@@ -47,9 +47,9 @@
import org.apache.lucene.search.SearcherFactory;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.BytesRef;
import org.eclipse.jgit.lib.Config;
@@ -74,7 +74,7 @@
private static Directory dir(Schema<ProjectData> schema, Config cfg, SitePaths sitePaths)
throws IOException {
if (LuceneIndexModule.isInMemoryTest(cfg)) {
- return new RAMDirectory();
+ return new ByteBuffersDirectory();
}
Path indexDir = LuceneVersionManager.getDir(sitePaths, PROJECTS, schema);
return FSDirectory.open(indexDir);
@@ -107,7 +107,7 @@
@Override
void add(Document doc, Values<ProjectData> values) {
// Add separate DocValues field for the field that is needed for sorting.
- FieldDef<ProjectData, ?> f = values.getField();
+ SchemaField<ProjectData, ?> f = values.getField();
if (f == NAME) {
String value = (String) getOnlyElement(values.getValues());
doc.add(new SortedDocValuesField(NAME_SORT_FIELD, new BytesRef(value)));
diff --git a/java/com/google/gerrit/lucene/LuceneStoredValue.java b/java/com/google/gerrit/lucene/LuceneStoredValue.java
index efe489b..1f8c039 100644
--- a/java/com/google/gerrit/lucene/LuceneStoredValue.java
+++ b/java/com/google/gerrit/lucene/LuceneStoredValue.java
@@ -18,7 +18,9 @@
import static java.util.stream.Collectors.toList;
import com.google.common.collect.Iterables;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.index.StoredValue;
+import com.google.protobuf.MessageLite;
import java.sql.Timestamp;
import java.util.List;
import org.apache.lucene.index.IndexableField;
@@ -81,6 +83,20 @@
return copyAsBytes(field);
}
+ @Override
+ @Nullable
+ public MessageLite asProto() {
+ // Lucene does not store protos
+ return null;
+ }
+
+ @Override
+ @Nullable
+ public Iterable<MessageLite> asProtos() {
+ // Lucene does not store protos
+ return null;
+ }
+
private static List<byte[]> copyAsBytes(List<IndexableField> fields) {
return fields.stream()
.map(
diff --git a/java/com/google/gerrit/lucene/QueryBuilder.java b/java/com/google/gerrit/lucene/QueryBuilder.java
index e1b56c6..14ad528 100644
--- a/java/com/google/gerrit/lucene/QueryBuilder.java
+++ b/java/com/google/gerrit/lucene/QueryBuilder.java
@@ -15,6 +15,7 @@
package com.google.gerrit.lucene;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.lucene.search.BooleanClause.Occur.MUST;
import static org.apache.lucene.search.BooleanClause.Occur.MUST_NOT;
@@ -39,36 +40,18 @@
import org.apache.lucene.document.LongPoint;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.LegacyNumericRangeQuery;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.RegexpQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRefBuilder;
-import org.apache.lucene.util.LegacyNumericUtils;
-@SuppressWarnings("deprecation")
public class QueryBuilder<V> {
- @FunctionalInterface
- static interface IntTermQuery {
- Query get(String name, int value);
- }
-
- @FunctionalInterface
- static interface IntRangeQuery {
- Query get(String name, int min, int max);
- }
-
- @FunctionalInterface
- static interface LongRangeQuery {
- Query get(String name, long min, long max);
- }
-
- static Term intTerm(String name, int value) {
- BytesRefBuilder builder = new BytesRefBuilder();
- LegacyNumericUtils.intToPrefixCoded(value, 0, builder);
- return new Term(name, builder.get());
+ /** @param name field name qparam i key value */
+ static Term intTerm(String name) {
+ checkState(false, "Lucene index implementation removed legacy numeric type");
+ return null;
}
static Term stringTerm(String name, String value) {
@@ -84,29 +67,9 @@
private final Schema<V> schema;
private final org.apache.lucene.util.QueryBuilder queryBuilder;
- // TODO(davido): Remove the below fields when support for legacy numeric fields is removed.
- private final IntTermQuery intTermQuery;
- private final IntRangeQuery intRangeTermQuery;
- private final LongRangeQuery longRangeQuery;
-
public QueryBuilder(Schema<V> schema, Analyzer analyzer) {
this.schema = schema;
queryBuilder = new org.apache.lucene.util.QueryBuilder(analyzer);
- intTermQuery =
- (name, value) ->
- this.schema.useLegacyNumericFields()
- ? new TermQuery(intTerm(name, value))
- : intPoint(name, value);
- intRangeTermQuery =
- (name, min, max) ->
- this.schema.useLegacyNumericFields()
- ? LegacyNumericRangeQuery.newIntRange(name, min, max, true, true)
- : IntPoint.newRangeQuery(name, min, max);
- longRangeQuery =
- (name, min, max) ->
- this.schema.useLegacyNumericFields()
- ? LegacyNumericRangeQuery.newLongRange(name, min, max, true, true)
- : LongPoint.newRangeQuery(name, min, max);
}
public Query toQuery(Predicate<V> p) throws QueryParseException {
@@ -209,7 +172,7 @@
} catch (NumberFormatException e) {
throw new QueryParseException("not an integer: " + p.getValue(), e);
}
- return intTermQuery.get(p.getField().getName(), value);
+ return intPoint(p.getField().getName(), value);
}
private Query intRangeQuery(IndexPredicate<V> p) throws QueryParseException {
@@ -220,9 +183,9 @@
int maximum = r.getMaximumValue();
if (minimum == maximum) {
// Just fall back to a standard integer query.
- return intTermQuery.get(name, minimum);
+ return intPoint(name, minimum);
}
- return intRangeTermQuery.get(name, minimum, maximum);
+ return IntPoint.newRangeQuery(name, minimum, maximum);
}
throw new QueryParseException("not an integer range: " + p);
}
@@ -230,7 +193,7 @@
private Query timestampQuery(IndexPredicate<V> p) throws QueryParseException {
if (p instanceof TimestampRangePredicate) {
TimestampRangePredicate<V> r = (TimestampRangePredicate<V>) p;
- return longRangeQuery.get(
+ return LongPoint.newRangeQuery(
r.getField().getName(),
r.getMinTimestamp().toEpochMilli(),
r.getMaxTimestamp().toEpochMilli());
@@ -240,7 +203,7 @@
private Query notTimestamp(TimestampRangePredicate<V> r) throws QueryParseException {
if (r.getMinTimestamp().toEpochMilli() == 0) {
- return longRangeQuery.get(
+ return LongPoint.newRangeQuery(
r.getField().getName(), r.getMaxTimestamp().toEpochMilli(), Long.MAX_VALUE);
}
throw new QueryParseException("cannot negate: " + r);
diff --git a/java/com/google/gerrit/metrics/BUILD b/java/com/google/gerrit/metrics/BUILD
index 0cb0275..5f4e0c0 100644
--- a/java/com/google/gerrit/metrics/BUILD
+++ b/java/com/google/gerrit/metrics/BUILD
@@ -14,6 +14,7 @@
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
+ "//lib/errorprone:annotations",
"//lib/flogger:api",
"//lib/guice",
],
diff --git a/java/com/google/gerrit/metrics/MetricMaker.java b/java/com/google/gerrit/metrics/MetricMaker.java
index 618d421..3f9bab1 100644
--- a/java/com/google/gerrit/metrics/MetricMaker.java
+++ b/java/com/google/gerrit/metrics/MetricMaker.java
@@ -16,6 +16,7 @@
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.gerrit.extensions.registration.RegistrationHandle;
import java.util.Set;
@@ -80,6 +81,7 @@
* @param desc description of the metric.
* @return registration handle
*/
+ @CanIgnoreReturnValue
public <V> RegistrationHandle newConstantMetric(String name, V value, Description desc) {
desc.setConstant();
@@ -110,6 +112,7 @@
* @param trigger function to compute the value of the metric.
* @return registration handle
*/
+ @CanIgnoreReturnValue
public <V> RegistrationHandle newCallbackMetric(
String name, Class<V> valueClass, Description desc, Supplier<V> trigger) {
CallbackMetric0<V> metric = newCallbackMetric(name, valueClass, desc);
diff --git a/java/com/google/gerrit/metrics/proc/ThreadMXBeanSun.java b/java/com/google/gerrit/metrics/proc/ThreadMXBeanSun.java
index fe52618..ca750cd 100644
--- a/java/com/google/gerrit/metrics/proc/ThreadMXBeanSun.java
+++ b/java/com/google/gerrit/metrics/proc/ThreadMXBeanSun.java
@@ -35,9 +35,7 @@
@Override
public long getCurrentThreadAllocatedBytes() {
- // TODO(ms): call getCurrentThreadAllocatedBytes as soon as this is available in the patched
- // Java version used by bazel
- return getThreadAllocatedBytes(Thread.currentThread().getId());
+ return sys.getCurrentThreadAllocatedBytes();
}
@Override
diff --git a/java/com/google/gerrit/pgm/init/AccountsOnInit.java b/java/com/google/gerrit/pgm/init/AccountsOnInit.java
index c56a8d9..be5fe1a 100644
--- a/java/com/google/gerrit/pgm/init/AccountsOnInit.java
+++ b/java/com/google/gerrit/pgm/init/AccountsOnInit.java
@@ -30,7 +30,6 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
-import java.util.Date;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheEditor;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
@@ -61,16 +60,12 @@
this.allUsers = allUsers.get();
}
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
public Account insert(Account.Builder account) throws IOException {
File path = getPath();
try (Repository repo = new FileRepository(path);
ObjectInserter oi = repo.newObjectInserter()) {
PersonIdent ident =
- new PersonIdent(
- new GerritPersonIdentProvider(flags.cfg).get(), Date.from(account.registeredOn()));
+ new PersonIdent(new GerritPersonIdentProvider(flags.cfg).get(), account.registeredOn());
Config accountConfig = new Config();
AccountProperties.writeToAccountConfig(
diff --git a/java/com/google/gerrit/pgm/init/GroupsOnInit.java b/java/com/google/gerrit/pgm/init/GroupsOnInit.java
index 020705e..f8fcadd 100644
--- a/java/com/google/gerrit/pgm/init/GroupsOnInit.java
+++ b/java/com/google/gerrit/pgm/init/GroupsOnInit.java
@@ -40,7 +40,6 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
-import java.sql.Timestamp;
import java.time.Instant;
import java.util.stream.Stream;
import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -166,14 +165,10 @@
return AuditLogFormatter.createBackedBy(ImmutableSet.of(account), ImmutableSet.of(), serverId);
}
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
private void commit(Repository repository, GroupConfig groupConfig, Instant groupCreatedOn)
throws IOException {
PersonIdent personIdent =
- new PersonIdent(
- new GerritPersonIdentProvider(flags.cfg).get(), Timestamp.from(groupCreatedOn));
+ new PersonIdent(new GerritPersonIdentProvider(flags.cfg).get(), groupCreatedOn);
try (MetaDataUpdate metaDataUpdate = createMetaDataUpdate(repository, personIdent)) {
groupConfig.commit(metaDataUpdate);
}
diff --git a/java/com/google/gerrit/pgm/init/InitLabels.java b/java/com/google/gerrit/pgm/init/InitLabels.java
index 3edc732..f862e12 100644
--- a/java/com/google/gerrit/pgm/init/InitLabels.java
+++ b/java/com/google/gerrit/pgm/init/InitLabels.java
@@ -26,7 +26,7 @@
@Singleton
public class InitLabels implements InitStep {
- private static final String KEY_COPY_ALL_SCORES_IF_NO_CODE_CHANGE = "copyAllScoresIfNoCodeChange";
+ private static final String KEY_COPY_CONDITION = "copyCondition";
private static final String KEY_LABEL = "label";
private static final String KEY_FUNCTION = "function";
private static final String KEY_VALUE = "value";
@@ -62,7 +62,11 @@
LABEL_VERIFIED,
KEY_VALUE,
Arrays.asList("-1 Fails", "0 No score", "+1 Verified"));
- cfg.setBoolean(KEY_LABEL, LABEL_VERIFIED, KEY_COPY_ALL_SCORES_IF_NO_CODE_CHANGE, true);
+ cfg.setString(
+ KEY_LABEL,
+ LABEL_VERIFIED,
+ KEY_COPY_CONDITION,
+ "changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE");
allProjectsConfig.save("Configure 'Verified' label");
}
}
diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
index 208ed1f..05b50da 100644
--- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java
+++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
@@ -47,6 +47,7 @@
import com.google.gerrit.server.cache.mem.DefaultMemoryCacheModule;
import com.google.gerrit.server.change.ChangeJson;
import com.google.gerrit.server.change.ChangeKindCacheImpl;
+import com.google.gerrit.server.change.EmailNewPatchSet;
import com.google.gerrit.server.change.MergeabilityCacheImpl;
import com.google.gerrit.server.change.PatchSetInserter;
import com.google.gerrit.server.change.RebaseChangeOp;
@@ -61,15 +62,14 @@
import com.google.gerrit.server.config.GitReceivePackGroups;
import com.google.gerrit.server.config.GitUploadPackGroups;
import com.google.gerrit.server.config.SysExecutorModule;
+import com.google.gerrit.server.extensions.events.AttentionSetObserver;
import com.google.gerrit.server.extensions.events.EventUtil;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.extensions.events.RevisionCreated;
import com.google.gerrit.server.extensions.events.WorkInProgressStateChanged;
-import com.google.gerrit.server.git.MergeUtil;
import com.google.gerrit.server.git.PureRevertCache;
import com.google.gerrit.server.git.SearchingChangeCacheImpl;
import com.google.gerrit.server.git.TagCache;
-import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
import com.google.gerrit.server.notedb.NoteDbModule;
import com.google.gerrit.server.patch.DiffExecutorModule;
import com.google.gerrit.server.patch.DiffOperationsImpl;
@@ -154,9 +154,8 @@
.in(SINGLETON);
bind(Realm.class).to(FakeRealm.class);
bind(IdentifiedUser.class).toProvider(Providers.of(null));
- bind(ReplacePatchSetSender.Factory.class).toProvider(Providers.of(null));
+ bind(EmailNewPatchSet.Factory.class).toProvider(Providers.of(null));
bind(CurrentUser.class).to(InternalUser.class);
- factory(MergeUtil.Factory.class);
factory(PatchSetInserter.Factory.class);
factory(RebaseChangeOp.Factory.class);
@@ -223,6 +222,7 @@
bind(RevisionCreated.class).toInstance(RevisionCreated.DISABLED);
bind(WorkInProgressStateChanged.class).toInstance(WorkInProgressStateChanged.DISABLED);
bind(AccountVisibility.class).toProvider(AccountVisibilityProvider.class).in(SINGLETON);
+ bind(AttentionSetObserver.class).toInstance(AttentionSetObserver.DISABLED);
ModuleOverloader.override(
modules,
diff --git a/java/com/google/gerrit/pgm/util/RuntimeShutdown.java b/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
index c5e8567..37cf20e 100644
--- a/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
+++ b/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
@@ -95,6 +95,7 @@
}
}
+ @SuppressWarnings("DoNotCall")
void manualShutdown() {
Runtime.getRuntime().removeShutdownHook(this);
run();
diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD
index 7a6187d..2be3383 100644
--- a/java/com/google/gerrit/server/BUILD
+++ b/java/com/google/gerrit/server/BUILD
@@ -104,6 +104,7 @@
"//lib:servlet-api",
"//lib:soy",
"//lib:tukaani-xz",
+ "//lib/auto:auto-factory",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/bouncycastle:bcpkix-neverlink",
@@ -120,6 +121,7 @@
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
+ "//lib/httpcomponents:httpclient",
"//lib/jsoup",
"//lib/log:log4j",
"//lib/lucene:lucene-analyzers-common",
diff --git a/java/com/google/gerrit/server/CommonConverters.java b/java/com/google/gerrit/server/CommonConverters.java
index e7fd1c5..4ad143b 100644
--- a/java/com/google/gerrit/server/CommonConverters.java
+++ b/java/com/google/gerrit/server/CommonConverters.java
@@ -25,14 +25,11 @@
* static utility methods.
*/
public class CommonConverters {
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
public static GitPerson toGitPerson(PersonIdent ident) {
GitPerson result = new GitPerson();
result.name = ident.getName();
result.email = ident.getEmailAddress();
- result.setDate(ident.getWhen().toInstant());
+ result.setDate(ident.getWhenAsInstant());
result.tz = ident.getTimeZoneOffset();
return result;
}
diff --git a/java/com/google/gerrit/server/IdentifiedUser.java b/java/com/google/gerrit/server/IdentifiedUser.java
index 122e18d..65a81f7 100644
--- a/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/java/com/google/gerrit/server/IdentifiedUser.java
@@ -50,9 +50,9 @@
import java.net.SocketAddress;
import java.net.URL;
import java.time.Instant;
+import java.time.ZoneId;
import java.util.Optional;
import java.util.Set;
-import java.util.TimeZone;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.util.SystemReader;
@@ -427,10 +427,10 @@
}
public PersonIdent newRefLogIdent() {
- return newRefLogIdent(Instant.now(), TimeZone.getDefault());
+ return newRefLogIdent(Instant.now(), ZoneId.systemDefault());
}
- public PersonIdent newRefLogIdent(Instant when, TimeZone tz) {
+ public PersonIdent newRefLogIdent(Instant when, ZoneId zoneId) {
final Account ua = getAccount();
String name = ua.fullName();
@@ -451,21 +451,18 @@
: ua.preferredEmail();
}
- return newPersonIdent(name, user, when, tz);
+ return new PersonIdent(name, user, when, zoneId);
}
private String constructMailAddress(Account ua, String host) {
return getUserName().orElse("") + "|account-" + ua.id().toString() + "@" + host;
}
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
public PersonIdent newCommitterIdent(PersonIdent ident) {
- return newCommitterIdent(ident.getWhen().toInstant(), ident.getTimeZone());
+ return newCommitterIdent(ident.getWhenAsInstant(), ident.getZoneId());
}
- public PersonIdent newCommitterIdent(Instant when, TimeZone tz) {
+ public PersonIdent newCommitterIdent(Instant when, ZoneId zoneId) {
final Account ua = getAccount();
String name = ua.fullName();
String email = ua.preferredEmail();
@@ -500,7 +497,7 @@
}
}
- return newPersonIdent(name, email, when, tz);
+ return new PersonIdent(name, email, when, zoneId);
}
@Override
@@ -568,19 +565,4 @@
}
return host;
}
-
- /**
- * Create a {@link PersonIdent} from an {@code Instant} and a {@link TimeZone}.
- *
- * <p>We use the {@link PersonIdent#PersonIdent(String, String, long, int)} constructor to avoid
- * doing a conversion to {@code java.util.Date} here. For the {@code int aTZ} argument, which is
- * the time zone, we do the same computation as in {@link PersonIdent#PersonIdent(String, String,
- * java.util.Date, TimeZone)} (just instead of getting the epoch millis from {@code
- * java.util.Date} we get them from {@link Instant}).
- */
- // TODO(issue-15517): Drop this method once JGit's PersonIdent class supports Instants
- private static PersonIdent newPersonIdent(String name, String email, Instant when, TimeZone tz) {
- return new PersonIdent(
- name, email, when.toEpochMilli(), tz.getOffset(when.toEpochMilli()) / (60 * 1000));
- }
}
diff --git a/java/com/google/gerrit/server/PublishCommentsOp.java b/java/com/google/gerrit/server/PublishCommentsOp.java
index 84afe8c..827c078 100644
--- a/java/com/google/gerrit/server/PublishCommentsOp.java
+++ b/java/com/google/gerrit/server/PublishCommentsOp.java
@@ -15,11 +15,11 @@
package com.google.gerrit.server;
import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.entities.HumanComment;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
-import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.server.change.EmailReviewComments;
@@ -32,13 +32,12 @@
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.CommentsRejectedException;
import com.google.gerrit.server.update.PostUpdateContext;
-import com.google.gerrit.server.update.RepoView;
-import com.google.gerrit.server.util.LabelVote;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jgit.lib.ObjectId;
/**
* A {@link BatchUpdateOp} that can be used to publish draft comments
@@ -52,15 +51,14 @@
private final CommentAdded commentAdded;
private final CommentsUtil commentsUtil;
private final EmailReviewComments.Factory email;
- private final List<LabelVote> labelDelta = new ArrayList<>();
private final Project.NameKey projectNameKey;
private final PatchSet.Id psId;
private final PublishCommentUtil publishCommentUtil;
private final ChangeMessagesUtil changeMessagesUtil;
+ private ObjectId preUpdateMetaId;
private List<HumanComment> comments = new ArrayList<>();
private String mailMessage;
- private IdentifiedUser user;
public interface Factory {
PublishCommentsOp create(PatchSet.Id psId, Project.NameKey projectNameKey);
@@ -92,7 +90,7 @@
public boolean updateChange(ChangeContext ctx)
throws ResourceConflictException, UnprocessableEntityException, IOException,
PatchListNotAvailableException, CommentsRejectedException {
- user = ctx.getIdentifiedUser();
+ preUpdateMetaId = ctx.getNotes().getMetaId();
comments = commentsUtil.draftByChangeAuthor(ctx.getNotes(), ctx.getUser().getAccountId());
// PublishCommentsOp should update a separate ChangeUpdate Object than the one used by other ops
@@ -103,7 +101,7 @@
// 2. Each ChangeUpdate results in 1 commit in NoteDb
// We do it this way so that the execution results in 2 different commits in NoteDb
ChangeUpdate changeUpdate = ctx.getDistinctUpdate(psId);
- publishCommentUtil.publish(ctx, changeUpdate, comments, null);
+ publishCommentUtil.publish(ctx, changeUpdate, comments, /* tag= */ null);
return insertMessage(changeUpdate);
}
@@ -116,25 +114,15 @@
PatchSet ps = psUtil.get(changeNotes, psId);
NotifyResolver.Result notify = ctx.getNotify(changeNotes.getChangeId());
if (notify.shouldNotify()) {
- RepoView repoView;
- try {
- repoView = ctx.getRepoView();
- } catch (IOException ex) {
- throw new StorageException(
- String.format("Repository %s not found", ctx.getProject().get()), ex);
- }
email
.create(
- notify,
- changeNotes,
+ ctx,
ps,
- user,
+ preUpdateMetaId,
mailMessage,
- ctx.getWhen(),
comments,
- null,
- labelDelta,
- repoView)
+ /* patchSetComment= */ null,
+ /* labels= */ ImmutableList.of())
.sendAsync();
}
commentAdded.fire(
@@ -159,7 +147,7 @@
}
mailMessage =
changeMessagesUtil.setChangeMessage(
- changeUpdate, "Patch Set " + psId.get() + ":" + buf, null);
+ changeUpdate, "Patch Set " + psId.get() + ":" + buf, /* tag= */ null);
return true;
}
}
diff --git a/java/com/google/gerrit/server/StarredChangesUtil.java b/java/com/google/gerrit/server/StarredChangesUtil.java
index 95d891e..0f5629e 100644
--- a/java/com/google/gerrit/server/StarredChangesUtil.java
+++ b/java/com/google/gerrit/server/StarredChangesUtil.java
@@ -37,12 +37,10 @@
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.git.GitUpdateFailureException;
import com.google.gerrit.git.LockFailureException;
-import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.index.change.ChangeField;
-import com.google.gerrit.server.index.change.ChangeIndexer;
import com.google.gerrit.server.logging.Metadata;
import com.google.gerrit.server.logging.TraceContext;
import com.google.gerrit.server.logging.TraceContext.TraceTimer;
@@ -110,6 +108,11 @@
}
}
+ public enum Operation {
+ ADD,
+ REMOVE
+ }
+
@AutoValue
public abstract static class StarRef {
private static final StarRef MISSING =
@@ -158,15 +161,11 @@
}
public static final String DEFAULT_LABEL = "star";
- public static final String IGNORE_LABEL = "ignore";
- public static final ImmutableSortedSet<String> DEFAULT_LABELS =
- ImmutableSortedSet.of(DEFAULT_LABEL);
private final GitRepositoryManager repoManager;
private final GitReferenceUpdated gitRefUpdated;
private final AllUsersName allUsers;
private final Provider<PersonIdent> serverIdent;
- private final ChangeIndexer indexer;
private final Provider<InternalChangeQuery> queryProvider;
@Inject
@@ -175,13 +174,11 @@
GitReferenceUpdated gitRefUpdated,
AllUsersName allUsers,
@GerritPersonIdent Provider<PersonIdent> serverIdent,
- ChangeIndexer indexer,
Provider<InternalChangeQuery> queryProvider) {
this.repoManager = repoManager;
this.gitRefUpdated = gitRefUpdated;
this.allUsers = allUsers;
this.serverIdent = serverIdent;
- this.indexer = indexer;
this.queryProvider = queryProvider;
}
@@ -197,34 +194,27 @@
}
}
- public NavigableSet<String> star(
- Account.Id accountId,
- Project.NameKey project,
- Change.Id changeId,
- Set<String> labelsToAdd,
- Set<String> labelsToRemove)
+ public void star(Account.Id accountId, Project.NameKey project, Change.Id changeId, Operation op)
throws IllegalLabelException {
try (Repository repo = repoManager.openRepository(allUsers)) {
String refName = RefNames.refsStarredChanges(changeId, accountId);
StarRef old = readLabels(repo, refName);
NavigableSet<String> labels = new TreeSet<>(old.labels());
- if (labelsToAdd != null) {
- labels.addAll(labelsToAdd);
- }
- if (labelsToRemove != null) {
- labels.removeAll(labelsToRemove);
+ switch (op) {
+ case ADD:
+ labels.add(DEFAULT_LABEL);
+ break;
+ case REMOVE:
+ labels.remove(DEFAULT_LABEL);
+ break;
}
if (labels.isEmpty()) {
deleteRef(repo, refName, old.objectId());
} else {
- checkMutuallyExclusiveLabels(labels);
updateLabels(repo, refName, old.objectId(), labels);
}
-
- indexer.index(project, changeId);
- return Collections.unmodifiableNavigableSet(labels);
} catch (IOException e) {
throw new StorageException(
String.format("Star change %d for account %d failed", changeId.get(), accountId.get()),
@@ -349,32 +339,6 @@
}
}
- public void ignore(ChangeResource rsrc) throws IllegalLabelException {
- star(
- rsrc.getUser().asIdentifiedUser().getAccountId(),
- rsrc.getProject(),
- rsrc.getChange().getId(),
- ImmutableSet.of(IGNORE_LABEL),
- ImmutableSet.of());
- }
-
- public void unignore(ChangeResource rsrc) throws IllegalLabelException {
- star(
- rsrc.getUser().asIdentifiedUser().getAccountId(),
- rsrc.getProject(),
- rsrc.getChange().getId(),
- ImmutableSet.of(),
- ImmutableSet.of(IGNORE_LABEL));
- }
-
- public boolean isIgnoredBy(Change.Id changeId, Account.Id accountId) {
- return getLabels(accountId, changeId).contains(IGNORE_LABEL);
- }
-
- public boolean isIgnored(ChangeResource rsrc) {
- return isIgnoredBy(rsrc.getChange().getId(), rsrc.getUser().asIdentifiedUser().getAccountId());
- }
-
public static StarRef readLabels(Repository repo, String refName) throws IOException {
try (TraceTimer traceTimer =
TraceContext.newTimer(
@@ -414,13 +378,6 @@
}
}
- private static void checkMutuallyExclusiveLabels(Set<String> labels)
- throws MutuallyExclusiveLabelsException {
- if (labels.containsAll(ImmutableSet.of(DEFAULT_LABEL, IGNORE_LABEL))) {
- throw new MutuallyExclusiveLabelsException(DEFAULT_LABEL, IGNORE_LABEL);
- }
- }
-
private static void validateLabels(Collection<String> labels) throws InvalidLabelsException {
if (labels == null) {
return;
diff --git a/java/com/google/gerrit/server/account/AccountCache.java b/java/com/google/gerrit/server/account/AccountCache.java
index 54bfa56..5ae7345 100644
--- a/java/com/google/gerrit/server/account/AccountCache.java
+++ b/java/com/google/gerrit/server/account/AccountCache.java
@@ -14,10 +14,13 @@
package com.google.gerrit.server.account;
+import com.google.gerrit.common.UsedAt;
+import com.google.gerrit.common.UsedAt.Project;
import com.google.gerrit.entities.Account;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import org.eclipse.jgit.lib.ObjectId;
/** Caches important (but small) account state to avoid database hits. */
public interface AccountCache {
@@ -72,4 +75,18 @@
* exists or if loading the external ID fails {@link Optional#empty()} is returned
*/
Optional<AccountState> getByUsername(String username);
+
+ /**
+ * Returns an {@code AccountState} instance for the given account ID at the given {@code metaId}
+ * of {@link com.google.gerrit.entities.RefNames#refsUsers} ref.
+ *
+ * <p>The caller is responsible to ensure the presence of {@code metaId} and the corresponding
+ * meta ref. The method does not populate {@link AccountState#defaultPreferences}.
+ *
+ * @param accountId ID of the account that should be retrieved.
+ * @param metaId the sha1 of commit in {@link com.google.gerrit.entities.RefNames#refsUsers} ref.
+ * @return {@code AccountState} instance for the given account ID at specific sha1 {@code metaId}.
+ */
+ @UsedAt(Project.GOOGLE)
+ AccountState getFromMetaId(Account.Id accountId, ObjectId metaId);
}
diff --git a/java/com/google/gerrit/server/account/AccountCacheImpl.java b/java/com/google/gerrit/server/account/AccountCacheImpl.java
index 1d9150d..66a36f6 100644
--- a/java/com/google/gerrit/server/account/AccountCacheImpl.java
+++ b/java/com/google/gerrit/server/account/AccountCacheImpl.java
@@ -45,6 +45,7 @@
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
+import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
@@ -106,6 +107,18 @@
}
@Override
+ public AccountState getFromMetaId(Account.Id id, ObjectId metaId) {
+ try {
+ CachedAccountDetails.Key key = CachedAccountDetails.Key.create(id, metaId);
+
+ CachedAccountDetails accountDetails = accountDetailsCache.get(key);
+ return AccountState.forCachedAccount(accountDetails, CachedPreferences.EMPTY, externalIds);
+ } catch (IOException | ExecutionException e) {
+ throw new StorageException(e);
+ }
+ }
+
+ @Override
public Map<Account.Id, AccountState> get(Set<Account.Id> accountIds) {
try {
try (Repository allUsers = repoManager.openRepository(allUsersName)) {
diff --git a/java/com/google/gerrit/server/account/AccountConfig.java b/java/com/google/gerrit/server/account/AccountConfig.java
index 28e881e1..4143f77 100644
--- a/java/com/google/gerrit/server/account/AccountConfig.java
+++ b/java/com/google/gerrit/server/account/AccountConfig.java
@@ -36,7 +36,6 @@
import java.io.IOException;
import java.time.Instant;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -258,9 +257,6 @@
return c;
}
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
@Override
protected boolean onSave(CommitBuilder commit) throws IOException, ConfigInvalidException {
checkLoaded();
@@ -279,8 +275,8 @@
}
Instant registeredOn = loadedAccountProperties.get().getRegisteredOn();
- commit.setAuthor(new PersonIdent(commit.getAuthor(), Date.from(registeredOn)));
- commit.setCommitter(new PersonIdent(commit.getCommitter(), Date.from(registeredOn)));
+ commit.setAuthor(new PersonIdent(commit.getAuthor(), registeredOn));
+ commit.setCommitter(new PersonIdent(commit.getCommitter(), registeredOn));
}
saveAccount();
diff --git a/java/com/google/gerrit/server/account/AccountControl.java b/java/com/google/gerrit/server/account/AccountControl.java
index f5f9b3d..c80059b 100644
--- a/java/com/google/gerrit/server/account/AccountControl.java
+++ b/java/com/google/gerrit/server/account/AccountControl.java
@@ -176,7 +176,7 @@
logger.atFine().log(
"user %s can see own account %d", user.getLoggableName(), otherUser.getId().get());
return true;
- } else if (viewAll()) {
+ } else if (canViewAll()) {
logger.atFine().log(
"user %s can see account %d (view all accounts = true)",
user.getLoggableName(), otherUser.getId().get());
@@ -255,7 +255,7 @@
}
}
- private boolean viewAll() {
+ public boolean canViewAll() {
if (viewAll == null) {
try {
viewAll = perm.test(GlobalPermission.VIEW_ALL_ACCOUNTS);
diff --git a/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java
index 3ee6365..8d5fea4 100644
--- a/java/com/google/gerrit/server/account/AccountsUpdate.java
+++ b/java/com/google/gerrit/server/account/AccountsUpdate.java
@@ -60,6 +60,7 @@
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
/**
* Creates and updates accounts.
@@ -319,17 +320,13 @@
* @throws IOException if creating the user branch fails due to an IO error
* @throws ConfigInvalidException if any of the account fields has an invalid value
*/
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
public AccountState insert(String message, Account.Id accountId, ConfigureDeltaFromState init)
throws IOException, ConfigInvalidException {
return execute(
ImmutableList.of(
repo -> {
AccountConfig accountConfig = read(repo, accountId);
- Account account =
- accountConfig.getNewAccount(committerIdent.getWhen().toInstant());
+ Account account = accountConfig.getNewAccount(committerIdent.getWhenAsInstant());
AccountState accountState = AccountState.forAccount(account);
AccountDelta.Builder deltaBuilder = AccountDelta.builder();
init.configure(accountState, deltaBuilder);
@@ -513,23 +510,31 @@
updatedAccounts.size() == 1
? Iterables.getOnlyElement(updatedAccounts).message
: "Batch update for " + updatedAccounts.size() + " accounts";
+ ObjectId oldExternalIdsRevision = externalIdNotes.getRevision();
+ // These update the same ref, so they need to be stacked on top of one another using the same
+ // ExternalIdNotes instance.
+ RevCommit revCommit =
+ commitExternalIdUpdates(externalIdUpdateMessage, allUsersRepo, batchRefUpdate);
+ boolean externalIdsUpdated = !Objects.equals(revCommit.getId(), oldExternalIdsRevision);
for (UpdatedAccount updatedAccount : updatedAccounts) {
+
// These updates are all for different refs (because batches never update the same account
// more than once), so there can be multiple commits in the same batch, all with the same base
// revision in their AccountConfig.
+ // We allow empty commits:
+ // 1) When creating a new account, so that the user branch gets created with an empty commit
+ // when no account properties are set and hence no
+ // 'account.config' file will be created.
+ // 2) When updating "refs/meta/external-ids", so that refs/users/* meta ref is updated too.
+ // This allows to schedule reindexing of account transactionally on refs/users/* meta
+ // updates.
+ boolean allowEmptyCommit = externalIdsUpdated || updatedAccount.created;
commitAccountConfig(
updatedAccount.message,
allUsersRepo,
batchRefUpdate,
updatedAccount.accountConfig,
- updatedAccount.created /* allowEmptyCommit */);
- // When creating a new account we must allow empty commits so that the user branch gets
- // created with an empty commit when no account properties are set and hence no
- // 'account.config' file will be created.
-
- // These update the same ref, so they need to be stacked on top of one another using the same
- // ExternalIdNotes instance.
- commitExternalIdUpdates(externalIdUpdateMessage, allUsersRepo, batchRefUpdate);
+ allowEmptyCommit);
}
RefUpdateUtil.executeChecked(batchRefUpdate, allUsersRepo);
@@ -562,10 +567,10 @@
}
}
- private void commitExternalIdUpdates(
+ private RevCommit commitExternalIdUpdates(
String message, Repository allUsersRepo, BatchRefUpdate batchRefUpdate) throws IOException {
try (MetaDataUpdate md = createMetaDataUpdate(message, allUsersRepo, batchRefUpdate)) {
- externalIdNotes.commit(md);
+ return externalIdNotes.commit(md);
}
}
diff --git a/java/com/google/gerrit/server/account/Emails.java b/java/com/google/gerrit/server/account/Emails.java
index 45f0844..8c3f033 100644
--- a/java/com/google/gerrit/server/account/Emails.java
+++ b/java/com/google/gerrit/server/account/Emails.java
@@ -113,14 +113,11 @@
return externalIds.byEmail(email).stream().map(ExternalId::accountId).collect(toImmutableSet());
}
- // TODO(issue-15517): Fix the JdkObsolete issue with Date once JGit's PersonIdent class supports
- // Instants
- @SuppressWarnings("JdkObsolete")
public UserIdentity toUserIdentity(PersonIdent who) throws IOException {
UserIdentity u = new UserIdentity();
u.setName(who.getName());
u.setEmail(who.getEmailAddress());
- u.setDate(who.getWhen().toInstant());
+ u.setDate(who.getWhenAsInstant());
u.setTimeZone(who.getTimeZoneOffset());
// If only one account has access to this email address, select it
diff --git a/java/com/google/gerrit/server/account/InternalAccountDirectory.java b/java/com/google/gerrit/server/account/InternalAccountDirectory.java
index f7b0b60..b895834 100644
--- a/java/com/google/gerrit/server/account/InternalAccountDirectory.java
+++ b/java/com/google/gerrit/server/account/InternalAccountDirectory.java
@@ -27,7 +27,6 @@
import com.google.gerrit.extensions.common.AvatarInfo;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.extensions.registration.DynamicMap;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.externalids.ExternalId;
@@ -101,12 +100,8 @@
Account.Id currentUserId = null;
if (self.get().isIdentifiedUser()) {
currentUserId = self.get().getAccountId();
-
- try {
- permissionBackend.currentUser().check(GlobalPermission.MODIFY_ACCOUNT);
+ if (permissionBackend.currentUser().test(GlobalPermission.MODIFY_ACCOUNT)) {
canModifyAccount = true;
- } catch (AuthException e) {
- canModifyAccount = false;
}
}
diff --git a/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/java/com/google/gerrit/server/account/UniversalGroupBackend.java
index 5bd9bea..1587bc5 100644
--- a/java/com/google/gerrit/server/account/UniversalGroupBackend.java
+++ b/java/com/google/gerrit/server/account/UniversalGroupBackend.java
@@ -27,10 +27,16 @@
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.GroupDescription;
import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.metrics.Counter1;
+import com.google.gerrit.metrics.Counter2;
+import com.google.gerrit.metrics.Description;
+import com.google.gerrit.metrics.Field;
+import com.google.gerrit.metrics.MetricMaker;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.StartupCheck;
import com.google.gerrit.server.StartupException;
import com.google.gerrit.server.config.GerritServerConfig;
+import com.google.gerrit.server.logging.Metadata;
import com.google.gerrit.server.plugincontext.PluginSetContext;
import com.google.gerrit.server.plugincontext.PluginSetEntryContext;
import com.google.gerrit.server.project.ProjectState;
@@ -49,11 +55,57 @@
public class UniversalGroupBackend implements GroupBackend {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+ private static final Field<String> SYSTEM_FIELD =
+ Field.ofString("system", Metadata.Builder::groupSystem).build();
+
private final PluginSetContext<GroupBackend> backends;
+ private final Counter1<String> handlesCount;
+ private final Counter1<String> getCount;
+ private final Counter2<String, Integer> suggestCount;
+ private final Counter2<String, Boolean> containsCount;
+ private final Counter2<String, Boolean> containsAnyCount;
+ private final Counter2<String, Integer> intersectionCount;
+ private final Counter2<String, Integer> knownGroupsCount;
@Inject
- UniversalGroupBackend(PluginSetContext<GroupBackend> backends) {
+ UniversalGroupBackend(PluginSetContext<GroupBackend> backends, MetricMaker metricMaker) {
this.backends = backends;
+ this.handlesCount =
+ metricMaker.newCounter(
+ "group/handles_count", new Description("Calls to GroupBackend.handles"), SYSTEM_FIELD);
+ this.getCount =
+ metricMaker.newCounter(
+ "group/get_count", new Description("Calls to GroupBackend.get"), SYSTEM_FIELD);
+ this.suggestCount =
+ metricMaker.newCounter(
+ "group/suggest_count",
+ new Description("Calls to GroupBackend.suggest"),
+ SYSTEM_FIELD,
+ Field.ofInteger("num_suggested", (meta, value) -> {}).build());
+ this.containsCount =
+ metricMaker.newCounter(
+ "group/contains_count",
+ new Description("Calls to GroupMemberships.contains"),
+ SYSTEM_FIELD,
+ Field.ofBoolean("contains", (meta, value) -> {}).build());
+ this.containsAnyCount =
+ metricMaker.newCounter(
+ "group/contains_any_of_count",
+ new Description("Calls to GroupMemberships.containsAnyOf"),
+ SYSTEM_FIELD,
+ Field.ofBoolean("contains_any_of", (meta, value) -> {}).build());
+ this.intersectionCount =
+ metricMaker.newCounter(
+ "group/intersection_count",
+ new Description("Calls to GroupMemberships.intersection"),
+ SYSTEM_FIELD,
+ Field.ofInteger("num_intersection", (meta, value) -> {}).build());
+ this.knownGroupsCount =
+ metricMaker.newCounter(
+ "group/known_groups_count",
+ new Description("Calls to GroupMemberships.getKnownGroups"),
+ SYSTEM_FIELD,
+ Field.ofInteger("num_known_groups", (meta, value) -> {}).build());
}
@Nullable
@@ -70,7 +122,12 @@
@Override
public boolean handles(AccountGroup.UUID uuid) {
- return backend(uuid) != null;
+ GroupBackend b = backend(uuid);
+ if (b == null) {
+ return false;
+ }
+ handlesCount.increment(name(b));
+ return true;
}
@Override
@@ -83,13 +140,19 @@
logger.atFine().log("Unknown GroupBackend for UUID: %s", uuid);
return null;
}
+ getCount.increment(name(b));
return b.get(uuid);
}
@Override
public Collection<GroupReference> suggest(String name, ProjectState project) {
Set<GroupReference> groups = Sets.newTreeSet(GROUP_REF_NAME_COMPARATOR);
- backends.runEach(g -> groups.addAll(g.suggest(name, project)));
+ backends.runEach(
+ g -> {
+ Collection<GroupReference> suggestions = g.suggest(name, project);
+ suggestCount.increment(name(g), suggestions.size());
+ groups.addAll(suggestions);
+ });
return groups;
}
@@ -108,11 +171,11 @@
}
@Nullable
- private GroupMembership membership(AccountGroup.UUID uuid) {
+ private Map.Entry<GroupBackend, GroupMembership> membership(AccountGroup.UUID uuid) {
if (uuid != null) {
for (Map.Entry<GroupBackend, GroupMembership> m : memberships.entrySet()) {
if (m.getKey().handles(uuid)) {
- return m.getValue();
+ return m;
}
}
}
@@ -125,51 +188,57 @@
if (uuid == null) {
return false;
}
- GroupMembership m = membership(uuid);
+ Map.Entry<GroupBackend, GroupMembership> m = membership(uuid);
if (m == null) {
return false;
}
- return m.contains(uuid);
+ boolean contains = m.getValue().contains(uuid);
+ containsCount.increment(name(m.getKey()), contains);
+ return contains;
}
@Override
public boolean containsAnyOf(Iterable<AccountGroup.UUID> uuids) {
- ListMultimap<GroupMembership, AccountGroup.UUID> lookups =
+ ListMultimap<Map.Entry<GroupBackend, GroupMembership>, AccountGroup.UUID> lookups =
MultimapBuilder.hashKeys().arrayListValues().build();
for (AccountGroup.UUID uuid : uuids) {
if (uuid == null) {
continue;
}
- GroupMembership m = membership(uuid);
+ Map.Entry<GroupBackend, GroupMembership> m = membership(uuid);
if (m == null) {
continue;
}
lookups.put(m, uuid);
}
- for (Map.Entry<GroupMembership, Collection<AccountGroup.UUID>> entry :
- lookups.asMap().entrySet()) {
- GroupMembership m = entry.getKey();
- Collection<AccountGroup.UUID> ids = entry.getValue();
+ for (Map.Entry<GroupBackend, GroupMembership> groupBackends : lookups.asMap().keySet()) {
+
+ GroupMembership m = groupBackends.getValue();
+ Collection<AccountGroup.UUID> ids = lookups.asMap().get(groupBackends);
if (ids.size() == 1) {
if (m.contains(Iterables.getOnlyElement(ids))) {
+ containsAnyCount.increment(name(groupBackends.getKey()), true);
return true;
}
} else if (m.containsAnyOf(ids)) {
+ containsAnyCount.increment(name(groupBackends.getKey()), true);
return true;
}
+ // We would have returned if contains was true.
+ containsAnyCount.increment(name(groupBackends.getKey()), false);
}
return false;
}
@Override
public Set<AccountGroup.UUID> intersection(Iterable<AccountGroup.UUID> uuids) {
- ListMultimap<GroupMembership, AccountGroup.UUID> lookups =
+ ListMultimap<Map.Entry<GroupBackend, GroupMembership>, AccountGroup.UUID> lookups =
MultimapBuilder.hashKeys().arrayListValues().build();
for (AccountGroup.UUID uuid : uuids) {
if (uuid == null) {
continue;
}
- GroupMembership m = membership(uuid);
+ Map.Entry<GroupBackend, GroupMembership> m = membership(uuid);
if (m == null) {
logger.atFine().log("Unknown GroupMembership for UUID: %s", uuid);
continue;
@@ -177,9 +246,11 @@
lookups.put(m, uuid);
}
Set<AccountGroup.UUID> groups = new HashSet<>();
- for (Map.Entry<GroupMembership, Collection<AccountGroup.UUID>> entry :
- lookups.asMap().entrySet()) {
- groups.addAll(entry.getKey().intersection(entry.getValue()));
+ for (Map.Entry<GroupBackend, GroupMembership> groupBackend : lookups.asMap().keySet()) {
+ Set<AccountGroup.UUID> intersection =
+ groupBackend.getValue().intersection(lookups.asMap().get(groupBackend));
+ intersectionCount.increment(name(groupBackend.getKey()), intersection.size());
+ groups.addAll(intersection);
}
return groups;
}
@@ -187,8 +258,10 @@
@Override
public Set<AccountGroup.UUID> getKnownGroups() {
Set<AccountGroup.UUID> groups = new HashSet<>();
- for (GroupMembership m : memberships.values()) {
- groups.addAll(m.getKnownGroups());
+ for (Map.Entry<GroupBackend, GroupMembership> entry : memberships.entrySet()) {
+ Set<AccountGroup.UUID> knownGroups = entry.getValue().getKnownGroups();
+ knownGroupsCount.increment(name(entry.getKey()), knownGroups.size());
+ groups.addAll(knownGroups);
}
return groups;
}
@@ -204,6 +277,13 @@
return false;
}
+ private static String name(GroupBackend backend) {
+ if (backend == null) {
+ return "none";
+ }
+ return backend.getClass().getSimpleName();
+ }
+
public static class ConfigCheck implements StartupCheck {
private final Config cfg;
private final UniversalGroupBackend universalGroupBackend;
diff --git a/java/com/google/gerrit/server/account/externalids/ExternalId.java b/java/com/google/gerrit/server/account/externalids/ExternalId.java
index 0a51171..1616198 100644
--- a/java/com/google/gerrit/server/account/externalids/ExternalId.java
+++ b/java/com/google/gerrit/server/account/externalids/ExternalId.java
@@ -135,6 +135,9 @@
/** Scheme used for GPG public keys. */
public static final String SCHEME_GPGKEY = "gpgkey";
+ /** Scheme for imported accounts from other servers with different GerritServerId */
+ public static final String SCHEME_IMPORTED = "imported";
+
/** Scheme for external auth used during authentication, e.g. OAuth Token */
public static final String SCHEME_EXTERNAL = "external";
diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java b/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java
index 9f766d0..fe8feac 100644
--- a/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java
+++ b/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java
@@ -30,7 +30,7 @@
*
* <p>All returned collections are unmodifiable.
*/
-interface ExternalIdCache {
+public interface ExternalIdCache {
Optional<ExternalId> byKey(ExternalId.Key key) throws IOException;
ImmutableSet<ExternalId> byAccount(Account.Id accountId) throws IOException;
diff --git a/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java b/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
index a49061d..1713171 100644
--- a/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
+++ b/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
@@ -19,7 +19,6 @@
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.common.Nullable;
-import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.api.changes.AbandonInput;
import com.google.gerrit.extensions.api.changes.AssigneeInput;
import com.google.gerrit.extensions.api.changes.AttentionSetApi;
@@ -65,8 +64,6 @@
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.server.DynamicOptions;
-import com.google.gerrit.server.StarredChangesUtil;
-import com.google.gerrit.server.StarredChangesUtil.IllegalLabelException;
import com.google.gerrit.server.change.ChangeMessageResource;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.WorkInProgressOp;
@@ -88,7 +85,6 @@
import com.google.gerrit.server.restapi.change.GetPastAssignees;
import com.google.gerrit.server.restapi.change.GetPureRevert;
import com.google.gerrit.server.restapi.change.GetTopic;
-import com.google.gerrit.server.restapi.change.Ignore;
import com.google.gerrit.server.restapi.change.Index;
import com.google.gerrit.server.restapi.change.ListChangeComments;
import com.google.gerrit.server.restapi.change.ListChangeDrafts;
@@ -111,7 +107,6 @@
import com.google.gerrit.server.restapi.change.SetWorkInProgress;
import com.google.gerrit.server.restapi.change.SubmittedTogether;
import com.google.gerrit.server.restapi.change.SuggestChangeReviewers;
-import com.google.gerrit.server.restapi.change.Unignore;
import com.google.gerrit.util.cli.CmdLineParser;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -167,18 +162,15 @@
private final Provider<ListChangeDrafts> listDraftsProvider;
private final ChangeEditApiImpl.Factory changeEditApi;
private final Check check;
- private final CheckSubmitRequirement checkSubmitRequirement;
+ private final Provider<CheckSubmitRequirement> checkSubmitRequirementProvider;
private final Index index;
private final Move move;
private final PostPrivate postPrivate;
private final DeletePrivate deletePrivate;
- private final Ignore ignore;
- private final Unignore unignore;
private final SetWorkInProgress setWip;
private final SetReadyForReview setReady;
private final PutMessage putMessage;
private final Provider<GetPureRevert> getPureRevertProvider;
- private final StarredChangesUtil stars;
private final DynamicOptionParser dynamicOptionParser;
private final Injector injector;
private final DynamicMap<DynamicOptions.DynamicBean> dynamicBeans;
@@ -222,18 +214,15 @@
Provider<ListChangeDrafts> listDraftsProvider,
ChangeEditApiImpl.Factory changeEditApi,
Check check,
- CheckSubmitRequirement checkSubmitRequirement,
+ Provider<CheckSubmitRequirement> checkSubmitRequirement,
Index index,
Move move,
PostPrivate postPrivate,
DeletePrivate deletePrivate,
- Ignore ignore,
- Unignore unignore,
SetWorkInProgress setWip,
SetReadyForReview setReady,
PutMessage putMessage,
Provider<GetPureRevert> getPureRevertProvider,
- StarredChangesUtil stars,
DynamicOptionParser dynamicOptionParser,
@Assisted ChangeResource change,
Injector injector,
@@ -275,18 +264,15 @@
this.listDraftsProvider = listDraftsProvider;
this.changeEditApi = changeEditApi;
this.check = check;
- this.checkSubmitRequirement = checkSubmitRequirement;
+ this.checkSubmitRequirementProvider = checkSubmitRequirement;
this.index = index;
this.move = move;
this.postPrivate = postPrivate;
this.deletePrivate = deletePrivate;
- this.ignore = ignore;
- this.unignore = unignore;
this.setWip = setWip;
this.setReady = setReady;
this.putMessage = putMessage;
this.getPureRevertProvider = getPureRevertProvider;
- this.stars = stars;
this.dynamicOptionParser = dynamicOptionParser;
this.change = change;
this.injector = injector;
@@ -714,10 +700,27 @@
}
@Override
+ public CheckSubmitRequirementRequest checkSubmitRequirementRequest() {
+ return new CheckSubmitRequirementRequest() {
+ @Override
+ public SubmitRequirementResultInfo get() throws RestApiException {
+ try {
+ CheckSubmitRequirement check = checkSubmitRequirementProvider.get();
+ check.setSrName(this.srName());
+ check.setRefsConfigChangeId(this.getRefsConfigChangeId());
+ return check.apply(change, null).value();
+ } catch (Exception e) {
+ throw asRestApiException("Cannot check submit requirement", e);
+ }
+ }
+ };
+ }
+
+ @Override
public SubmitRequirementResultInfo checkSubmitRequirement(SubmitRequirementInput input)
throws RestApiException {
try {
- return checkSubmitRequirement.apply(change, input).value();
+ return checkSubmitRequirementProvider.get().apply(change, input).value();
} catch (Exception e) {
throw asRestApiException("Cannot check submit requirement", e);
}
@@ -733,30 +736,6 @@
}
@Override
- public void ignore(boolean ignore) throws RestApiException {
- // TODO(dborowitz): Convert to RetryingRestModifyView. Needs to plumb BatchUpdate.Factory into
- // StarredChangesUtil.
- try {
- if (ignore) {
- this.ignore.apply(change, new Input());
- } else {
- unignore.apply(change, new Input());
- }
- } catch (StorageException | IllegalLabelException e) {
- throw asRestApiException("Cannot ignore change", e);
- }
- }
-
- @Override
- public boolean ignored() throws RestApiException {
- try {
- return stars.isIgnored(change);
- } catch (StorageException e) {
- throw asRestApiException("Cannot check if ignored", e);
- }
- }
-
- @Override
public PureRevertInfo pureRevert() throws RestApiException {
return pureRevert(null);
}
diff --git a/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java b/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
index 9aa9306..a7931f1 100644
--- a/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
+++ b/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
@@ -29,6 +29,7 @@
import com.google.gerrit.extensions.api.changes.DraftApi;
import com.google.gerrit.extensions.api.changes.DraftInput;
import com.google.gerrit.extensions.api.changes.FileApi;
+import com.google.gerrit.extensions.api.changes.GetRelatedOption;
import com.google.gerrit.extensions.api.changes.RebaseInput;
import com.google.gerrit.extensions.api.changes.RelatedChangesInfo;
import com.google.gerrit.extensions.api.changes.ReviewInput;
@@ -40,6 +41,7 @@
import com.google.gerrit.extensions.client.ArchiveFormat;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.ActionInfo;
+import com.google.gerrit.extensions.common.ApplyProvidedFixInput;
import com.google.gerrit.extensions.common.ApprovalInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.CommentInfo;
@@ -64,7 +66,8 @@
import com.google.gerrit.server.change.RebaseUtil;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.git.GitRepositoryManager;
-import com.google.gerrit.server.restapi.change.ApplyFix;
+import com.google.gerrit.server.restapi.change.ApplyProvidedFix;
+import com.google.gerrit.server.restapi.change.ApplyStoredFix;
import com.google.gerrit.server.restapi.change.CherryPick;
import com.google.gerrit.server.restapi.change.Comments;
import com.google.gerrit.server.restapi.change.CreateDraftComment;
@@ -74,7 +77,6 @@
import com.google.gerrit.server.restapi.change.GetArchive;
import com.google.gerrit.server.restapi.change.GetCommit;
import com.google.gerrit.server.restapi.change.GetDescription;
-import com.google.gerrit.server.restapi.change.GetFixPreview;
import com.google.gerrit.server.restapi.change.GetMergeList;
import com.google.gerrit.server.restapi.change.GetPatch;
import com.google.gerrit.server.restapi.change.GetRelated;
@@ -86,6 +88,7 @@
import com.google.gerrit.server.restapi.change.ListRobotComments;
import com.google.gerrit.server.restapi.change.Mergeable;
import com.google.gerrit.server.restapi.change.PostReview;
+import com.google.gerrit.server.restapi.change.PreviewFix;
import com.google.gerrit.server.restapi.change.PutDescription;
import com.google.gerrit.server.restapi.change.Rebase;
import com.google.gerrit.server.restapi.change.Reviewed;
@@ -132,8 +135,10 @@
private final ListRobotComments listRobotComments;
private final ListPortedComments listPortedComments;
private final ListPortedDrafts listPortedDrafts;
- private final ApplyFix applyFix;
- private final GetFixPreview getFixPreview;
+ private final ApplyStoredFix applyStoredFix;
+ private final PreviewFix.Stored previewStoredFix;
+ private final ApplyProvidedFix applyProvidedFix;
+ private final PreviewFix.Provided previewProvidedFix;
private final Fixes fixes;
private final ListRevisionDrafts listDrafts;
private final CreateDraftComment createDraft;
@@ -178,8 +183,10 @@
ListRobotComments listRobotComments,
ListPortedComments listPortedComments,
ListPortedDrafts listPortedDrafts,
- ApplyFix applyFix,
- GetFixPreview getFixPreview,
+ ApplyStoredFix applyStoredFix,
+ PreviewFix.Stored previewStoredFix,
+ ApplyProvidedFix applyProvidedFix,
+ PreviewFix.Provided previewProvidedFix,
Fixes fixes,
ListRevisionDrafts listDrafts,
CreateDraftComment createDraft,
@@ -223,8 +230,10 @@
this.listRobotComments = listRobotComments;
this.listPortedComments = listPortedComments;
this.listPortedDrafts = listPortedDrafts;
- this.applyFix = applyFix;
- this.getFixPreview = getFixPreview;
+ this.applyStoredFix = applyStoredFix;
+ this.previewStoredFix = previewStoredFix;
+ this.applyProvidedFix = applyProvidedFix;
+ this.previewProvidedFix = previewProvidedFix;
this.fixes = fixes;
this.listDrafts = listDrafts;
this.createDraft = createDraft;
@@ -477,7 +486,16 @@
@Override
public EditInfo applyFix(String fixId) throws RestApiException {
try {
- return applyFix.apply(fixes.parse(revision, IdString.fromDecoded(fixId)), null).value();
+ return applyStoredFix.apply(fixes.parse(revision, IdString.fromDecoded(fixId)), null).value();
+ } catch (Exception e) {
+ throw asRestApiException("Cannot apply stored fix", e);
+ }
+ }
+
+ @Override
+ public EditInfo applyFix(ApplyProvidedFixInput applyProvidedFixInput) throws RestApiException {
+ try {
+ return applyProvidedFix.apply(revision, applyProvidedFixInput).value();
} catch (Exception e) {
throw asRestApiException("Cannot apply fix", e);
}
@@ -486,9 +504,19 @@
@Override
public Map<String, DiffInfo> getFixPreview(String fixId) throws RestApiException {
try {
- return getFixPreview.apply(fixes.parse(revision, IdString.fromDecoded(fixId))).value();
+ return previewStoredFix.apply(fixes.parse(revision, IdString.fromDecoded(fixId))).value();
} catch (Exception e) {
- throw asRestApiException("Cannot get fix preview", e);
+ throw asRestApiException("Cannot preview stored fix", e);
+ }
+ }
+
+ @Override
+ public Map<String, DiffInfo> getFixPreview(ApplyProvidedFixInput applyProvidedFixInput)
+ throws RestApiException {
+ try {
+ return previewProvidedFix.apply(revision, applyProvidedFixInput).value();
+ } catch (Exception e) {
+ throw asRestApiException("Cannot preview provided fix", e);
}
}
@@ -615,7 +643,13 @@
@Override
public RelatedChangesInfo related() throws RestApiException {
+ return related(EnumSet.noneOf(GetRelatedOption.class));
+ }
+
+ @Override
+ public RelatedChangesInfo related(EnumSet<GetRelatedOption> options) throws RestApiException {
try {
+ options.forEach(getRelated::addOption);
return getRelated.apply(revision).value();
} catch (Exception e) {
throw asRestApiException("Cannot get related changes", e);
diff --git a/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java b/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
index 5baed86..3a892bc 100644
--- a/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
+++ b/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
@@ -41,6 +41,7 @@
import com.google.gerrit.extensions.api.projects.ParentInput;
import com.google.gerrit.extensions.api.projects.ProjectApi;
import com.google.gerrit.extensions.api.projects.ProjectInput;
+import com.google.gerrit.extensions.api.projects.SubmitRequirementApi;
import com.google.gerrit.extensions.api.projects.TagApi;
import com.google.gerrit.extensions.api.projects.TagInfo;
import com.google.gerrit.extensions.common.BatchLabelInput;
@@ -48,6 +49,7 @@
import com.google.gerrit.extensions.common.Input;
import com.google.gerrit.extensions.common.LabelDefinitionInfo;
import com.google.gerrit.extensions.common.ProjectInfo;
+import com.google.gerrit.extensions.common.SubmitRequirementInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.NotImplementedException;
@@ -78,6 +80,7 @@
import com.google.gerrit.server.restapi.project.ListBranches;
import com.google.gerrit.server.restapi.project.ListDashboards;
import com.google.gerrit.server.restapi.project.ListLabels;
+import com.google.gerrit.server.restapi.project.ListSubmitRequirements;
import com.google.gerrit.server.restapi.project.ListTags;
import com.google.gerrit.server.restapi.project.PostLabels;
import com.google.gerrit.server.restapi.project.ProjectsCollection;
@@ -138,8 +141,10 @@
private final Index index;
private final IndexChanges indexChanges;
private final Provider<ListLabels> listLabels;
+ private final Provider<ListSubmitRequirements> listSubmitRequirements;
private final PostLabels postLabels;
private final LabelApiImpl.Factory labelApi;
+ private final SubmitRequirementApiImpl.Factory submitRequirementApi;
@AssistedInject
ProjectApiImpl(
@@ -177,8 +182,10 @@
Index index,
IndexChanges indexChanges,
Provider<ListLabels> listLabels,
+ Provider<ListSubmitRequirements> listSubmitRequirements,
PostLabels postLabels,
LabelApiImpl.Factory labelApi,
+ SubmitRequirementApiImpl.Factory submitRequirementApi,
@Assisted ProjectResource project) {
this(
permissionBackend,
@@ -216,8 +223,10 @@
index,
indexChanges,
listLabels,
+ listSubmitRequirements,
postLabels,
labelApi,
+ submitRequirementApi,
null);
}
@@ -257,8 +266,10 @@
Index index,
IndexChanges indexChanges,
Provider<ListLabels> listLabels,
+ Provider<ListSubmitRequirements> listSubmitRequirements,
PostLabels postLabels,
LabelApiImpl.Factory labelApi,
+ SubmitRequirementApiImpl.Factory submitRequirementApi,
@Assisted String name) {
this(
permissionBackend,
@@ -296,8 +307,10 @@
index,
indexChanges,
listLabels,
+ listSubmitRequirements,
postLabels,
labelApi,
+ submitRequirementApi,
name);
}
@@ -337,8 +350,10 @@
Index index,
IndexChanges indexChanges,
Provider<ListLabels> listLabels,
+ Provider<ListSubmitRequirements> listSubmitRequirements,
PostLabels postLabels,
LabelApiImpl.Factory labelApi,
+ SubmitRequirementApiImpl.Factory submitRequirementApi,
String name) {
this.permissionBackend = permissionBackend;
this.createProject = createProject;
@@ -376,8 +391,10 @@
this.index = index;
this.indexChanges = indexChanges;
this.listLabels = listLabels;
+ this.listSubmitRequirements = listSubmitRequirements;
this.postLabels = postLabels;
this.labelApi = labelApi;
+ this.submitRequirementApi = submitRequirementApi;
}
@Override
@@ -737,6 +754,20 @@
}
@Override
+ public ListSubmitRequirementsRequest submitRequirements() {
+ return new ListSubmitRequirementsRequest() {
+ @Override
+ public List<SubmitRequirementInfo> get() throws RestApiException {
+ try {
+ return listSubmitRequirements.get().withInherited(inherited).apply(checkExists()).value();
+ } catch (Exception e) {
+ throw asRestApiException("Cannot list submit requirements", e);
+ }
+ }
+ };
+ }
+
+ @Override
public LabelApi label(String labelName) throws RestApiException {
try {
return labelApi.create(checkExists(), labelName);
@@ -746,6 +777,15 @@
}
@Override
+ public SubmitRequirementApi submitRequirement(String name) throws RestApiException {
+ try {
+ return submitRequirementApi.create(checkExists(), name);
+ } catch (Exception e) {
+ throw asRestApiException("Cannot parse submit requirement", e);
+ }
+ }
+
+ @Override
public void labels(BatchLabelInput input) throws RestApiException {
try {
postLabels.apply(checkExists(), input);
diff --git a/java/com/google/gerrit/server/api/projects/ProjectsModule.java b/java/com/google/gerrit/server/api/projects/ProjectsModule.java
index 987c71f..9f7e1b4 100644
--- a/java/com/google/gerrit/server/api/projects/ProjectsModule.java
+++ b/java/com/google/gerrit/server/api/projects/ProjectsModule.java
@@ -29,5 +29,6 @@
factory(CommitApiImpl.Factory.class);
factory(DashboardApiImpl.Factory.class);
factory(LabelApiImpl.Factory.class);
+ factory(SubmitRequirementApiImpl.Factory.class);
}
}
diff --git a/java/com/google/gerrit/server/api/projects/SubmitRequirementApiImpl.java b/java/com/google/gerrit/server/api/projects/SubmitRequirementApiImpl.java
new file mode 100644
index 0000000..aa6ef71
--- /dev/null
+++ b/java/com/google/gerrit/server/api/projects/SubmitRequirementApiImpl.java
@@ -0,0 +1,122 @@
+// Copyright (C) 2022 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.server.api.projects;
+
+import static com.google.gerrit.server.api.ApiUtil.asRestApiException;
+import static com.google.gerrit.server.project.ProjectCache.illegalState;
+
+import com.google.gerrit.extensions.api.projects.SubmitRequirementApi;
+import com.google.gerrit.extensions.common.Input;
+import com.google.gerrit.extensions.common.SubmitRequirementInfo;
+import com.google.gerrit.extensions.common.SubmitRequirementInput;
+import com.google.gerrit.extensions.restapi.IdString;
+import com.google.gerrit.extensions.restapi.RestApiException;
+import com.google.gerrit.server.permissions.PermissionBackendException;
+import com.google.gerrit.server.project.ProjectCache;
+import com.google.gerrit.server.project.ProjectResource;
+import com.google.gerrit.server.project.SubmitRequirementResource;
+import com.google.gerrit.server.restapi.project.CreateSubmitRequirement;
+import com.google.gerrit.server.restapi.project.DeleteSubmitRequirement;
+import com.google.gerrit.server.restapi.project.GetSubmitRequirement;
+import com.google.gerrit.server.restapi.project.SubmitRequirementsCollection;
+import com.google.gerrit.server.restapi.project.UpdateSubmitRequirement;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+
+public class SubmitRequirementApiImpl implements SubmitRequirementApi {
+ interface Factory {
+ SubmitRequirementApiImpl create(ProjectResource project, String name);
+ }
+
+ private final SubmitRequirementsCollection submitRequirements;
+ private final CreateSubmitRequirement createSubmitRequirement;
+ private final UpdateSubmitRequirement updateSubmitRequirement;
+ private final DeleteSubmitRequirement deleteSubmitRequirement;
+ private final GetSubmitRequirement getSubmitRequirement;
+ private final String name;
+ private final ProjectCache projectCache;
+
+ private ProjectResource project;
+
+ @Inject
+ SubmitRequirementApiImpl(
+ SubmitRequirementsCollection submitRequirements,
+ CreateSubmitRequirement createSubmitRequirement,
+ UpdateSubmitRequirement updateSubmitRequirement,
+ DeleteSubmitRequirement deleteSubmitRequirement,
+ GetSubmitRequirement getSubmitRequirement,
+ ProjectCache projectCache,
+ @Assisted ProjectResource project,
+ @Assisted String name) {
+ this.submitRequirements = submitRequirements;
+ this.createSubmitRequirement = createSubmitRequirement;
+ this.updateSubmitRequirement = updateSubmitRequirement;
+ this.deleteSubmitRequirement = deleteSubmitRequirement;
+ this.getSubmitRequirement = getSubmitRequirement;
+ this.projectCache = projectCache;
+ this.project = project;
+ this.name = name;
+ }
+
+ @Override
+ public SubmitRequirementApi create(SubmitRequirementInput input) throws RestApiException {
+ try {
+ createSubmitRequirement.apply(project, IdString.fromDecoded(name), input);
+
+ // recreate project resource because project state was updated
+ project =
+ new ProjectResource(
+ projectCache
+ .get(project.getNameKey())
+ .orElseThrow(illegalState(project.getNameKey())),
+ project.getUser());
+
+ return this;
+ } catch (Exception e) {
+ throw asRestApiException("Cannot create submit requirement", e);
+ }
+ }
+
+ @Override
+ public SubmitRequirementInfo get() throws RestApiException {
+ try {
+ return getSubmitRequirement.apply(resource()).value();
+ } catch (Exception e) {
+ throw asRestApiException("Cannot get submit requirement", e);
+ }
+ }
+
+ @Override
+ public SubmitRequirementInfo update(SubmitRequirementInput input) throws RestApiException {
+ try {
+ return updateSubmitRequirement.apply(resource(), input).value();
+ } catch (Exception e) {
+ throw asRestApiException("Cannot update submit requirement", e);
+ }
+ }
+
+ @Override
+ public void delete() throws RestApiException {
+ try {
+ deleteSubmitRequirement.apply(resource(), new Input());
+ } catch (Exception e) {
+ throw asRestApiException("Cannot delete submit requirement", e);
+ }
+ }
+
+ private SubmitRequirementResource resource() throws RestApiException, PermissionBackendException {
+ return submitRequirements.parse(project, IdString.fromDecoded(name));
+ }
+}
diff --git a/java/com/google/gerrit/server/approval/ApprovalCopier.java b/java/com/google/gerrit/server/approval/ApprovalCopier.java
index 31380f4..059445e 100644
--- a/java/com/google/gerrit/server/approval/ApprovalCopier.java
+++ b/java/com/google/gerrit/server/approval/ApprovalCopier.java
@@ -14,15 +14,16 @@
package com.google.gerrit.server.approval;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.gerrit.server.project.ProjectCache.illegalState;
+import com.google.auto.value.AutoValue;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Table;
import com.google.common.flogger.FluentLogger;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.LabelTypes;
@@ -32,76 +33,122 @@
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.client.ChangeKind;
import com.google.gerrit.index.query.QueryParseException;
+import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.change.ChangeKindCache;
import com.google.gerrit.server.change.LabelNormalizer;
+import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.logging.Metadata;
import com.google.gerrit.server.logging.TraceContext;
import com.google.gerrit.server.logging.TraceContext.TraceTimer;
import com.google.gerrit.server.notedb.ChangeNotes;
-import com.google.gerrit.server.patch.DiffNotAvailableException;
-import com.google.gerrit.server.patch.DiffOperations;
-import com.google.gerrit.server.patch.DiffOptions;
-import com.google.gerrit.server.patch.gitdiff.ModifiedFile;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.query.approval.ApprovalContext;
import com.google.gerrit.server.query.approval.ApprovalQueryBuilder;
-import com.google.gerrit.server.query.approval.ListOfFilesUnchangedPredicate;
import com.google.gerrit.server.util.ManualRequestContext;
import com.google.gerrit.server.util.OneOffRequestContext;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
-import java.util.Collection;
import java.util.Map;
import java.util.Optional;
import org.eclipse.jgit.lib.Config;
-import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevWalk;
/**
- * Computes approvals for a given patch set by looking at approvals applied to the given patch set
- * and by additionally copying approvals from the previous patch set. The latter is done by
- * asserting a change's kind and checking the project config for copy conditions.
+ * Computes copied approvals for a given patch set.
*
- * <p>The result of a copy is stored in NoteDb when a new patch set is created.
+ * <p>Approvals are copied if:
+ *
+ * <ul>
+ * <li>the approval on the previous patch set matches the copy condition of its label
+ * <li>the approval is not overridden by a current approval on the patch set
+ * </ul>
+ *
+ * <p>Callers should store the copied approvals in NoteDb when a new patch set is created.
*/
@Singleton
-class ApprovalCopier {
+@VisibleForTesting
+public class ApprovalCopier {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
- private final DiffOperations diffOperations;
+ @AutoValue
+ public abstract static class Result {
+ /**
+ * Approvals that have been copied from the previous patch set.
+ *
+ * <p>An approval is copied if:
+ *
+ * <ul>
+ * <li>the approval on the previous patch set matches the copy condition of its label
+ * <li>the approval is not overridden by a current approval on the patch set
+ * </ul>
+ */
+ public abstract ImmutableSet<PatchSetApproval> copiedApprovals();
+
+ /**
+ * Approvals on the previous patch set that have not been copied to the patch set.
+ *
+ * <p>These approvals didn't match the copy condition of their labels and hence haven't been
+ * copied.
+ *
+ * <p>Only returns non-copied approvals of the previous patch set. Approvals from earlier patch
+ * sets that were outdated before are not included.
+ */
+ public abstract ImmutableSet<PatchSetApproval> outdatedApprovals();
+
+ static Result empty() {
+ return create(
+ /* copiedApprovals= */ ImmutableSet.of(), /* outdatedApprovals= */ ImmutableSet.of());
+ }
+
+ @VisibleForTesting
+ public static Result create(
+ ImmutableSet<PatchSetApproval> copiedApprovals,
+ ImmutableSet<PatchSetApproval> outdatedApprovals) {
+ return new AutoValue_ApprovalCopier_Result(copiedApprovals, outdatedApprovals);
+ }
+ }
+
+ private final GitRepositoryManager repoManager;
private final ProjectCache projectCache;
private final ChangeKindCache changeKindCache;
+ private final PatchSetUtil psUtil;
private final LabelNormalizer labelNormalizer;
private final ApprovalQueryBuilder approvalQueryBuilder;
private final OneOffRequestContext requestContext;
- private final ListOfFilesUnchangedPredicate listOfFilesUnchangedPredicate;
@Inject
ApprovalCopier(
- DiffOperations diffOperations,
+ GitRepositoryManager repoManager,
ProjectCache projectCache,
ChangeKindCache changeKindCache,
+ PatchSetUtil psUtil,
LabelNormalizer labelNormalizer,
ApprovalQueryBuilder approvalQueryBuilder,
- OneOffRequestContext requestContext,
- ListOfFilesUnchangedPredicate listOfFilesUnchangedPredicate) {
- this.diffOperations = diffOperations;
+ OneOffRequestContext requestContext) {
+ this.repoManager = repoManager;
this.projectCache = projectCache;
this.changeKindCache = changeKindCache;
+ this.psUtil = psUtil;
this.labelNormalizer = labelNormalizer;
this.approvalQueryBuilder = approvalQueryBuilder;
this.requestContext = requestContext;
- this.listOfFilesUnchangedPredicate = listOfFilesUnchangedPredicate;
}
/**
- * Returns all approvals that apply to the given patch set. Honors copied approvals from previous
- * patch-set.
+ * Returns all copied approvals that apply to the given patch set.
+ *
+ * <p>Approvals are copied if:
+ *
+ * <ul>
+ * <li>the approval on the previous patch set matches the copy condition of its label
+ * <li>the approval is not overridden by a current approval on the patch set
+ * </ul>
*/
- Iterable<PatchSetApproval> forPatchSet(
- ChangeNotes notes, PatchSet ps, RevWalk rw, Config repoConfig) {
+ @VisibleForTesting
+ public Result forPatchSet(ChangeNotes notes, PatchSet ps, RevWalk rw, Config repoConfig) {
ProjectState project;
try (TraceTimer traceTimer =
TraceContext.newTimer(
@@ -114,226 +161,132 @@
projectCache
.get(notes.getProjectName())
.orElseThrow(illegalState(notes.getProjectName()));
- Collection<PatchSetApproval> approvals =
- getForPatchSetWithoutNormalization(notes, project, ps, rw, repoConfig);
- return labelNormalizer.normalize(notes, approvals).getNormalized();
+ return computeForPatchSet(project.getLabelTypes(), notes, ps, rw, repoConfig);
}
}
- private boolean canCopyBasedOnBooleanLabelConfigs(
- ProjectState project,
- PatchSetApproval psa,
- PatchSet.Id psId,
- ChangeKind kind,
- boolean isMerge,
- LabelType type,
- @Nullable Map<String, ModifiedFile> baseVsCurrentDiff,
- @Nullable Map<String, ModifiedFile> baseVsPriorDiff,
- @Nullable Map<String, ModifiedFile> priorVsCurrentDiff) {
- int n = psa.key().patchSetId().get();
- checkArgument(n != psId.get());
-
- if (type.isCopyMinScore() && type.isMaxNegative(psa)) {
- logger.atFine().log(
- "veto approval %s on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because the label has set copyMinScore = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- project.getName());
- return true;
- } else if (type.isCopyMaxScore() && type.isMaxPositive(psa)) {
- logger.atFine().log(
- "max approval %s on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because the label has set copyMaxScore = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- project.getName());
- return true;
- } else if (type.isCopyAnyScore()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because the label has set copyAnyScore = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- project.getName());
- return true;
- } else if (type.getCopyValues().contains(psa.value())) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because the label has set copyValue = %d on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- psa.value(),
- project.getName());
- return true;
- } else if (type.isCopyAllScoresIfListOfFilesDidNotChange()
- && listOfFilesUnchangedPredicate.match(
- baseVsCurrentDiff, baseVsPriorDiff, priorVsCurrentDiff)) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because the label has set "
- + "copyAllScoresIfListOfFilesDidNotChange = true on "
- + "project %s and list of files did not change (maybe except a rename, which is "
- + "still the same file).",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- project.getName());
- return true;
- }
- switch (kind) {
- case MERGE_FIRST_PARENT_UPDATE:
- if (type.isCopyAllScoresOnMergeFirstParentUpdate()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresOnMergeFirstParentUpdate = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- return false;
- case NO_CODE_CHANGE:
- if (type.isCopyAllScoresIfNoCodeChange()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresIfNoCodeChange = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- return false;
- case TRIVIAL_REBASE:
- if (type.isCopyAllScoresOnTrivialRebase()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresOnTrivialRebase = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- return false;
- case NO_CHANGE:
- if (type.isCopyAllScoresIfNoChange()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresIfNoCodeChange = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- if (type.isCopyAllScoresOnTrivialRebase()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresOnTrivialRebase = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- if (isMerge && type.isCopyAllScoresOnMergeFirstParentUpdate()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresOnMergeFirstParentUpdate = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- if (type.isCopyAllScoresIfNoCodeChange()) {
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d can be copied"
- + " to patch set %d because change kind is %s and the label has set"
- + " copyAllScoresIfNoCodeChange = true on project %s",
- psa.value(),
- psa.label(),
- n,
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- kind,
- project.getName());
- return true;
- }
- return false;
- case REWORK:
- default:
- logger.atFine().log(
- "approval %d on label %s of patch set %d of change %d cannot be copied"
- + " to patch set %d because change kind is %s",
- psa.value(), psa.label(), n, psa.key().patchSetId().changeId().get(), psId.get(), kind);
- return false;
- }
- }
-
- private boolean canCopyBasedOnCopyCondition(
+ /**
+ * Returns all follow-up patch sets of the given patch set to which the given approval is
+ * copyable.
+ *
+ * <p>An approval is considered as copyable to a follow-up patch set if it matches the copy rules
+ * of the label and it is copyable to all intermediate follow-up patch sets as well.
+ *
+ * <p>The returned follow-up patch sets are returned in the order of their patch set IDs.
+ *
+ * <p>Note: This method only checks the copy rules to detect if the approval is copyable. There
+ * are other factors, not checked here, that can prevent the copying of the approval to the
+ * returned follow-up patch sets (e.g. if they already have a matching non-copy approval that
+ * prevents the copying).
+ *
+ * @param changeNotes the change notes
+ * @param sourcePatchSet the patch set on which the approval was applied
+ * @param approverId the account ID of the user that applied the approval
+ * @param label the label of the approval that was applied
+ * @param approvalValue the value of the approval that was applied
+ * @return the follow-up patch sets to which the approval is copyable, ordered by patch set ID
+ */
+ public ImmutableList<PatchSet.Id> forApproval(
ChangeNotes changeNotes,
- PatchSetApproval psa,
- PatchSet patchSet,
- LabelType type,
+ PatchSet sourcePatchSet,
+ Account.Id approverId,
+ String label,
+ short approvalValue)
+ throws IOException {
+ ImmutableList.Builder<PatchSet.Id> targetPatchSetsBuilder = ImmutableList.builder();
+
+ Optional<LabelType> labelType =
+ projectCache
+ .get(changeNotes.getProjectName())
+ .orElseThrow(illegalState(changeNotes.getProjectName()))
+ .getLabelTypes()
+ .byLabel(label);
+ if (!labelType.isPresent()) {
+ // no label type exists for this label, hence this approval cannot be copied
+ return ImmutableList.of();
+ }
+
+ try (Repository repo = repoManager.openRepository(changeNotes.getProjectName());
+ RevWalk revWalk = new RevWalk(repo)) {
+ ImmutableList<PatchSet.Id> followUpPatchSets =
+ changeNotes.getPatchSets().keySet().stream()
+ .filter(psId -> psId.get() > sourcePatchSet.id().get())
+ .collect(toImmutableList());
+ PatchSet priorPatchSet = sourcePatchSet;
+
+ // Iterate over the follow-up patch sets in order to copy the approval from their prior patch
+ // set if possible (copy from PS N-1 to PS N).
+ for (PatchSet.Id followUpPatchSetId : followUpPatchSets) {
+ PatchSet followUpPatchSet = psUtil.get(changeNotes, followUpPatchSetId);
+ ChangeKind changeKind =
+ changeKindCache.getChangeKind(
+ changeNotes.getProjectName(),
+ revWalk,
+ repo.getConfig(),
+ priorPatchSet.commitId(),
+ followUpPatchSet.commitId());
+ boolean isMerge = isMerge(changeNotes.getProjectName(), revWalk, followUpPatchSet);
+
+ if (canCopy(
+ changeNotes,
+ priorPatchSet.id(),
+ followUpPatchSet,
+ approverId,
+ labelType.get(),
+ approvalValue,
+ changeKind,
+ isMerge,
+ revWalk,
+ repo.getConfig())) {
+ targetPatchSetsBuilder.add(followUpPatchSetId);
+ } else {
+ // The approval is not copyable to this follow-up patch set.
+ // This means it's also not copyable to any further follow-up patch set and we should stop
+ // the loop here.
+ break;
+ }
+ priorPatchSet = followUpPatchSet;
+ }
+ }
+ return targetPatchSetsBuilder.build();
+ }
+
+ private boolean canCopy(
+ ChangeNotes changeNotes,
+ PatchSet.Id sourcePatchSetId,
+ PatchSet targetPatchSet,
+ Account.Id approverId,
+ LabelType labelType,
+ short approvalValue,
ChangeKind changeKind,
boolean isMerge,
RevWalk revWalk,
Config repoConfig) {
- if (!type.getCopyCondition().isPresent()) {
+ if (!labelType.getCopyCondition().isPresent()) {
return false;
}
ApprovalContext ctx =
ApprovalContext.create(
- changeNotes, psa, patchSet, changeKind, isMerge, revWalk, repoConfig);
+ changeNotes,
+ sourcePatchSetId,
+ approverId,
+ labelType,
+ approvalValue,
+ targetPatchSet,
+ changeKind,
+ isMerge,
+ revWalk,
+ repoConfig);
try {
// Use a request context to run checks as an internal user with expanded visibility. This is
// so that the output of the copy condition does not depend on who is running the current
// 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 approvalQueryBuilder.parse(type.getCopyCondition().get()).asMatchable().match(ctx);
+ return approvalQueryBuilder
+ .parse(labelType.getCopyCondition().get())
+ .asMatchable()
+ .match(ctx);
}
} catch (QueryParseException e) {
logger.atWarning().withCause(e).log(
@@ -342,100 +295,102 @@
}
}
- private Collection<PatchSetApproval> getForPatchSetWithoutNormalization(
- ChangeNotes notes, ProjectState project, PatchSet patchSet, RevWalk rw, Config repoConfig) {
- checkState(
- project.getNameKey().equals(notes.getProjectName()),
- "project must match %s, %s",
- project.getNameKey(),
- notes.getProjectName());
-
- PatchSet.Id psId = patchSet.id();
- // Add approvals on the given patch set to the result
- Table<String, Account.Id, PatchSetApproval> resultByUser = HashBasedTable.create();
- ImmutableList<PatchSetApproval> nonCopiedApprovalsForGivenPatchSet =
- notes.load().getApprovals().get(patchSet.id());
- nonCopiedApprovalsForGivenPatchSet.forEach(
- psa -> resultByUser.put(psa.label(), psa.accountId(), psa));
+ private Result computeForPatchSet(
+ LabelTypes labelTypes,
+ ChangeNotes notes,
+ PatchSet targetPatchSet,
+ RevWalk rw,
+ Config repoConfig) {
+ Project.NameKey projectName = notes.getProjectName();
+ PatchSet.Id targetPsId = targetPatchSet.id();
// Bail out immediately if this is the first patch set. Return only approvals granted on the
// given patch set.
- if (psId.get() == 1) {
- return resultByUser.values();
+ if (targetPsId.get() == 1) {
+ return Result.empty();
}
- Map.Entry<PatchSet.Id, PatchSet> priorPatchSet = notes.load().getPatchSets().lowerEntry(psId);
+ Map.Entry<PatchSet.Id, PatchSet> priorPatchSet =
+ notes.load().getPatchSets().lowerEntry(targetPsId);
if (priorPatchSet == null) {
- return resultByUser.values();
+ return Result.empty();
}
- ImmutableList<PatchSetApproval> priorApprovalsIncludingCopied =
- notes.load().getApprovalsWithCopied().get(priorPatchSet.getKey());
+ Table<String, Account.Id, PatchSetApproval> currentApprovalsByUser = HashBasedTable.create();
+ ImmutableList<PatchSetApproval> nonCopiedApprovalsForGivenPatchSet =
+ notes.load().getApprovals().onlyNonCopied().get(targetPatchSet.id());
+ nonCopiedApprovalsForGivenPatchSet.forEach(
+ psa -> currentApprovalsByUser.put(psa.label(), psa.accountId(), psa));
+
+ Table<String, Account.Id, PatchSetApproval> copiedApprovalsByUser = HashBasedTable.create();
+ ImmutableSet.Builder<PatchSetApproval> outdatedApprovalsBuilder = ImmutableSet.builder();
+
+ ImmutableList<PatchSetApproval> priorApprovals =
+ notes.load().getApprovals().all().get(priorPatchSet.getKey());
// Add labels from the previous patch set to the result in case the label isn't already there
// and settings as well as change kind allow copying.
ChangeKind changeKind =
changeKindCache.getChangeKind(
- project.getNameKey(),
+ projectName,
rw,
repoConfig,
priorPatchSet.getValue().commitId(),
- patchSet.commitId());
- boolean isMerge = isMerge(project.getNameKey(), rw, patchSet);
+ targetPatchSet.commitId());
+ boolean isMerge = isMerge(projectName, rw, targetPatchSet);
logger.atFine().log(
"change kind for patch set %d of change %d against prior patch set %s is %s",
- patchSet.id().get(),
- patchSet.id().changeId().get(),
+ targetPatchSet.id().get(),
+ targetPatchSet.id().changeId().get(),
priorPatchSet.getValue().id().changeId(),
changeKind);
- Map<String, ModifiedFile> baseVsCurrent = null;
- Map<String, ModifiedFile> baseVsPrior = null;
- Map<String, ModifiedFile> priorVsCurrent = null;
- LabelTypes labelTypes = project.getLabelTypes();
- for (PatchSetApproval psa : priorApprovalsIncludingCopied) {
- if (resultByUser.contains(psa.label(), psa.accountId())) {
+ for (PatchSetApproval priorPsa : priorApprovals) {
+ if (priorPsa.value() == 0) {
+ // approvals with a zero vote record the deletion of a vote,
+ // they should neither be copied nor be reported as outdated, hence just skip them
continue;
}
- Optional<LabelType> type = labelTypes.byLabel(psa.labelId());
- // Only compute modified files if there is a relevant label, since this is expensive.
- if (baseVsCurrent == null
- && type.isPresent()
- && type.get().isCopyAllScoresIfListOfFilesDidNotChange()) {
- baseVsCurrent = listModifiedFiles(project, patchSet, rw, repoConfig);
- baseVsPrior = listModifiedFiles(project, priorPatchSet.getValue(), rw, repoConfig);
- priorVsCurrent =
- listModifiedFiles(
- project, priorPatchSet.getValue().commitId(), patchSet.commitId(), rw, repoConfig);
- }
- if (!type.isPresent()) {
+
+ Optional<LabelType> labelType = labelTypes.byLabel(priorPsa.labelId());
+ if (!labelType.isPresent()) {
logger.atFine().log(
"approval %d on label %s of patch set %d of change %d cannot be copied"
+ " to patch set %d because the label no longer exists on project %s",
- psa.value(),
- psa.label(),
- psa.key().patchSetId().get(),
- psa.key().patchSetId().changeId().get(),
- psId.get(),
- project.getName());
+ priorPsa.value(),
+ priorPsa.label(),
+ priorPsa.key().patchSetId().get(),
+ priorPsa.key().patchSetId().changeId().get(),
+ targetPsId.get(),
+ projectName);
+ outdatedApprovalsBuilder.add(priorPsa);
continue;
}
- if (!canCopyBasedOnBooleanLabelConfigs(
- project,
- psa,
- patchSet.id(),
- changeKind,
- isMerge,
- type.get(),
- baseVsCurrent,
- baseVsPrior,
- priorVsCurrent)
- && !canCopyBasedOnCopyCondition(
- notes, psa, patchSet, type.get(), changeKind, isMerge, rw, repoConfig)) {
+ if (canCopy(
+ notes,
+ priorPsa.patchSetId(),
+ targetPatchSet,
+ priorPsa.accountId(),
+ labelType.get(),
+ priorPsa.value(),
+ changeKind,
+ isMerge,
+ rw,
+ repoConfig)) {
+ if (!currentApprovalsByUser.contains(priorPsa.label(), priorPsa.accountId())) {
+ copiedApprovalsByUser.put(
+ priorPsa.label(),
+ priorPsa.accountId(),
+ priorPsa.copyWithPatchSet(targetPatchSet.id()));
+ }
+ } else {
+ outdatedApprovalsBuilder.add(priorPsa);
continue;
}
- resultByUser.put(psa.label(), psa.accountId(), psa.copyWithPatchSet(patchSet.id()));
}
- return resultByUser.values();
+
+ ImmutableSet<PatchSetApproval> copiedApprovals =
+ labelNormalizer.normalize(notes, copiedApprovalsByUser.values()).getNormalized();
+ return Result.create(copiedApprovals, outdatedApprovalsBuilder.build());
}
private boolean isMerge(Project.NameKey project, RevWalk rw, PatchSet patchSet) {
@@ -449,58 +404,4 @@
e);
}
}
-
- /**
- * Gets the modified files between the two latest patch-sets. Can be used to compute difference in
- * files between those two patch-sets .
- */
- private Map<String, ModifiedFile> listModifiedFiles(
- ProjectState project, PatchSet ps, RevWalk revWalk, Config repoConfig) {
- try {
- Integer parentNum =
- listOfFilesUnchangedPredicate.isInitialCommit(project.getNameKey(), ps.commitId())
- ? 0
- : 1;
- return diffOperations.loadModifiedFilesAgainstParent(
- project.getNameKey(),
- ps.commitId(),
- parentNum,
- DiffOptions.DEFAULTS,
- revWalk,
- repoConfig);
- } catch (DiffNotAvailableException ex) {
- throw new StorageException(
- "failed to compute difference in files, so won't copy"
- + " votes on labels even if list of files is the same and "
- + "copyAllIfListOfFilesDidNotChange",
- ex);
- }
- }
-
- /**
- * Gets the modified files between two commits corresponding to different patchsets of the same
- * change.
- */
- private Map<String, ModifiedFile> listModifiedFiles(
- ProjectState project,
- ObjectId sourceCommit,
- ObjectId targetCommit,
- RevWalk revWalk,
- Config repoConfig) {
- try {
- return diffOperations.loadModifiedFiles(
- project.getNameKey(),
- sourceCommit,
- targetCommit,
- DiffOptions.DEFAULTS,
- revWalk,
- repoConfig);
- } catch (DiffNotAvailableException ex) {
- throw new StorageException(
- "failed to compute difference in files, so won't copy"
- + " votes on labels even if list of files is the same and "
- + "copyAllIfListOfFilesDidNotChange",
- ex);
- }
- }
}
diff --git a/java/com/google/gerrit/server/approval/ApprovalsUtil.java b/java/com/google/gerrit/server/approval/ApprovalsUtil.java
index fdcaf69..8014e17 100644
--- a/java/com/google/gerrit/server/approval/ApprovalsUtil.java
+++ b/java/com/google/gerrit/server/approval/ApprovalsUtil.java
@@ -15,18 +15,29 @@
package com.google.gerrit.server.approval;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableListMultimap.toImmutableListMultimap;
import static com.google.gerrit.server.notedb.ReviewerStateInternal.CC;
import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER;
import static com.google.gerrit.server.project.ProjectCache.illegalState;
+import static java.util.Comparator.comparing;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.AttentionSetUpdate;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
@@ -38,10 +49,13 @@
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.RestApiException;
+import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.ReviewerSet;
import com.google.gerrit.server.ReviewerStatusUpdate;
+import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.change.LabelNormalizer;
+import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.notedb.ReviewerStateInternal;
@@ -50,13 +64,20 @@
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.ProjectCache;
+import com.google.gerrit.server.query.approval.ApprovalQueryBuilder;
+import com.google.gerrit.server.query.approval.UserInPredicate;
+import com.google.gerrit.server.util.AccountTemplateUtil;
import com.google.gerrit.server.util.LabelVote;
+import com.google.gerrit.server.util.ManualRequestContext;
+import com.google.gerrit.server.util.OneOffRequestContext;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -95,22 +116,34 @@
return Iterables.filter(psas, a -> Objects.equals(a.accountId(), accountId));
}
- private final ApprovalCopier approvalInference;
+ private final AccountCache accountCache;
+ private final String anonymousCowardName;
+ private final ApprovalCopier approvalCopier;
+ private final Provider<ApprovalQueryBuilder> approvalQueryBuilderProvider;
private final PermissionBackend permissionBackend;
private final ProjectCache projectCache;
private final LabelNormalizer labelNormalizer;
+ private final OneOffRequestContext requestContext;
@VisibleForTesting
@Inject
public ApprovalsUtil(
- ApprovalCopier approvalInference,
+ AccountCache accountCache,
+ @AnonymousCowardName String anonymousCowardName,
+ ApprovalCopier approvalCopier,
+ Provider<ApprovalQueryBuilder> approvalQueryBuilderProvider,
PermissionBackend permissionBackend,
ProjectCache projectCache,
- LabelNormalizer labelNormalizer) {
- this.approvalInference = approvalInference;
+ LabelNormalizer labelNormalizer,
+ OneOffRequestContext requestContext) {
+ this.accountCache = accountCache;
+ this.anonymousCowardName = anonymousCowardName;
+ this.approvalCopier = approvalCopier;
+ this.approvalQueryBuilderProvider = approvalQueryBuilderProvider;
this.permissionBackend = permissionBackend;
this.projectCache = projectCache;
this.labelNormalizer = labelNormalizer;
+ this.requestContext = requestContext;
}
/**
@@ -336,26 +369,340 @@
public ListMultimap<PatchSet.Id, PatchSetApproval> byChangeExcludingCopiedApprovals(
ChangeNotes notes) {
- return notes.load().getApprovals();
+ return notes.load().getApprovals().onlyNonCopied();
}
/**
- * This method should only be used when we want to dynamically compute the approvals. Generally,
- * the copied approvals are available in {@link ChangeNotes}. However, if the patch-set is just
- * being created, we need to dynamically compute the approvals so that we can persist them in
- * storage. The {@link RevWalk} and {@link Config} objects that are being used to create the new
- * patch-set are required for this method. Here we also add those votes to the provided {@link
- * ChangeUpdate} object.
+ * Copies approvals to a new patch set.
+ *
+ * <p>Computes the approvals of the prior patch set that should be copied to the new patch set and
+ * stores them in NoteDb.
+ *
+ * <p>For outdated approvals (approvals on the prior patch set which are outdated by the new patch
+ * set and hence not copied) the approvers are added to the attention set since they need to
+ * re-review the change and renew their approvals.
+ *
+ * @param notes the change notes
+ * @param patchSet the newly created patch set
+ * @param revWalk {@link RevWalk} that can see the new patch set revision
+ * @param repoConfig the repo config
+ * @param changeUpdate changeUpdate that is used to persist the copied approvals and update the
+ * attention set
+ * @return the result of the approval copying
*/
- public void persistCopiedApprovals(
+ public ApprovalCopier.Result copyApprovalsToNewPatchSet(
ChangeNotes notes,
PatchSet patchSet,
RevWalk revWalk,
Config repoConfig,
ChangeUpdate changeUpdate) {
- approvalInference
- .forPatchSet(notes, patchSet, revWalk, repoConfig)
- .forEach(a -> changeUpdate.putCopiedApproval(a));
+ ApprovalCopier.Result approvalCopierResult =
+ approvalCopier.forPatchSet(notes, patchSet, revWalk, repoConfig);
+ approvalCopierResult.copiedApprovals().forEach(a -> changeUpdate.putCopiedApproval(a));
+
+ if (!notes.getChange().isWorkInProgress()) {
+ // The attention set should not be updated when the change is work-in-progress.
+ addAttentionSetUpdatesForOutdatedApprovals(
+ changeUpdate, approvalCopierResult.outdatedApprovals());
+ }
+
+ return approvalCopierResult;
+ }
+
+ private void addAttentionSetUpdatesForOutdatedApprovals(
+ ChangeUpdate changeUpdate, ImmutableSet<PatchSetApproval> outdatedApprovals) {
+ Set<AttentionSetUpdate> updates = new HashSet<>();
+
+ Multimap<Account.Id, PatchSetApproval> outdatedApprovalsByUser = ArrayListMultimap.create();
+ outdatedApprovals.forEach(psa -> outdatedApprovalsByUser.put(psa.accountId(), psa));
+ for (Map.Entry<Account.Id, Collection<PatchSetApproval>> e :
+ outdatedApprovalsByUser.asMap().entrySet()) {
+ Account.Id approverId = e.getKey();
+ Collection<PatchSetApproval> outdatedUserApprovals = e.getValue();
+
+ String message;
+ if (outdatedUserApprovals.size() == 1) {
+ PatchSetApproval outdatedUserApproval = Iterables.getOnlyElement(outdatedUserApprovals);
+ message =
+ String.format(
+ "Vote got outdated and was removed: %s",
+ LabelVote.create(outdatedUserApproval.label(), outdatedUserApproval.value())
+ .format());
+ } else {
+ message =
+ String.format(
+ "Votes got outdated and were removed: %s",
+ outdatedUserApprovals.stream()
+ .map(
+ outdatedUserApproval ->
+ LabelVote.create(
+ outdatedUserApproval.label(), outdatedUserApproval.value())
+ .format())
+ .sorted()
+ .collect(joining(", ")));
+ }
+
+ updates.add(
+ AttentionSetUpdate.createForWrite(approverId, AttentionSetUpdate.Operation.ADD, message));
+ }
+ changeUpdate.addToPlannedAttentionSetUpdates(updates);
+ }
+
+ public Optional<String> formatApprovalCopierResult(
+ ApprovalCopier.Result approvalCopierResult, LabelTypes labelTypes) {
+ requireNonNull(approvalCopierResult, "approvalCopierResult");
+ requireNonNull(labelTypes, "labelTypes");
+
+ if (approvalCopierResult.copiedApprovals().isEmpty()
+ && approvalCopierResult.outdatedApprovals().isEmpty()) {
+ return Optional.empty();
+ }
+
+ StringBuilder message = new StringBuilder();
+
+ if (!approvalCopierResult.copiedApprovals().isEmpty()) {
+ message.append("Copied Votes:\n");
+ message.append(
+ formatApprovalListWithCopyCondition(approvalCopierResult.copiedApprovals(), labelTypes));
+ }
+ if (!approvalCopierResult.outdatedApprovals().isEmpty()) {
+ if (!approvalCopierResult.copiedApprovals().isEmpty()) {
+ message.append("\n");
+ }
+ message.append("Outdated Votes:\n");
+ message.append(
+ formatApprovalListWithCopyCondition(
+ approvalCopierResult.outdatedApprovals(), labelTypes));
+ }
+
+ return Optional.of(message.toString());
+ }
+
+ /**
+ * Formats the given approvals as a bullet list, each approval with the corresponding copy
+ * condition if available.
+ *
+ * <p>E.g.:
+ *
+ * <pre>
+ * * Code-Review+1, Code-Review+2 (copy condition: "is:MIN")
+ * * Verified+1 (copy condition: "is:MIN")
+ * </pre>
+ *
+ * <p>Entries in the list can have the following formats:
+ *
+ * <ul>
+ * <li>{@code <comma-separated-list-of-approvals-for-the-same-label> (copy condition:
+ * "<copy-condition-without-UserInPredicate>")} (if a copy condition without UserInPredicate
+ * is present), e.g.: {@code Code-Review+1, Code-Review+2 (copy condition: "is:MIN")}
+ * <li>{@code <approval> by <comma-separated-list-of-approvers> (copy condition:
+ * "<copy-condition-with-UserInPredicate>")} (if a copy condition with UserInPredicate is
+ * present), e.g. {@code Code-Review+1 by <GERRIT_ACCOUNT_1000000>, <GERRIT_ACCOUNT_1000001>
+ * (copy condition: "approverin:7d9e2d5b561e75230e4463ae757ac5d6ff715d85")}
+ * <li>{@code <comma-separated-list-of-approval-for-the-same-label>} (if no copy condition is
+ * present), e.g.: {@code Code-Review+1, Code-Review+2}
+ * <li>{@code <comma-separated-list-of-approval-for-the-same-label> (label type is missing)} (if
+ * the label type is missing), e.g.: {@code Code-Review+1, Code-Review+2 (label type is
+ * missing)}
+ * <li>{@code <comma-separated-list-of-approval-for-the-same-label> (non-parseable copy
+ * condition: "<non-parseable copy-condition>")} (if a non-parseable copy condition is
+ * present), e.g.: {@code Code-Review+1, Code-Review+2 (non-parseable copy condition:
+ * "is:FOO")}
+ * </ul>
+ *
+ * @param approvals the approvals that should be formatted
+ * @param labelTypes the label types
+ * @return bullet list with the formatted approvals
+ */
+ private String formatApprovalListWithCopyCondition(
+ ImmutableSet<PatchSetApproval> approvals, LabelTypes labelTypes) {
+ StringBuilder message = new StringBuilder();
+
+ // sort approvals by label vote so that we list them in a deterministic order
+ ImmutableList<PatchSetApproval> approvalsSortedByLabelVote =
+ approvals.stream()
+ .sorted(comparing(psa -> LabelVote.create(psa.label(), psa.value()).format()))
+ .collect(toImmutableList());
+
+ ImmutableListMultimap<String, PatchSetApproval> approvalsByLabel =
+ Multimaps.index(approvalsSortedByLabelVote, PatchSetApproval::label);
+
+ for (Map.Entry<String, Collection<PatchSetApproval>> approvalsByLabelEntry :
+ approvalsByLabel.asMap().entrySet()) {
+ String label = approvalsByLabelEntry.getKey();
+ Collection<PatchSetApproval> approvalsForSameLabel = approvalsByLabelEntry.getValue();
+
+ message.append("* ");
+ if (!labelTypes.byLabel(label).isPresent()) {
+ message
+ .append(formatApprovalsAsLabelVotesList(approvalsForSameLabel))
+ .append(" (label type is missing)\n");
+ continue;
+ }
+
+ LabelType labelType = labelTypes.byLabel(label).get();
+ if (!labelType.getCopyCondition().isPresent()) {
+ message.append(formatApprovalsAsLabelVotesList(approvalsForSameLabel)).append("\n");
+ continue;
+ }
+
+ message
+ .append(
+ formatApprovalsWithCopyCondition(
+ approvalsForSameLabel, labelType.getCopyCondition().get()))
+ .append("\n");
+ }
+
+ return message.toString();
+ }
+
+ /**
+ * Formats the given approvals of the same label with the given copy condition.
+ *
+ * <p>E.g.: {Code-Review+1, Code-Review+2 (copy condition: "is:MIN")}
+ *
+ * <p>The following format may be returned:
+ *
+ * <ul>
+ * <li>{@code <comma-separated-list-of-approvals-for-the-same-label> (copy condition:
+ * "<copy-condition-without-UserInPredicate>")} (if a copy condition without UserInPredicate
+ * is present), e.g.: {@code Code-Review+1, Code-Review+2 (copy condition: "is:MIN")}
+ * <li>{@code <approval> by <comma-separated-list-of-approvers> (copy condition:
+ * "<copy-condition-with-UserInPredicate>")} (if a copy condition with UserInPredicate is
+ * present), e.g. {@code Code-Review+1 by <GERRIT_ACCOUNT_1000000>, <GERRIT_ACCOUNT_1000001>
+ * (copy condition: "approverin:7d9e2d5b561e75230e4463ae757ac5d6ff715d85")}
+ * <li>{@code <comma-separated-list-of-approval-for-the-same-label> (non-parseable copy
+ * condition: "<non-parseable copy-condition>")} (if a non-parseable copy condition is
+ * present), e.g.: {@code Code-Review+1, Code-Review+2 (non-parseable copy condition:
+ * "is:FOO")}
+ * </ul>
+ *
+ * @param approvalsForSameLabel the approvals that should be formatted, must be for the same label
+ * @param copyCondition the copy condition of the label
+ * @return the formatted approvals
+ */
+ private String formatApprovalsWithCopyCondition(
+ Collection<PatchSetApproval> approvalsForSameLabel, String copyCondition) {
+ StringBuilder message = new StringBuilder();
+
+ boolean containsUserInPredicate;
+ try {
+ containsUserInPredicate = containsUserInPredicate(copyCondition);
+ } catch (QueryParseException e) {
+ logger.atWarning().withCause(e).log("Non-parsable query condition");
+ message.append(formatApprovalsAsLabelVotesList(approvalsForSameLabel));
+ message.append(String.format(" (non-parseable copy condition: \"%s\")", copyCondition));
+ return message.toString();
+ }
+
+ if (containsUserInPredicate) {
+ // If a UserInPredicate is used (e.g. 'approverin:<group>' or 'uploaderin:<group>') we need to
+ // include the approvers into the change message since they are relevant for the matching. For
+ // example it can happen that the same approval of different users is copied for the one user
+ // but not for the other user (since the one user is a member of the approverin group and the
+ // other user isn't).
+ //
+ // Example:
+ // * label Foo has the copy condition 'is:ANY approverin:123'
+ // * group 123 contains UserA as member, but not UserB
+ // * a change has the following approvals: Foo+1 by UserA and Foo+1 by UserB
+ //
+ // In this case Foo+1 by UserA is copied because UserA is a member of group 123 and the copy
+ // condition matches, while Foo+1 by UserB is not copied because UserB is not a member of
+ // group 123 and the copy condition doesn't match.
+ //
+ // So it can happen that the same approval Foo+1, but by different users, is copied and
+ // outdated at the same time. To allow users to understand that the copying depends on who did
+ // the approval, the approvers must be included into the change message.
+
+ // sort the approvals by their approvers name-email so that the approvers always appear in a
+ // deterministic order
+ ImmutableList<PatchSetApproval> approvalsSortedByLabelVoteAndApprover =
+ approvalsForSameLabel.stream()
+ .sorted(
+ comparing(
+ (PatchSetApproval psa) ->
+ LabelVote.create(psa.label(), psa.value()).format())
+ .thenComparing(
+ psa ->
+ accountCache
+ .getEvenIfMissing(psa.accountId())
+ .account()
+ .getNameEmail(anonymousCowardName)))
+ .collect(toImmutableList());
+
+ ImmutableListMultimap<LabelVote, Account.Id> approversByLabelVote =
+ Multimaps.index(
+ approvalsSortedByLabelVoteAndApprover,
+ psa -> LabelVote.create(psa.label(), psa.value()))
+ .entries().stream()
+ .collect(toImmutableListMultimap(e -> e.getKey(), e -> e.getValue().accountId()));
+ message.append(
+ approversByLabelVote.asMap().entrySet().stream()
+ .map(
+ approversByLabelVoteEntry ->
+ formatLabelVoteWithApprovers(
+ approversByLabelVoteEntry.getKey(), approversByLabelVoteEntry.getValue()))
+ .collect(joining(", ")));
+ } else {
+ // copy condition doesn't contain a UserInPredicate
+ message.append(formatApprovalsAsLabelVotesList(approvalsForSameLabel));
+ }
+ message.append(String.format(" (copy condition: \"%s\")", copyCondition));
+ return message.toString();
+ }
+
+ private boolean containsUserInPredicate(String copyCondition) throws QueryParseException {
+ // Use a request context to run checks as an internal user with expanded visibility. This is
+ // so that the output of the copy condition does not depend on who is running the current
+ // 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()
+ .stream()
+ .anyMatch(UserInPredicate.class::isInstance);
+ }
+ }
+
+ /**
+ * Formats the given approvals as a comma-separated list of label votes.
+ *
+ * <p>E.g.: {@code Code-Review+1, CodeReview+2}
+ *
+ * @param sortedApprovalsForSameLabel the approvals that should be formatted as a comma-separated
+ * list of label votes, must be sorted
+ * @return the given approvals as a comma-separated list of label votes
+ */
+ private String formatApprovalsAsLabelVotesList(
+ Collection<PatchSetApproval> sortedApprovalsForSameLabel) {
+ return sortedApprovalsForSameLabel.stream()
+ .map(psa -> LabelVote.create(psa.label(), psa.value()))
+ .distinct()
+ .map(LabelVote::format)
+ .collect(joining(", "));
+ }
+
+ /**
+ * Formats the given label vote with a comma-separated list of the given approvers.
+ *
+ * <p>E.g.: {@code Code-Review+1 by <user1-placeholder>, <user2-placeholder>}
+ *
+ * @param labelVote the label vote that should be formatted with a comma-separated list of the
+ * given approver
+ * @param sortedApprovers the approvers that should be formatted as a comma-separated list for the
+ * given label vote
+ * @return the given label vote with a comma-separated list of the given approvers
+ */
+ private String formatLabelVoteWithApprovers(
+ LabelVote labelVote, Collection<Account.Id> sortedApprovers) {
+ return new StringBuilder()
+ .append(labelVote.format())
+ .append(" by ")
+ .append(
+ sortedApprovers.stream()
+ .map(AccountTemplateUtil::getAccountTemplate)
+ .collect(joining(", ")))
+ .toString();
}
/**
@@ -368,7 +715,7 @@
* deleted labels.
*/
public Iterable<PatchSetApproval> byPatchSet(ChangeNotes notes, PatchSet.Id psId) {
- List<PatchSetApproval> approvalsNotNormalized = notes.load().getApprovalsWithCopied().get(psId);
+ List<PatchSetApproval> approvalsNotNormalized = notes.load().getApprovals().all().get(psId);
return labelNormalizer.normalize(notes, approvalsNotNormalized).getNormalized();
}
diff --git a/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java
index 5a71ced..eb3949e 100644
--- a/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java
+++ b/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java
@@ -43,19 +43,6 @@
.setIgnoreSelfApproval(proto.getIgnoreSelfApproval())
.setDefaultValue(Shorts.saturatedCast(proto.getDefaultValue()))
.setCopyCondition(Strings.emptyToNull(proto.getCopyCondition()))
- .setCopyAnyScore(proto.getCopyAnyScore())
- .setCopyMinScore(proto.getCopyMinScore())
- .setCopyMaxScore(proto.getCopyMaxScore())
- .setCopyAllScoresIfListOfFilesDidNotChange(
- proto.getCopyAllScoresIfListOfFilesDidNotChange())
- .setCopyAllScoresOnMergeFirstParentUpdate(proto.getCopyAllScoresOnMergeFirstParentUpdate())
- .setCopyAllScoresOnTrivialRebase(proto.getCopyAllScoresOnTrivialRebase())
- .setCopyAllScoresIfNoCodeChange(proto.getCopyAllScoresIfNoCodeChange())
- .setCopyAllScoresIfNoChange(proto.getCopyAllScoresIfNoChange())
- .setCopyValues(
- proto.getCopyValuesList().stream()
- .map(Shorts::saturatedCast)
- .collect(toImmutableList()))
.setMaxNegative(Shorts.saturatedCast(proto.getMaxNegative()))
.setMaxPositive(Shorts.saturatedCast(proto.getMaxPositive()))
.setRefPatterns(proto.getRefPatternsList())
@@ -73,18 +60,6 @@
.setDescription(autoValue.getDescription().orElse(""))
.setFunction(FUNCTION_CONVERTER.reverse().convert(autoValue.getFunction()))
.setCopyCondition(autoValue.getCopyCondition().orElse(""))
- .setCopyAnyScore(autoValue.isCopyAnyScore())
- .setCopyMinScore(autoValue.isCopyMinScore())
- .setCopyMaxScore(autoValue.isCopyMaxScore())
- .setCopyAllScoresIfListOfFilesDidNotChange(
- autoValue.isCopyAllScoresIfListOfFilesDidNotChange())
- .setCopyAllScoresOnMergeFirstParentUpdate(
- autoValue.isCopyAllScoresOnMergeFirstParentUpdate())
- .setCopyAllScoresOnTrivialRebase(autoValue.isCopyAllScoresOnTrivialRebase())
- .setCopyAllScoresIfNoCodeChange(autoValue.isCopyAllScoresIfNoCodeChange())
- .setCopyAllScoresIfNoChange(autoValue.isCopyAllScoresIfNoChange())
- .addAllCopyValues(
- autoValue.getCopyValues().stream().map(c -> (int) c).collect(toImmutableList()))
.setAllowPostSubmit(autoValue.isAllowPostSubmit())
.setIgnoreSelfApproval(autoValue.isIgnoreSelfApproval())
.setDefaultValue(Shorts.saturatedCast(autoValue.getDefaultValue()))
diff --git a/java/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializer.java
index a7a84f7..5aa7a2a 100644
--- a/java/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializer.java
+++ b/java/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializer.java
@@ -27,6 +27,9 @@
return StoredCommentLinkInfo.builder(proto.getName())
.setMatch(emptyToNull(proto.getMatch()))
.setLink(emptyToNull(proto.getLink()))
+ .setPrefix(emptyToNull(proto.getPrefix()))
+ .setSuffix(emptyToNull(proto.getSuffix()))
+ .setText(emptyToNull(proto.getText()))
.setHtml(emptyToNull(proto.getHtml()))
.setEnabled(proto.getEnabled())
.setOverrideOnly(proto.getOverrideOnly())
@@ -38,6 +41,9 @@
.setName(autoValue.getName())
.setMatch(nullToEmpty(autoValue.getMatch()))
.setLink(nullToEmpty(autoValue.getLink()))
+ .setPrefix(nullToEmpty(autoValue.getPrefix()))
+ .setSuffix(nullToEmpty(autoValue.getSuffix()))
+ .setText(nullToEmpty(autoValue.getText()))
.setHtml(nullToEmpty(autoValue.getHtml()))
.setEnabled(Optional.ofNullable(autoValue.getEnabled()).orElse(true))
.setOverrideOnly(autoValue.getOverrideOnly())
diff --git a/java/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementExpressionResultSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementExpressionResultSerializer.java
index 436fe76..f61e261 100644
--- a/java/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementExpressionResultSerializer.java
+++ b/java/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementExpressionResultSerializer.java
@@ -14,6 +14,8 @@
package com.google.gerrit.server.cache.serialize.entities;
+import com.google.common.base.Converter;
+import com.google.common.base.Enums;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.entities.SubmitRequirementExpression;
@@ -26,11 +28,21 @@
* SubmitRequirementExpressionResultProto}.
*/
public class SubmitRequirementExpressionResultSerializer {
+
+ private static final Converter<String, SubmitRequirementExpressionResult.Status>
+ STATUS_CONVERTER = Enums.stringConverter(SubmitRequirementExpressionResult.Status.class);
+
public static SubmitRequirementExpressionResult deserialize(
SubmitRequirementExpressionResultProto proto) {
+ SubmitRequirementExpressionResult.Status status;
+ try {
+ status = STATUS_CONVERTER.convert(proto.getStatus());
+ } catch (IllegalArgumentException e) {
+ status = SubmitRequirementExpressionResult.Status.ERROR;
+ }
return SubmitRequirementExpressionResult.create(
SubmitRequirementExpression.create(proto.getExpression()),
- SubmitRequirementExpressionResult.Status.valueOf(proto.getStatus()),
+ status,
proto.getPassingAtomsList().stream().collect(ImmutableList.toImmutableList()),
proto.getFailingAtomsList().stream().collect(ImmutableList.toImmutableList()),
Optional.ofNullable(Strings.emptyToNull(proto.getErrorMessage())));
@@ -40,7 +52,7 @@
SubmitRequirementExpressionResult r) {
return SubmitRequirementExpressionResultProto.newBuilder()
.setExpression(r.expression().expressionString())
- .setStatus(r.status().name())
+ .setStatus(STATUS_CONVERTER.reverse().convert(r.status()))
.addAllPassingAtoms(r.passingAtoms())
.addAllFailingAtoms(r.failingAtoms())
.setErrorMessage(r.errorMessage().orElse(""))
diff --git a/java/com/google/gerrit/server/change/AbandonUtil.java b/java/com/google/gerrit/server/change/AbandonUtil.java
index 29bd045..59b32c2 100644
--- a/java/com/google/gerrit/server/change/AbandonUtil.java
+++ b/java/com/google/gerrit/server/change/AbandonUtil.java
@@ -40,10 +40,7 @@
private final ChangeCleanupConfig cfg;
private final Provider<ChangeQueryProcessor> queryProvider;
- // Provider is needed, because AbandonUtil is singleton, but ChangeQueryBuilder accesses
- // index collection, that is only provided when multiversion index module is started.
- // TODO(davido); Remove provider again, when support for legacy numeric fields is removed.
- private final Provider<ChangeQueryBuilder> queryBuilderProvider;
+ private final ChangeQueryBuilder queryBuilder;
private final BatchAbandon batchAbandon;
private final InternalUser internalUser;
@@ -52,11 +49,11 @@
ChangeCleanupConfig cfg,
InternalUser.Factory internalUserFactory,
Provider<ChangeQueryProcessor> queryProvider,
- Provider<ChangeQueryBuilder> queryBuilderProvider,
+ ChangeQueryBuilder queryBuilder,
BatchAbandon batchAbandon) {
this.cfg = cfg;
this.queryProvider = queryProvider;
- this.queryBuilderProvider = queryBuilderProvider;
+ this.queryBuilder = queryBuilder;
this.batchAbandon = batchAbandon;
internalUser = internalUserFactory.create();
}
@@ -74,11 +71,7 @@
}
List<ChangeData> changesToAbandon =
- queryProvider
- .get()
- .enforceVisibility(false)
- .query(queryBuilderProvider.get().parse(query))
- .entities();
+ queryProvider.get().enforceVisibility(false).query(queryBuilder.parse(query)).entities();
ImmutableListMultimap.Builder<Project.NameKey, ChangeData> builder =
ImmutableListMultimap.builder();
for (ChangeData cd : changesToAbandon) {
@@ -118,7 +111,7 @@
queryProvider
.get()
.enforceVisibility(false)
- .query(queryBuilderProvider.get().parse(newQuery))
+ .query(queryBuilder.parse(newQuery))
.entities();
if (!changesToAbandon.isEmpty()) {
validChanges.add(cd);
diff --git a/java/com/google/gerrit/server/change/AddToAttentionSetOp.java b/java/com/google/gerrit/server/change/AddToAttentionSetOp.java
index a980c32..ec90bec 100644
--- a/java/com/google/gerrit/server/change/AddToAttentionSetOp.java
+++ b/java/com/google/gerrit/server/change/AddToAttentionSetOp.java
@@ -16,13 +16,11 @@
import static java.util.Objects.requireNonNull;
-import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.AttentionSetUpdate;
import com.google.gerrit.entities.Change;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.server.mail.send.AddToAttentionSetSender;
-import com.google.gerrit.server.mail.send.MessageIdGenerator;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.update.BatchUpdateOp;
@@ -31,18 +29,14 @@
import com.google.gerrit.server.util.AttentionSetEmail;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
-import java.io.IOException;
/** Add a specified user to the attention set. */
public class AddToAttentionSetOp implements BatchUpdateOp {
- private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
public interface Factory {
AddToAttentionSetOp create(Account.Id attentionUserId, String reason, boolean notify);
}
private final ChangeData.Factory changeDataFactory;
- private final MessageIdGenerator messageIdGenerator;
private final AddToAttentionSetSender.Factory addToAttentionSetSender;
private final AttentionSetEmail.Factory attentionSetEmailFactory;
@@ -63,14 +57,12 @@
AddToAttentionSetOp(
ChangeData.Factory changeDataFactory,
AddToAttentionSetSender.Factory addToAttentionSetSender,
- MessageIdGenerator messageIdGenerator,
AttentionSetEmail.Factory attentionSetEmailFactory,
@Assisted Account.Id attentionUserId,
@Assisted String reason,
@Assisted boolean notify) {
this.changeDataFactory = changeDataFactory;
this.addToAttentionSetSender = addToAttentionSetSender;
- this.messageIdGenerator = messageIdGenerator;
this.attentionSetEmailFactory = attentionSetEmailFactory;
this.attentionUserId = requireNonNull(attentionUserId, "user");
@@ -93,8 +85,8 @@
change = ctx.getChange();
- ChangeUpdate update = ctx.getUpdate(ctx.getChange().currentPatchSetId());
- update.addToPlannedAttentionSetUpdates(
+ ChangeUpdate changeUpdate = ctx.getUpdate(ctx.getChange().currentPatchSetId());
+ changeUpdate.addToPlannedAttentionSetUpdates(
AttentionSetUpdate.createForWrite(
attentionUserId, AttentionSetUpdate.Operation.ADD, reason));
return true;
@@ -105,18 +97,13 @@
if (!notify) {
return;
}
- try {
- attentionSetEmailFactory
- .create(
- addToAttentionSetSender.create(ctx.getProject(), change.getId()),
- ctx,
- change,
- reason,
- messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), change.currentPatchSetId()),
- attentionUserId)
- .sendAsync();
- } catch (IOException e) {
- logger.atSevere().withCause(e).log(e.getMessage(), change.getId());
- }
+ attentionSetEmailFactory
+ .create(
+ addToAttentionSetSender.create(ctx.getProject(), change.getId()),
+ ctx,
+ change,
+ reason,
+ attentionUserId)
+ .sendAsync();
}
}
diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java
index 6ef7f1e..edaca70 100644
--- a/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -467,10 +467,10 @@
approvalsUtil.addApprovalsForNewPatchSet(
update, labelTypes, patchSet, ctx.getUser(), approvals);
- // Check if approvals are changing in with this update. If so, add current user to reviewers.
- // Note that this is done separately as addReviewers is filtering out the change owner as
+ // Check if approvals are changing with this update. If so, add the current user (aka the
+ // approver) as a reviewers because all approvers must also be reviewers.
+ // Note that this is done separately as addReviewers is filtering out the change owner as a
// reviewer which is needed in several other code paths.
- // TODO(dborowitz): Still necessary?
if (!approvals.isEmpty()) {
update.putReviewer(ctx.getAccountId(), REVIEWER);
}
diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java
index 32e40eb..02b0a60 100644
--- a/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/java/com/google/gerrit/server/change/ChangeJson.java
@@ -235,6 +235,7 @@
private final Optional<PluginDefinedInfosFactory> pluginDefinedInfosFactory;
private final boolean includeMergeable;
private final boolean lazyLoad;
+ private final boolean cacheQueryResultsByChangeNum;
private AccountLoader accountLoader;
private FixInput fix;
@@ -274,6 +275,8 @@
this.includeMergeable = MergeabilityComputationBehavior.fromConfig(cfg).includeInApi();
this.lazyLoad = containsAnyOf(this.options, REQUIRE_LAZY_LOAD);
this.pluginDefinedInfosFactory = pluginDefinedInfosFactory;
+ this.cacheQueryResultsByChangeNum =
+ cfg.getBoolean("index", "cacheQueryResultsByChangeNum", true);
logger.atFine().log("options = %s", options);
}
@@ -496,7 +499,7 @@
// This problem has two sides where 'last in the list' has to be respected:
// (1) Caching
// (2) Reusing
- boolean isCacheable = i != changes.size() - 1;
+ boolean isCacheable = cacheQueryResultsByChangeNum && (i != changes.size() - 1);
ChangeData cd = changes.get(i);
ChangeInfo info = cache.get(cd.getId());
if (info != null && isCacheable) {
diff --git a/java/com/google/gerrit/server/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/change/DeleteReviewerOp.java
index 0116b01..1199be5 100644
--- a/java/com/google/gerrit/server/change/DeleteReviewerOp.java
+++ b/java/com/google/gerrit/server/change/DeleteReviewerOp.java
@@ -228,7 +228,7 @@
private Iterable<PatchSetApproval> approvals(ChangeContext ctx, Account.Id accountId) {
Iterable<PatchSetApproval> approvals;
- approvals = ctx.getNotes().getApprovalsWithCopied().values();
+ approvals = ctx.getNotes().getApprovals().all().values();
return Iterables.filter(approvals, psa -> accountId.equals(psa.accountId()));
}
diff --git a/java/com/google/gerrit/server/change/EmailNewPatchSet.java b/java/com/google/gerrit/server/change/EmailNewPatchSet.java
new file mode 100644
index 0000000..f6ae6a3
--- /dev/null
+++ b/java/com/google/gerrit/server/change/EmailNewPatchSet.java
@@ -0,0 +1,241 @@
+// Copyright (C) 2022 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.server.change;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.PatchSet;
+import com.google.gerrit.entities.PatchSetApproval;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.SubmitRequirement;
+import com.google.gerrit.entities.SubmitRequirementResult;
+import com.google.gerrit.extensions.client.ChangeKind;
+import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.config.SendEmailExecutor;
+import com.google.gerrit.server.mail.send.MessageIdGenerator;
+import com.google.gerrit.server.mail.send.MessageIdGenerator.MessageId;
+import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
+import com.google.gerrit.server.patch.PatchSetInfoFactory;
+import com.google.gerrit.server.update.PostUpdateContext;
+import com.google.gerrit.server.util.RequestContext;
+import com.google.gerrit.server.util.RequestScopePropagator;
+import com.google.gerrit.server.util.ThreadLocalRequestContext;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.time.Instant;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import org.eclipse.jgit.lib.ObjectId;
+
+public class EmailNewPatchSet {
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+ public interface Factory {
+ EmailNewPatchSet create(
+ PostUpdateContext postUpdateContext,
+ PatchSet patchSet,
+ String message,
+ ImmutableSet<PatchSetApproval> outdatedApprovals,
+ @Assisted("reviewers") ImmutableSet<Account.Id> reviewers,
+ @Assisted("extraCcs") ImmutableSet<Account.Id> extraCcs,
+ ChangeKind changeKind,
+ ObjectId preUpdateMetaId);
+ }
+
+ private final ExecutorService sendEmailExecutor;
+ private final ThreadLocalRequestContext threadLocalRequestContext;
+ private final AsyncSender asyncSender;
+
+ private RequestScopePropagator requestScopePropagator;
+
+ @Inject
+ EmailNewPatchSet(
+ @SendEmailExecutor ExecutorService sendEmailExecutor,
+ ThreadLocalRequestContext threadLocalRequestContext,
+ ReplacePatchSetSender.Factory replacePatchSetFactory,
+ PatchSetInfoFactory patchSetInfoFactory,
+ MessageIdGenerator messageIdGenerator,
+ @Assisted PostUpdateContext postUpdateContext,
+ @Assisted PatchSet patchSet,
+ @Assisted String message,
+ @Assisted ImmutableSet<PatchSetApproval> outdatedApprovals,
+ @Assisted("reviewers") ImmutableSet<Account.Id> reviewers,
+ @Assisted("extraCcs") ImmutableSet<Account.Id> extraCcs,
+ @Assisted ChangeKind changeKind,
+ @Assisted ObjectId preUpdateMetaId) {
+ this.sendEmailExecutor = sendEmailExecutor;
+ this.threadLocalRequestContext = threadLocalRequestContext;
+
+ MessageId messageId;
+ try {
+ messageId =
+ messageIdGenerator.fromChangeUpdateAndReason(
+ postUpdateContext.getRepoView(), patchSet.id(), "EmailReplacePatchSet");
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+
+ Change.Id changeId = patchSet.id().changeId();
+
+ // Getting the change data from PostUpdateContext retrieves a cached ChangeData
+ // instance. This ChangeData instance has been created when the change was (re)indexed
+ // due to the update, and hence has submit requirement results already cached (since
+ // (re)indexing triggers the evaluation of the submit requirements).
+ Map<SubmitRequirement, SubmitRequirementResult> postUpdateSubmitRequirementResults =
+ postUpdateContext
+ .getChangeData(postUpdateContext.getProject(), changeId)
+ .submitRequirementsIncludingLegacy();
+ this.asyncSender =
+ new AsyncSender(
+ postUpdateContext.getIdentifiedUser(),
+ replacePatchSetFactory,
+ patchSetInfoFactory,
+ messageId,
+ postUpdateContext.getNotify(changeId),
+ postUpdateContext.getProject(),
+ changeId,
+ patchSet,
+ message,
+ postUpdateContext.getWhen(),
+ outdatedApprovals,
+ reviewers,
+ extraCcs,
+ changeKind,
+ preUpdateMetaId,
+ postUpdateSubmitRequirementResults);
+ }
+
+ public EmailNewPatchSet setRequestScopePropagator(RequestScopePropagator requestScopePropagator) {
+ this.requestScopePropagator = requestScopePropagator;
+ return this;
+ }
+
+ public void sendAsync() {
+ @SuppressWarnings("unused")
+ Future<?> possiblyIgnoredError =
+ sendEmailExecutor.submit(
+ requestScopePropagator != null
+ ? requestScopePropagator.wrap(asyncSender)
+ : () -> {
+ RequestContext old = threadLocalRequestContext.setContext(asyncSender);
+ try {
+ asyncSender.run();
+ } finally {
+ threadLocalRequestContext.setContext(old);
+ }
+ });
+ }
+
+ /**
+ * {@link Runnable} that sends the email asynchonously.
+ *
+ * <p>Only pass objects into this class that are thread-safe (e.g. immutable) so that they can be
+ * safely accessed from the background thread.
+ */
+ private static class AsyncSender implements Runnable, RequestContext {
+ private final IdentifiedUser user;
+ private final ReplacePatchSetSender.Factory replacePatchSetFactory;
+ private final PatchSetInfoFactory patchSetInfoFactory;
+ private final MessageId messageId;
+ private final NotifyResolver.Result notify;
+ private final Project.NameKey projectName;
+ private final Change.Id changeId;
+ private final PatchSet patchSet;
+ private final String message;
+ private final Instant timestamp;
+ private final ImmutableSet<PatchSetApproval> outdatedApprovals;
+ private final ImmutableSet<Account.Id> reviewers;
+ private final ImmutableSet<Account.Id> extraCcs;
+ private final ChangeKind changeKind;
+ private final ObjectId preUpdateMetaId;
+ private final Map<SubmitRequirement, SubmitRequirementResult>
+ postUpdateSubmitRequirementResults;
+
+ AsyncSender(
+ IdentifiedUser user,
+ ReplacePatchSetSender.Factory replacePatchSetFactory,
+ PatchSetInfoFactory patchSetInfoFactory,
+ MessageId messageId,
+ NotifyResolver.Result notify,
+ Project.NameKey projectName,
+ Change.Id changeId,
+ PatchSet patchSet,
+ String message,
+ Instant timestamp,
+ ImmutableSet<PatchSetApproval> outdatedApprovals,
+ ImmutableSet<Account.Id> reviewers,
+ ImmutableSet<Account.Id> extraCcs,
+ ChangeKind changeKind,
+ ObjectId preUpdateMetaId,
+ Map<SubmitRequirement, SubmitRequirementResult> postUpdateSubmitRequirementResults) {
+ this.user = user;
+ this.replacePatchSetFactory = replacePatchSetFactory;
+ this.patchSetInfoFactory = patchSetInfoFactory;
+ this.messageId = messageId;
+ this.notify = notify;
+ this.projectName = projectName;
+ this.changeId = changeId;
+ this.patchSet = patchSet;
+ this.message = message;
+ this.timestamp = timestamp;
+ this.outdatedApprovals = outdatedApprovals;
+ this.reviewers = reviewers;
+ this.extraCcs = extraCcs;
+ this.changeKind = changeKind;
+ this.preUpdateMetaId = preUpdateMetaId;
+ this.postUpdateSubmitRequirementResults = postUpdateSubmitRequirementResults;
+ }
+
+ @Override
+ public void run() {
+ try {
+ ReplacePatchSetSender emailSender =
+ replacePatchSetFactory.create(
+ projectName,
+ changeId,
+ changeKind,
+ preUpdateMetaId,
+ postUpdateSubmitRequirementResults);
+ emailSender.setFrom(user.getAccountId());
+ emailSender.setPatchSet(patchSet, patchSetInfoFactory.get(projectName, patchSet));
+ emailSender.setChangeMessage(message, timestamp);
+ emailSender.setNotify(notify);
+ emailSender.addReviewers(reviewers);
+ emailSender.addExtraCC(extraCcs);
+ emailSender.addOutdatedApproval(outdatedApprovals);
+ emailSender.setMessageId(messageId);
+ emailSender.send();
+ } catch (Exception e) {
+ logger.atSevere().withCause(e).log("Cannot send email for new patch set %s", patchSet.id());
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "send-email newpatchset";
+ }
+
+ @Override
+ public CurrentUser getUser() {
+ return user.getRealUser();
+ }
+ }
+}
diff --git a/java/com/google/gerrit/server/change/EmailReviewComments.java b/java/com/google/gerrit/server/change/EmailReviewComments.java
index f94e592..a9886c7 100644
--- a/java/com/google/gerrit/server/change/EmailReviewComments.java
+++ b/java/com/google/gerrit/server/change/EmailReviewComments.java
@@ -16,29 +16,38 @@
import static com.google.gerrit.server.CommentsUtil.COMMENT_ORDER;
+import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
+import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.Comment;
import com.google.gerrit.entities.PatchSet;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.SubmitRequirement;
+import com.google.gerrit.entities.SubmitRequirementResult;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.SendEmailExecutor;
import com.google.gerrit.server.mail.send.CommentSender;
import com.google.gerrit.server.mail.send.MessageIdGenerator;
-import com.google.gerrit.server.notedb.ChangeNotes;
+import com.google.gerrit.server.mail.send.MessageIdGenerator.MessageId;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
-import com.google.gerrit.server.update.RepoView;
+import com.google.gerrit.server.update.PostUpdateContext;
import com.google.gerrit.server.util.LabelVote;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
+import java.io.IOException;
+import java.io.UncheckedIOException;
import java.time.Instant;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import org.eclipse.jgit.lib.ObjectId;
-public class EmailReviewComments implements Runnable, RequestContext {
+public class EmailReviewComments {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
public interface Factory {
@@ -47,13 +56,11 @@
/**
* Creates handle for sending email
*
- * @param notify setting for handling notification.
- * @param notes change notes.
+ * @param postUpdateContext the post update context from the calling BatchUpdateOp
* @param patchSet patch set corresponding to the top-level op
- * @param user user the email should come from.
+ * @param preUpdateMetaId the SHA1 to which the notes branch pointed before the update
* @param message used by text template only. The contents of this message typically include the
* "Patch set N" header and "(M comments)".
- * @param timestamp timestamp when the comments were added.
* @param comments inline comments.
* @param patchSetComment used by HTML template only: some quasi-human-generated text. The
* contents should *not* include a "Patch set N" header or "(M comments)" footer, as these
@@ -61,34 +68,17 @@
* @param labels labels applied as part of this review operation.
*/
EmailReviewComments create(
- NotifyResolver.Result notify,
- ChangeNotes notes,
+ PostUpdateContext postUpdateContext,
PatchSet patchSet,
- IdentifiedUser user,
+ ObjectId preUpdateMetaId,
@Assisted("message") String message,
- Instant timestamp,
List<? extends Comment> comments,
- @Assisted("patchSetComment") String patchSetComment,
- List<LabelVote> labels,
- RepoView repoView);
+ @Nullable @Assisted("patchSetComment") String patchSetComment,
+ List<LabelVote> labels);
}
private final ExecutorService sendEmailsExecutor;
- private final PatchSetInfoFactory patchSetInfoFactory;
- private final CommentSender.Factory commentSenderFactory;
- private final ThreadLocalRequestContext requestContext;
- private final MessageIdGenerator messageIdGenerator;
-
- private final NotifyResolver.Result notify;
- private final ChangeNotes notes;
- private final PatchSet patchSet;
- private final IdentifiedUser user;
- private final String message;
- private final Instant timestamp;
- private final List<? extends Comment> comments;
- private final String patchSetComment;
- private final List<LabelVote> labels;
- private final RepoView repoView;
+ private final AsyncSender asyncSender;
@Inject
EmailReviewComments(
@@ -97,69 +87,151 @@
CommentSender.Factory commentSenderFactory,
ThreadLocalRequestContext requestContext,
MessageIdGenerator messageIdGenerator,
- @Assisted NotifyResolver.Result notify,
- @Assisted ChangeNotes notes,
+ @Assisted PostUpdateContext postUpdateContext,
@Assisted PatchSet patchSet,
- @Assisted IdentifiedUser user,
+ @Assisted ObjectId preUpdateMetaId,
@Assisted("message") String message,
- @Assisted Instant timestamp,
@Assisted List<? extends Comment> comments,
@Nullable @Assisted("patchSetComment") String patchSetComment,
- @Assisted List<LabelVote> labels,
- @Assisted RepoView repoView) {
+ @Assisted List<LabelVote> labels) {
this.sendEmailsExecutor = executor;
- this.patchSetInfoFactory = patchSetInfoFactory;
- this.commentSenderFactory = commentSenderFactory;
- this.requestContext = requestContext;
- this.messageIdGenerator = messageIdGenerator;
- this.notify = notify;
- this.notes = notes;
- this.patchSet = patchSet;
- this.user = user;
- this.message = message;
- this.timestamp = timestamp;
- this.comments = COMMENT_ORDER.sortedCopy(comments);
- this.patchSetComment = patchSetComment;
- this.labels = labels;
- this.repoView = repoView;
+
+ MessageId messageId;
+ try {
+ messageId =
+ messageIdGenerator.fromChangeUpdateAndReason(
+ postUpdateContext.getRepoView(), patchSet.id(), "EmailReviewComments");
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+
+ Change.Id changeId = patchSet.id().changeId();
+
+ // Getting the change data from PostUpdateContext retrieves a cached ChangeData
+ // instance. This ChangeData instance has been created when the change was (re)indexed
+ // due to the update, and hence has submit requirement results already cached (since
+ // (re)indexing triggers the evaluation of the submit requirements).
+ Map<SubmitRequirement, SubmitRequirementResult> postUpdateSubmitRequirementResults =
+ postUpdateContext
+ .getChangeData(postUpdateContext.getProject(), changeId)
+ .submitRequirementsIncludingLegacy();
+ this.asyncSender =
+ new AsyncSender(
+ requestContext,
+ commentSenderFactory,
+ patchSetInfoFactory,
+ postUpdateContext.getUser().asIdentifiedUser(),
+ messageId,
+ postUpdateContext.getNotify(changeId),
+ postUpdateContext.getProject(),
+ changeId,
+ patchSet,
+ preUpdateMetaId,
+ message,
+ postUpdateContext.getWhen(),
+ ImmutableList.copyOf(COMMENT_ORDER.sortedCopy(comments)),
+ patchSetComment,
+ ImmutableList.copyOf(labels),
+ postUpdateSubmitRequirementResults);
}
public void sendAsync() {
@SuppressWarnings("unused")
- Future<?> possiblyIgnoredError = sendEmailsExecutor.submit(this);
+ Future<?> possiblyIgnoredError = sendEmailsExecutor.submit(asyncSender);
}
- @Override
- public void run() {
- RequestContext old = requestContext.setContext(this);
- try {
- CommentSender emailSender =
- commentSenderFactory.create(notes.getProjectName(), notes.getChangeId());
- emailSender.setFrom(user.getAccountId());
- emailSender.setPatchSet(patchSet, patchSetInfoFactory.get(notes.getProjectName(), patchSet));
- emailSender.setChangeMessage(message, timestamp);
- emailSender.setComments(comments);
- emailSender.setPatchSetComment(patchSetComment);
- emailSender.setLabels(labels);
- emailSender.setNotify(notify);
- emailSender.setMessageId(
- messageIdGenerator.fromChangeUpdateAndReason(
- repoView, patchSet.id(), "EmailReviewComments"));
- emailSender.send();
- } catch (Exception e) {
- logger.atSevere().withCause(e).log("Cannot email comments for %s", patchSet.id());
- } finally {
- requestContext.setContext(old);
+ /**
+ * {@link Runnable} that sends the email asynchonously.
+ *
+ * <p>Only pass objects into this class that are thread-safe (e.g. immutable) so that they can be
+ * safely accessed from the background thread.
+ */
+ // TODO: The passed in Comment class is not thread-safe, replace it with an AutoValue type.
+ private static class AsyncSender implements Runnable, RequestContext {
+ private final ThreadLocalRequestContext requestContext;
+ private final CommentSender.Factory commentSenderFactory;
+ private final PatchSetInfoFactory patchSetInfoFactory;
+ private final IdentifiedUser user;
+ private final MessageId messageId;
+ private final NotifyResolver.Result notify;
+ private final Project.NameKey projectName;
+ private final Change.Id changeId;
+ private final PatchSet patchSet;
+ private final ObjectId preUpdateMetaId;
+ private final String message;
+ private final Instant timestamp;
+ private final ImmutableList<? extends Comment> comments;
+ @Nullable private final String patchSetComment;
+ private final ImmutableList<LabelVote> labels;
+ private final Map<SubmitRequirement, SubmitRequirementResult>
+ postUpdateSubmitRequirementResults;
+
+ AsyncSender(
+ ThreadLocalRequestContext requestContext,
+ CommentSender.Factory commentSenderFactory,
+ PatchSetInfoFactory patchSetInfoFactory,
+ IdentifiedUser user,
+ MessageId messageId,
+ NotifyResolver.Result notify,
+ Project.NameKey projectName,
+ Change.Id changeId,
+ PatchSet patchSet,
+ ObjectId preUpdateMetaId,
+ String message,
+ Instant timestamp,
+ ImmutableList<? extends Comment> comments,
+ @Nullable String patchSetComment,
+ ImmutableList<LabelVote> labels,
+ Map<SubmitRequirement, SubmitRequirementResult> postUpdateSubmitRequirementResults) {
+ this.requestContext = requestContext;
+ this.commentSenderFactory = commentSenderFactory;
+ this.patchSetInfoFactory = patchSetInfoFactory;
+ this.user = user;
+ this.messageId = messageId;
+ this.notify = notify;
+ this.projectName = projectName;
+ this.changeId = changeId;
+ this.patchSet = patchSet;
+ this.preUpdateMetaId = preUpdateMetaId;
+ this.message = message;
+ this.timestamp = timestamp;
+ this.comments = comments;
+ this.patchSetComment = patchSetComment;
+ this.labels = labels;
+ this.postUpdateSubmitRequirementResults = postUpdateSubmitRequirementResults;
}
- }
- @Override
- public String toString() {
- return "send-email comments";
- }
+ @Override
+ public void run() {
+ RequestContext old = requestContext.setContext(this);
+ try {
+ CommentSender emailSender =
+ commentSenderFactory.create(
+ projectName, changeId, preUpdateMetaId, postUpdateSubmitRequirementResults);
+ emailSender.setFrom(user.getAccountId());
+ emailSender.setPatchSet(patchSet, patchSetInfoFactory.get(projectName, patchSet));
+ emailSender.setChangeMessage(message, timestamp);
+ emailSender.setComments(comments);
+ emailSender.setPatchSetComment(patchSetComment);
+ emailSender.setLabels(labels);
+ emailSender.setNotify(notify);
+ emailSender.setMessageId(messageId);
+ emailSender.send();
+ } catch (Exception e) {
+ logger.atSevere().withCause(e).log("Cannot email comments for %s", patchSet.id());
+ } finally {
+ requestContext.setContext(old);
+ }
+ }
- @Override
- public CurrentUser getUser() {
- return user.getRealUser();
+ @Override
+ public String toString() {
+ return "send-email comments";
+ }
+
+ @Override
+ public CurrentUser getUser() {
+ return user.getRealUser();
+ }
}
}
diff --git a/java/com/google/gerrit/server/change/LabelNormalizer.java b/java/com/google/gerrit/server/change/LabelNormalizer.java
index aeb9db0..79e2054 100644
--- a/java/com/google/gerrit/server/change/LabelNormalizer.java
+++ b/java/com/google/gerrit/server/change/LabelNormalizer.java
@@ -15,13 +15,13 @@
package com.google.gerrit.server.change;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.gerrit.server.project.ProjectCache.illegalState;
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Streams;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.LabelTypes;
@@ -32,8 +32,9 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.Collection;
-import java.util.List;
+import java.util.HashSet;
import java.util.Optional;
+import java.util.Set;
/**
* Normalizes votes on labels according to project config.
@@ -49,23 +50,25 @@
public abstract static class Result {
@VisibleForTesting
static Result create(
- List<PatchSetApproval> unchanged,
- List<PatchSetApproval> updated,
- List<PatchSetApproval> deleted) {
+ Set<PatchSetApproval> unchanged,
+ Set<PatchSetApproval> updated,
+ Set<PatchSetApproval> deleted) {
return new AutoValue_LabelNormalizer_Result(
- ImmutableList.copyOf(unchanged),
- ImmutableList.copyOf(updated),
- ImmutableList.copyOf(deleted));
+ ImmutableSet.copyOf(unchanged),
+ ImmutableSet.copyOf(updated),
+ ImmutableSet.copyOf(deleted));
}
- public abstract ImmutableList<PatchSetApproval> unchanged();
+ public abstract ImmutableSet<PatchSetApproval> unchanged();
- public abstract ImmutableList<PatchSetApproval> updated();
+ public abstract ImmutableSet<PatchSetApproval> updated();
- public abstract ImmutableList<PatchSetApproval> deleted();
+ public abstract ImmutableSet<PatchSetApproval> deleted();
- public Iterable<PatchSetApproval> getNormalized() {
- return Iterables.concat(unchanged(), updated());
+ public ImmutableSet<PatchSetApproval> getNormalized() {
+ return Streams.concat(unchanged().stream(), updated().stream())
+ .distinct()
+ .collect(toImmutableSet());
}
}
@@ -84,9 +87,9 @@
* @param approvals list of approvals.
*/
public Result normalize(ChangeNotes notes, Collection<PatchSetApproval> approvals) {
- List<PatchSetApproval> unchanged = Lists.newArrayListWithCapacity(approvals.size());
- List<PatchSetApproval> updated = Lists.newArrayListWithCapacity(approvals.size());
- List<PatchSetApproval> deleted = Lists.newArrayListWithCapacity(approvals.size());
+ Set<PatchSetApproval> unchanged = new HashSet<>(approvals.size());
+ Set<PatchSetApproval> updated = new HashSet<>(approvals.size());
+ Set<PatchSetApproval> deleted = new HashSet<>(approvals.size());
LabelTypes labelTypes =
projectCache
.get(notes.getProjectName())
diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
index fc56e80..f7bec1c0 100644
--- a/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -21,11 +21,12 @@
import static java.util.Objects.requireNonNull;
import com.google.common.collect.ImmutableListMultimap;
-import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetInfo;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
+import com.google.gerrit.extensions.client.ChangeKind;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
@@ -33,14 +34,13 @@
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.ReviewerSet;
+import com.google.gerrit.server.approval.ApprovalCopier;
import com.google.gerrit.server.approval.ApprovalsUtil;
import com.google.gerrit.server.events.CommitReceivedEvent;
import com.google.gerrit.server.extensions.events.RevisionCreated;
import com.google.gerrit.server.extensions.events.WorkInProgressStateChanged;
import com.google.gerrit.server.git.validators.CommitValidationException;
import com.google.gerrit.server.git.validators.CommitValidators;
-import com.google.gerrit.server.mail.send.MessageIdGenerator;
-import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.patch.AutoMerger;
@@ -65,8 +65,6 @@
import org.eclipse.jgit.transport.ReceiveCommand;
public class PatchSetInserter implements BatchUpdateOp {
- private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
public interface Factory {
PatchSetInserter create(ChangeNotes notes, PatchSet.Id psId, ObjectId commitId);
}
@@ -74,15 +72,15 @@
// Injected fields.
private final PermissionBackend permissionBackend;
private final PatchSetInfoFactory patchSetInfoFactory;
+ private final ChangeKindCache changeKindCache;
private final CommitValidators.Factory commitValidatorsFactory;
- private final ReplacePatchSetSender.Factory replacePatchSetFactory;
+ private final EmailNewPatchSet.Factory emailNewPatchSetFactory;
private final ProjectCache projectCache;
private final RevisionCreated revisionCreated;
private final ApprovalsUtil approvalsUtil;
private final ChangeMessagesUtil cmUtil;
private final PatchSetUtil psUtil;
private final WorkInProgressStateChanged wipStateChanged;
- private final MessageIdGenerator messageIdGenerator;
private final AutoMerger autoMerger;
// Assisted-injected fields.
@@ -111,9 +109,12 @@
private Change change;
private PatchSet patchSet;
private PatchSetInfo patchSetInfo;
+ private ChangeKind changeKind;
private String mailMessage;
private ReviewerSet oldReviewers;
private boolean oldWorkInProgressState;
+ private ApprovalCopier.Result approvalCopierResult;
+ private ObjectId preUpdateMetaId;
@Inject
public PatchSetInserter(
@@ -121,13 +122,13 @@
ApprovalsUtil approvalsUtil,
ChangeMessagesUtil cmUtil,
PatchSetInfoFactory patchSetInfoFactory,
+ ChangeKindCache changeKindCache,
CommitValidators.Factory commitValidatorsFactory,
- ReplacePatchSetSender.Factory replacePatchSetFactory,
+ EmailNewPatchSet.Factory emailNewPatchSetFactory,
PatchSetUtil psUtil,
RevisionCreated revisionCreated,
ProjectCache projectCache,
WorkInProgressStateChanged wipStateChanged,
- MessageIdGenerator messageIdGenerator,
AutoMerger autoMerger,
@Assisted ChangeNotes notes,
@Assisted PatchSet.Id psId,
@@ -136,13 +137,13 @@
this.approvalsUtil = approvalsUtil;
this.cmUtil = cmUtil;
this.patchSetInfoFactory = patchSetInfoFactory;
+ this.changeKindCache = changeKindCache;
this.commitValidatorsFactory = commitValidatorsFactory;
- this.replacePatchSetFactory = replacePatchSetFactory;
+ this.emailNewPatchSetFactory = emailNewPatchSetFactory;
this.psUtil = psUtil;
this.revisionCreated = revisionCreated;
this.projectCache = projectCache;
this.wipStateChanged = wipStateChanged;
- this.messageIdGenerator = messageIdGenerator;
this.autoMerger = autoMerger;
this.origNotes = notes;
@@ -238,6 +239,15 @@
throws AuthException, ResourceConflictException, IOException, PermissionBackendException {
validate(ctx);
ctx.addRefUpdate(ObjectId.zeroId(), commitId, getPatchSetId().toRefName());
+
+ changeKind =
+ changeKindCache.getChangeKind(
+ ctx.getProject(),
+ ctx.getRevWalk(),
+ ctx.getRepoView().getConfig(),
+ psUtil.current(origNotes).commitId(),
+ commitId);
+
Optional<ReceiveCommand> autoMerge =
autoMerger.createAutoMergeCommitIfNecessary(
ctx.getRepoView(),
@@ -252,6 +262,7 @@
@Override
public boolean updateChange(ChangeContext ctx)
throws ResourceConflictException, IOException, BadRequestException {
+ preUpdateMetaId = ctx.getNotes().getMetaId();
change = ctx.getChange();
ChangeUpdate update = ctx.getUpdate(psId);
update.setSubjectForCommit("Create patch set " + psId.get());
@@ -278,12 +289,6 @@
oldReviewers = approvalsUtil.getReviewers(ctx.getNotes());
}
- if (message != null) {
- mailMessage =
- cmUtil.setChangeMessage(
- update, message, ChangeMessagesUtil.uploadedPatchSetTag(change.isWorkInProgress()));
- }
-
oldWorkInProgressState = change.isWorkInProgress();
if (workInProgress != null) {
change.setWorkInProgress(workInProgress);
@@ -307,34 +312,68 @@
}
if (storeCopiedVotes) {
- approvalsUtil.persistCopiedApprovals(
- ctx.getNotes(), patchSet, ctx.getRevWalk(), ctx.getRepoView().getConfig(), update);
+ approvalCopierResult =
+ approvalsUtil.copyApprovalsToNewPatchSet(
+ ctx.getNotes(), patchSet, ctx.getRevWalk(), ctx.getRepoView().getConfig(), update);
}
+ mailMessage = insertChangeMessage(update, ctx);
+
return true;
}
+ @Nullable
+ private String insertChangeMessage(ChangeUpdate update, ChangeContext ctx) {
+ StringBuilder messageBuilder = new StringBuilder();
+ if (message != null) {
+ messageBuilder.append(message);
+ }
+
+ if (approvalCopierResult != null) {
+ approvalsUtil
+ .formatApprovalCopierResult(
+ approvalCopierResult,
+ projectCache
+ .get(ctx.getProject())
+ .orElseThrow(illegalState(ctx.getProject()))
+ .getLabelTypes())
+ .ifPresent(
+ msg -> {
+ if (message != null && !message.endsWith("\n")) {
+ messageBuilder.append("\n");
+ }
+ messageBuilder.append("\n").append(msg);
+ });
+ }
+
+ String changeMessage = messageBuilder.toString();
+ if (changeMessage.isEmpty()) {
+ return null;
+ }
+
+ return cmUtil.setChangeMessage(
+ update,
+ messageBuilder.toString(),
+ ChangeMessagesUtil.uploadedPatchSetTag(change.isWorkInProgress()));
+ }
+
@Override
public void postUpdate(PostUpdateContext ctx) {
NotifyResolver.Result notify = ctx.getNotify(change.getId());
if (notify.shouldNotify() && sendEmail) {
requireNonNull(mailMessage);
- try {
- ReplacePatchSetSender emailSender =
- replacePatchSetFactory.create(ctx.getProject(), change.getId());
- emailSender.setFrom(ctx.getAccountId());
- emailSender.setPatchSet(patchSet, patchSetInfo);
- emailSender.setChangeMessage(mailMessage, ctx.getWhen());
- emailSender.addReviewers(oldReviewers.byState(REVIEWER));
- emailSender.addExtraCC(oldReviewers.byState(CC));
- emailSender.setNotify(notify);
- emailSender.setMessageId(
- messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), patchSet.id()));
- emailSender.send();
- } catch (Exception err) {
- logger.atSevere().withCause(err).log(
- "Cannot send email for new patch set on change %s", change.getId());
- }
+
+ emailNewPatchSetFactory
+ .create(
+ ctx,
+ patchSet,
+ mailMessage,
+ approvalCopierResult.outdatedApprovals(),
+ oldReviewers.byState(REVIEWER),
+ oldReviewers.byState(CC),
+ changeKind,
+ preUpdateMetaId)
+ .sendAsync();
}
if (fireRevisionCreated) {
diff --git a/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java
index a0fa8e9..4de21d6 100644
--- a/java/com/google/gerrit/server/change/RebaseChangeOp.java
+++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java
@@ -35,6 +35,7 @@
import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk;
import com.google.gerrit.server.git.GroupCollector;
import com.google.gerrit.server.git.MergeUtil;
+import com.google.gerrit.server.git.MergeUtilFactory;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.InvalidChangeOperationException;
@@ -75,7 +76,7 @@
}
private final PatchSetInserter.Factory patchSetInserterFactory;
- private final MergeUtil.Factory mergeUtilFactory;
+ private final MergeUtilFactory mergeUtilFactory;
private final RebaseUtil rebaseUtil;
private final ChangeResource.Factory changeResourceFactory;
@@ -106,7 +107,7 @@
@Inject
RebaseChangeOp(
PatchSetInserter.Factory patchSetInserterFactory,
- MergeUtil.Factory mergeUtilFactory,
+ MergeUtilFactory mergeUtilFactory,
RebaseUtil rebaseUtil,
ChangeResource.Factory changeResourceFactory,
IdentifiedUser.GenericFactory identifiedUserFactory,
diff --git a/java/com/google/gerrit/server/change/RelatedChangesSorter.java b/java/com/google/gerrit/server/change/RelatedChangesSorter.java
index 719578f..b6e3121 100644
--- a/java/com/google/gerrit/server/change/RelatedChangesSorter.java
+++ b/java/com/google/gerrit/server/change/RelatedChangesSorter.java
@@ -28,7 +28,6 @@
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.permissions.ChangePermission;
import com.google.gerrit.server.permissions.PermissionBackend;
@@ -237,12 +236,8 @@
private boolean isVisible(PatchSetData psd) throws PermissionBackendException {
PermissionBackend.WithUser perm = permissionBackend.currentUser();
- try {
- perm.change(psd.data()).check(ChangePermission.READ);
- } catch (AuthException e) {
- return false;
- }
- return projectCache.get(psd.data().project()).map(ProjectState::statePermitsRead).orElse(false);
+ return perm.change(psd.data()).test(ChangePermission.READ)
+ && projectCache.get(psd.data().project()).map(ProjectState::statePermitsRead).orElse(false);
}
@AutoValue
diff --git a/java/com/google/gerrit/server/change/RemoveFromAttentionSetOp.java b/java/com/google/gerrit/server/change/RemoveFromAttentionSetOp.java
index 50ee9d4..1d92521 100644
--- a/java/com/google/gerrit/server/change/RemoveFromAttentionSetOp.java
+++ b/java/com/google/gerrit/server/change/RemoveFromAttentionSetOp.java
@@ -16,13 +16,11 @@
import static java.util.Objects.requireNonNull;
-import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.AttentionSetUpdate;
import com.google.gerrit.entities.AttentionSetUpdate.Operation;
import com.google.gerrit.entities.Change;
import com.google.gerrit.extensions.restapi.RestApiException;
-import com.google.gerrit.server.mail.send.MessageIdGenerator;
import com.google.gerrit.server.mail.send.RemoveFromAttentionSetSender;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.query.change.ChangeData;
@@ -32,19 +30,15 @@
import com.google.gerrit.server.util.AttentionSetEmail;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
-import java.io.IOException;
import java.util.Optional;
/** Remove a specified user from the attention set. */
public class RemoveFromAttentionSetOp implements BatchUpdateOp {
- private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
public interface Factory {
RemoveFromAttentionSetOp create(Account.Id attentionUserId, String reason, boolean notify);
}
private final ChangeData.Factory changeDataFactory;
- private final MessageIdGenerator messageIdGenerator;
private final RemoveFromAttentionSetSender.Factory removeFromAttentionSetSender;
private final AttentionSetEmail.Factory attentionSetEmailFactory;
@@ -64,14 +58,12 @@
@Inject
RemoveFromAttentionSetOp(
ChangeData.Factory changeDataFactory,
- MessageIdGenerator messageIdGenerator,
RemoveFromAttentionSetSender.Factory removeFromAttentionSetSenderFactory,
AttentionSetEmail.Factory attentionSetEmailFactory,
@Assisted Account.Id attentionUserId,
@Assisted String reason,
@Assisted boolean notify) {
this.changeDataFactory = changeDataFactory;
- this.messageIdGenerator = messageIdGenerator;
this.removeFromAttentionSetSender = removeFromAttentionSetSenderFactory;
this.attentionSetEmailFactory = attentionSetEmailFactory;
this.attentionUserId = requireNonNull(attentionUserId, "user");
@@ -94,8 +86,8 @@
change = ctx.getChange();
- ChangeUpdate update = ctx.getUpdate(ctx.getChange().currentPatchSetId());
- update.addToPlannedAttentionSetUpdates(
+ ChangeUpdate changeUpdate = ctx.getUpdate(ctx.getChange().currentPatchSetId());
+ changeUpdate.addToPlannedAttentionSetUpdates(
AttentionSetUpdate.createForWrite(attentionUserId, Operation.REMOVE, reason));
return true;
}
@@ -105,18 +97,13 @@
if (!notify) {
return;
}
- try {
- attentionSetEmailFactory
- .create(
- removeFromAttentionSetSender.create(ctx.getProject(), change.getId()),
- ctx,
- change,
- reason,
- messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), change.currentPatchSetId()),
- attentionUserId)
- .sendAsync();
- } catch (IOException e) {
- logger.atSevere().withCause(e).log(e.getMessage(), change.getId());
- }
+ attentionSetEmailFactory
+ .create(
+ removeFromAttentionSetSender.create(ctx.getProject(), change.getId()),
+ ctx,
+ change,
+ reason,
+ attentionUserId)
+ .sendAsync();
}
}
diff --git a/java/com/google/gerrit/server/change/ReviewerModifier.java b/java/com/google/gerrit/server/change/ReviewerModifier.java
index c98fcaa..9580565 100644
--- a/java/com/google/gerrit/server/change/ReviewerModifier.java
+++ b/java/com/google/gerrit/server/change/ReviewerModifier.java
@@ -83,6 +83,7 @@
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
+import java.util.stream.Stream;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectId;
@@ -453,9 +454,13 @@
this.input = input;
this.failureType = null;
result = new ReviewerResult(input.reviewer);
- // Always silently ignore adding the owner as any type of reviewer on their own change. They
- // may still be implicitly added as a reviewer if they vote, but not via the reviewer API.
- this.reviewers = omitOwner(notes, reviewers);
+ if (!state().equals(REMOVED)) {
+ // Always silently ignore adding the owner as any type of reviewer on their own change. They
+ // may still be implicitly added as a reviewer if they vote, but not via the reviewer API.
+ this.reviewers = reviewersAsList(notes, reviewers, /* omitChangeOwner= */ true);
+ } else {
+ this.reviewers = reviewersAsList(notes, reviewers, /* omitChangeOwner= */ false);
+ }
this.reviewersByEmail =
reviewersByEmail == null ? ImmutableSet.of() : ImmutableSet.copyOf(reviewersByEmail);
this.caller = caller.asIdentifiedUser();
@@ -489,12 +494,18 @@
this.exactMatchFound = exactMatchFound;
}
- private ImmutableSet<Account> omitOwner(ChangeNotes notes, Iterable<Account> reviewers) {
- return reviewers != null
- ? Streams.stream(reviewers)
- .filter(account -> !account.id().equals(notes.getChange().getOwner()))
- .collect(toImmutableSet())
- : ImmutableSet.of();
+ private ImmutableSet<Account> reviewersAsList(
+ ChangeNotes notes, @Nullable Iterable<Account> reviewers, boolean omitChangeOwner) {
+ if (reviewers == null) {
+ return ImmutableSet.of();
+ }
+
+ Stream<Account> reviewerStream = Streams.stream(reviewers);
+ if (omitChangeOwner) {
+ reviewerStream =
+ reviewerStream.filter(account -> !account.id().equals(notes.getChange().getOwner()));
+ }
+ return reviewerStream.collect(toImmutableSet());
}
public void gatherResults(ChangeData cd) throws PermissionBackendException {
diff --git a/java/com/google/gerrit/server/change/RevisionJson.java b/java/com/google/gerrit/server/change/RevisionJson.java
index 0170f35..bd9c52b 100644
--- a/java/com/google/gerrit/server/change/RevisionJson.java
+++ b/java/com/google/gerrit/server/change/RevisionJson.java
@@ -57,7 +57,7 @@
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.account.GpgApiAdapter;
import com.google.gerrit.server.git.GitRepositoryManager;
-import com.google.gerrit.server.git.MergeUtil;
+import com.google.gerrit.server.git.MergeUtilFactory;
import com.google.gerrit.server.patch.PatchListNotAvailableException;
import com.google.gerrit.server.permissions.ChangePermission;
import com.google.gerrit.server.permissions.PermissionBackend;
@@ -87,7 +87,7 @@
RevisionJson create(Iterable<ListChangesOption> options);
}
- private final MergeUtil.Factory mergeUtilFactory;
+ private final MergeUtilFactory mergeUtilFactory;
private final IdentifiedUser.GenericFactory userFactory;
private final FileInfoJson fileInfoJson;
private final GpgApiAdapter gpgApi;
@@ -111,7 +111,7 @@
AnonymousUser anonymous,
ProjectCache projectCache,
IdentifiedUser.GenericFactory userFactory,
- MergeUtil.Factory mergeUtilFactory,
+ MergeUtilFactory mergeUtilFactory,
FileInfoJson fileInfoJson,
AccountLoader.Factory accountLoaderFactory,
DynamicMap<DownloadScheme> downloadSchemes,
diff --git a/java/com/google/gerrit/server/change/SubmitRequirementsJson.java b/java/com/google/gerrit/server/change/SubmitRequirementsJson.java
index 96c863e..fcd9e90 100644
--- a/java/com/google/gerrit/server/change/SubmitRequirementsJson.java
+++ b/java/com/google/gerrit/server/change/SubmitRequirementsJson.java
@@ -65,7 +65,10 @@
boolean hide) {
SubmitRequirementExpressionInfo info = new SubmitRequirementExpressionInfo();
info.expression = hide ? null : expression.expressionString();
- info.fulfilled = result.status().equals(SubmitRequirementExpressionResult.Status.PASS);
+ info.fulfilled =
+ result.status().equals(SubmitRequirementExpressionResult.Status.PASS)
+ || result.status().equals(SubmitRequirementExpressionResult.Status.NOT_EVALUATED);
+ info.status = SubmitRequirementExpressionInfo.Status.valueOf(result.status().name());
info.passingAtoms = hide ? null : result.passingAtoms();
info.failingAtoms = hide ? null : result.failingAtoms();
info.errorMessage = result.errorMessage().isPresent() ? result.errorMessage().get() : null;
diff --git a/java/com/google/gerrit/server/change/WorkInProgressOp.java b/java/com/google/gerrit/server/change/WorkInProgressOp.java
index 1409170..04fd1c0 100644
--- a/java/com/google/gerrit/server/change/WorkInProgressOp.java
+++ b/java/com/google/gerrit/server/change/WorkInProgressOp.java
@@ -19,21 +19,18 @@
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.PatchSet;
-import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.common.InputWithMessage;
import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.extensions.events.WorkInProgressStateChanged;
-import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.update.BatchUpdateOp;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.PostUpdateContext;
-import com.google.gerrit.server.update.RepoView;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
-import java.io.IOException;
+import org.eclipse.jgit.lib.ObjectId;
/* Set work in progress or ready for review state on a change */
public class WorkInProgressOp implements BatchUpdateOp {
@@ -61,8 +58,8 @@
private final WorkInProgressStateChanged stateChanged;
private boolean sendEmail = true;
+ private ObjectId preUpdateMetaId;
private Change change;
- private ChangeNotes notes;
private PatchSet ps;
private String mailMessage;
@@ -88,8 +85,8 @@
@Override
public boolean updateChange(ChangeContext ctx) {
+ preUpdateMetaId = ctx.getNotes().getMetaId();
change = ctx.getChange();
- notes = ctx.getNotes();
ps = psUtil.get(ctx.getNotes(), change.currentPatchSetId());
ChangeUpdate update = ctx.getUpdate(change.currentPatchSetId());
change.setWorkInProgress(workInProgress);
@@ -131,25 +128,15 @@
|| !sendEmail) {
return;
}
- RepoView repoView;
- try {
- repoView = ctx.getRepoView();
- } catch (IOException ex) {
- throw new StorageException(
- String.format("Repository %s not found", ctx.getProject().get()), ex);
- }
email
.create(
- notify,
- notes,
+ ctx,
ps,
- ctx.getIdentifiedUser(),
- mailMessage,
- ctx.getWhen(),
- ImmutableList.of(),
+ preUpdateMetaId,
mailMessage,
ImmutableList.of(),
- repoView)
+ mailMessage,
+ ImmutableList.of())
.sendAsync();
}
}
diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 6449155..e5b063b 100644
--- a/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -37,6 +37,7 @@
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.AgreementSignupListener;
import com.google.gerrit.extensions.events.AssigneeChangedListener;
+import com.google.gerrit.extensions.events.AttentionSetListener;
import com.google.gerrit.extensions.events.ChangeAbandonedListener;
import com.google.gerrit.extensions.events.ChangeDeletedListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
@@ -121,6 +122,7 @@
import com.google.gerrit.server.change.ChangeJson;
import com.google.gerrit.server.change.ChangeKindCacheImpl;
import com.google.gerrit.server.change.ChangePluginDefinedInfoFactory;
+import com.google.gerrit.server.change.EmailNewPatchSet;
import com.google.gerrit.server.change.FileInfoJsonModule;
import com.google.gerrit.server.change.MergeabilityCacheImpl;
import com.google.gerrit.server.change.ReviewerSuggestion;
@@ -130,11 +132,11 @@
import com.google.gerrit.server.events.EventListener;
import com.google.gerrit.server.events.EventsMetrics;
import com.google.gerrit.server.events.UserScopedEventListener;
+import com.google.gerrit.server.extensions.events.AttentionSetObserver;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.extensions.webui.UiActions;
import com.google.gerrit.server.git.ChangeMessageModifier;
import com.google.gerrit.server.git.GitModule;
-import com.google.gerrit.server.git.MergeUtil;
import com.google.gerrit.server.git.MergedByPushOp;
import com.google.gerrit.server.git.MultiProgressMonitor;
import com.google.gerrit.server.git.NotesBranchUtil;
@@ -173,6 +175,7 @@
import com.google.gerrit.server.mail.send.MailSoyTemplateProvider;
import com.google.gerrit.server.mime.FileTypeRegistry;
import com.google.gerrit.server.mime.MimeUtilFileTypeRegistry;
+import com.google.gerrit.server.notedb.DeleteZombieCommentsRefs;
import com.google.gerrit.server.notedb.NoteDbModule;
import com.google.gerrit.server.notedb.StoreSubmitRequirementsOp;
import com.google.gerrit.server.patch.DiffOperationsImpl;
@@ -188,7 +191,7 @@
import com.google.gerrit.server.project.ProjectCacheImpl;
import com.google.gerrit.server.project.ProjectNameLockManager;
import com.google.gerrit.server.project.ProjectState;
-import com.google.gerrit.server.project.SubmitRequirementExpressionsValidator;
+import com.google.gerrit.server.project.SubmitRequirementConfigValidator;
im
