Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Bump plugin API to 2.16.27 Convert UI filters to links and display always Change-Id: I30aa932828bbaea7058b46732ef129ad1c790d27
diff --git a/.bazelversion b/.bazelversion index fd2a018..7c69a55 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -3.1.0 +3.7.0
diff --git a/BUILD b/BUILD index f5ca52c..20c042d 100644 --- a/BUILD +++ b/BUILD
@@ -13,12 +13,10 @@ srcs = glob(["src/main/java/**/*.java"]), manifest_entries = [ "Gerrit-PluginName: " + plugin_name, - "Gerrit-ApiVersion: 2.16", + "Gerrit-ApiVersion: 3.0.15", "Implementation-Title: Task Plugin", "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/" + plugin_name, "Gerrit-Module: com.googlesource.gerrit.plugins.task.Modules$Module", - "Gerrit-SshModule: com.googlesource.gerrit.plugins.task.Modules$SshModule", - "Gerrit-HttpModule: com.googlesource.gerrit.plugins.task.Modules$HttpModule", ], resource_jars = [":gr-task-plugin-static"], resources = glob(["src/main/resources/**/*"]),
diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..11069ed --- /dev/null +++ b/LICENSE
@@ -0,0 +1,201 @@ + 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.
diff --git a/WORKSPACE b/WORKSPACE index 063d2cb..31b9291 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "0ccc066431ad7e88a5cd9e06000ce677de1116ee", + commit = "a029d8e41d6211c8b23052aa0a0c2c7649577e85", #local_path = "/home/<user>/projects/bazlets", ) @@ -35,20 +35,10 @@ repository = GERRIT, ) -# Release Plugin API +# Load plugin API load( "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", "gerrit_api", ) -# Snapshot Plugin API -#load( -# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl", -# "gerrit_api_maven_local", -#) - -# Load release Plugin API gerrit_api() - -# Load snapshot Plugin API -#gerrit_api_maven_local()
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java b/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java index f927d51..f8661f1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java
@@ -19,7 +19,7 @@ import com.google.gerrit.extensions.webui.JavaScriptPlugin; import com.google.gerrit.extensions.webui.WebUiPlugin; import com.google.gerrit.server.DynamicOptions.DynamicBean; -import com.google.gerrit.server.query.change.ChangeQueryProcessor.ChangeAttributeFactory; +import com.google.gerrit.server.change.ChangeAttributeFactory; import com.google.gerrit.server.restapi.change.QueryChanges; import com.google.gerrit.sshd.commands.Query; import com.google.inject.AbstractModule; @@ -36,19 +36,8 @@ bind(ChangeAttributeFactory.class) .annotatedWith(Exports.named("task")) .to(TaskAttributeFactory.class); - } - } - public static class SshModule extends AbstractModule { - @Override - protected void configure() { bind(DynamicBean.class).annotatedWith(Exports.named(Query.class)).to(MyOptions.class); - } - } - - public static class HttpModule extends AbstractModule { - @Override - protected void configure() { bind(DynamicBean.class).annotatedWith(Exports.named(QueryChanges.class)).to(MyOptions.class); DynamicSet.bind(binder(), WebUiPlugin.class) .toInstance(new JavaScriptPlugin("gr-task-plugin.html"));
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskAttributeFactory.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskAttributeFactory.java index 1bdf987..54da2af 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskAttributeFactory.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskAttributeFactory.java
@@ -15,14 +15,14 @@ package com.googlesource.gerrit.plugins.task; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.common.PluginDefinedInfo; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.server.DynamicOptions.BeanProvider; +import com.google.gerrit.server.change.ChangeAttributeFactory; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; -import com.google.gerrit.server.query.change.ChangeQueryProcessor; -import com.google.gerrit.server.query.change.ChangeQueryProcessor.ChangeAttributeFactory; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.googlesource.gerrit.plugins.task.TaskConfig.Task; import com.googlesource.gerrit.plugins.task.TaskTree.Node; @@ -81,13 +81,13 @@ } @Override - public PluginDefinedInfo create(ChangeData c, ChangeQueryProcessor qp, String plugin) { - options = (Modules.MyOptions) qp.getDynamicBean(plugin); + public PluginDefinedInfo create(ChangeData c, BeanProvider beanProvider, String plugin) { + options = (Modules.MyOptions) beanProvider.getDynamicBean(plugin); if (options.all || options.onlyApplicable || options.onlyInvalid) { for (PatchSetArgument psa : options.patchSetArguments) { definitions.masquerade(psa); } - return createWithExceptions(c); + return createWithExceptions(c); } return null; } @@ -151,7 +151,7 @@ } } } - } catch (OrmException | QueryParseException | RuntimeException e) { + } catch (QueryParseException | RuntimeException e) { atts.add(invalid()); // bad applicability query } } @@ -160,7 +160,7 @@ return System.nanoTime() / 1000000; } - protected List<TaskAttribute> getSubTasks(ChangeData c, Node node) throws OrmException { + protected List<TaskAttribute> getSubTasks(ChangeData c, Node node) { List<TaskAttribute> subTasks = new ArrayList<>(); for (Node subNode : node.getSubNodes()) { if (subNode == null) { @@ -195,7 +195,7 @@ match(c, def.fail); match(c, def.pass); return true; - } catch (OrmException | QueryParseException | RuntimeException e) { + } catch (QueryParseException | RuntimeException e) { return false; } } @@ -203,13 +203,13 @@ protected Status getStatus(ChangeData c, Task def, TaskAttribute a) { try { return getStatusWithExceptions(c, def, a); - } catch (OrmException | QueryParseException | RuntimeException e) { + } catch (QueryParseException | RuntimeException e) { return Status.INVALID; } } protected Status getStatusWithExceptions(ChangeData c, Task def, TaskAttribute a) - throws OrmException, QueryParseException { + throws QueryParseException { if (isAllNull(def.pass, def.fail, a.subTasks)) { // A leaf def has no defined subdefs. boolean hasDefinedSubtasks = @@ -293,7 +293,7 @@ return true; } - protected boolean match(ChangeData c, String query) throws OrmException, QueryParseException { + protected boolean match(ChangeData c, String query) throws StorageException, QueryParseException { if (query == null) { return true; } @@ -304,14 +304,14 @@ if (query != null) { try { return matchWithExceptions(c, query); - } catch (OrmException | QueryParseException | RuntimeException e) { + } catch (QueryParseException | RuntimeException e) { } } return null; } protected boolean matchWithExceptions(ChangeData c, String query) - throws QueryParseException, OrmException { + throws QueryParseException, StorageException { if ("true".equalsIgnoreCase(query)) { return true; }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java index 99a1ba9..6b1becd 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
@@ -14,6 +14,7 @@ package com.googlesource.gerrit.plugins.task; +import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.RefNames; @@ -21,7 +22,6 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.config.AllUsersNameProvider; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.googlesource.gerrit.plugins.task.TaskConfig.External; import com.googlesource.gerrit.plugins.task.TaskConfig.NamesFactory; @@ -123,7 +123,7 @@ new Properties(definition, parentProperties); } - public List<Node> getSubNodes() throws OrmException { + public List<Node> getSubNodes() { if (nodes == null) { nodes = new ArrayList<>(); addSubDefinitions(); @@ -131,7 +131,7 @@ return nodes; } - protected void addSubDefinitions() throws OrmException { + protected void addSubDefinitions() { addSubDefinitions(getSubDefinitions()); addSubDefinitions(getTasksFactoryDefinitions()); addSubFileDefinitions(); @@ -152,7 +152,7 @@ } } - protected void addExternalDefinitions() throws OrmException { + protected void addExternalDefinitions() { for (String external : definition.subTasksExternals) { try { External ext = definition.config.getExternal(external); @@ -201,7 +201,7 @@ } protected List<Task> getTaskDefinitions(External external) - throws ConfigInvalidException, IOException, OrmException { + throws ConfigInvalidException, IOException { return getTaskDefinitions(resolveUserBranch(external.user), external.file); } @@ -224,15 +224,17 @@ } protected Branch.NameKey resolveUserBranch(String user) - throws ConfigInvalidException, IOException, OrmException { + throws ConfigInvalidException, IOException { if (user == null) { throw new ConfigInvalidException("External user not defined"); } - Account acct = accountResolver.find(user); - if (acct == null) { + Account.Id acct; + try { + acct = accountResolver.resolve(user).asUnique().getAccount().getId(); + } catch (UnprocessableEntityException e) { throw new ConfigInvalidException("Cannot resolve user: " + user); } - return new Branch.NameKey(allUsers.get(), RefNames.refsUsers(acct.getId())); + return new Branch.NameKey(allUsers.get(), RefNames.refsUsers(acct)); } } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java b/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java index bcbb972..9fbddeb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java
@@ -13,10 +13,10 @@ // limitations under the License. package com.googlesource.gerrit.plugins.task.cli; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.notedb.ChangeNotes; @@ -24,14 +24,12 @@ import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.sshd.BaseCommand.UnloggedFailure; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; public class PatchSetArgument { public static class Factory { protected final PermissionBackend permissionBackend; protected final ChangeNotes.Factory notesFactory; - protected final ReviewDb reviewDb; protected final PatchSetUtil psUtil; protected final CurrentUser user; @@ -39,12 +37,10 @@ protected Factory( ChangeNotes.Factory notesFactory, PermissionBackend permissionBackend, - ReviewDb reviewDb, PatchSetUtil psUtil, CurrentUser user) { this.notesFactory = notesFactory; this.permissionBackend = permissionBackend; - this.reviewDb = reviewDb; this.psUtil = psUtil; this.user = user; } @@ -53,18 +49,13 @@ try { PatchSet.Id patchSetId = parsePatchSet(token); ChangeNotes changeNotes = notesFactory.createChecked(patchSetId.getParentKey()); - permissionBackend - .user(user) - .database(reviewDb) - .change(changeNotes) - .check(ChangePermission.READ); - return new PatchSetArgument( - changeNotes.getChange(), psUtil.get(reviewDb, changeNotes, patchSetId)); + permissionBackend.user(user).change(changeNotes).check(ChangePermission.READ); + return new PatchSetArgument(changeNotes.getChange(), psUtil.get(changeNotes, patchSetId)); } catch (PermissionBackendException | AuthException e) { throw new IllegalArgumentException("database error", e); } catch (UnloggedFailure e) { throw new IllegalArgumentException(e.getMessage(), e); - } catch (OrmException e) { + } catch (StorageException e) { throw new IllegalArgumentException("database error", e); } }
diff --git a/test/check_task_statuses.sh b/test/check_task_statuses.sh index 3b2bf0b..0ed0dcb 100755 --- a/test/check_task_statuses.sh +++ b/test/check_task_statuses.sh
@@ -33,7 +33,7 @@ } get_change_num() { # < gerrit_push_response > changenum - local url=$(awk '/New Changes:/ { getline; print $2 }') + local url=$(awk '$NF ~ /\[NEW\]/ { print $2 }') echo "${url##*\/}" | tr -d -c '[:digit:]' }
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile index 059f3c0..bebe667 100755 --- a/test/docker/gerrit/Dockerfile +++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:2.16.27-ubuntu16 +FROM gerritcodereview/gerrit:3.0.15-ubuntu18 USER root