Merge branch 'stable-3.0'
* stable-3.0:
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Remove unnecessary 'include =' on java_library src parameter
Upgrade bazlets to latest stable-3.0 to build with 3.0.2 API
Upgrade bazlets to latest stable-2.16 to build with 2.16.11.1 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.16 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.15 API
Upgrade bazlets to latest stable-3.0
Upgrade bazlets to latest stable-2.16 to build with 2.16.10 API
Upgrade bazlets to latest stable-2.16
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Upgrade bazlets to latest stable-2.16 to build with 2.16.9 API
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API
Change-Id: I194c3f81d1ab42c97c638f22ffd6ea84e90b8e72
diff --git a/WORKSPACE b/WORKSPACE
index c59c513..d0349bf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "631205bc4f7903d3cf656a844cab2bfd6b03f246",
+ commit = "1ddb1d6c71b77972a89aa0a717f6250ef256d166",
#local_path = "/home/<user>/projects/bazlets",
)
# Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
index 5630b48..ba940df 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
@@ -86,7 +86,7 @@
return conf != null
&& isValidConfig(conf, projectName)
&& (activeForRef(conf, refName))
- && (activeForEmail(conf, user.getAccount().getPreferredEmail()))
+ && (activeForEmail(conf, user.getAccount().preferredEmail()))
&& (activeForProject(conf, projectName.get()))
&& (!hasCriteria(conf, "skipGroup")
|| !canSkipValidation(conf, validatorOp)
@@ -176,8 +176,7 @@
}
private AccountGroup.UUID groupUUID(String groupNameOrUUID) {
- Optional<InternalGroup> group =
- groupByNameFinder.get(AccountGroup.nameKey(groupNameOrUUID));
+ Optional<InternalGroup> group = groupByNameFinder.get(AccountGroup.nameKey(groupNameOrUUID));
return group.map(InternalGroup::getGroupUUID).orElse(AccountGroup.uuid(groupNameOrUUID));
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java
index ff79961..978020e 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java
@@ -43,8 +43,8 @@
private IdentifiedUser createNew(String email) {
IdentifiedUser user = createMock(IdentifiedUser.class);
- Account account = new Account(Account.id(1), TimeUtil.nowTs());
- account.setPreferredEmail(email);
+ Account account =
+ Account.builder(Account.id(1), TimeUtil.nowTs()).setPreferredEmail(email).build();
expect(user.isIdentifiedUser()).andReturn(true);
expect(user.asIdentifiedUser()).andReturn(user);
expect(user.getAccount()).andStubReturn(account);
