Merge changes I4cd6038f,I0978e20d,Id4d65ce2,Ic577d69f,I5955674f, ...
* changes:
dev-design.txt: NoteDb updates
install-j2ee.txt: Remove references to ReviewDb
Remove remaining NoteDb rebuilding machinery
Remove auto-rebuilding of changes
CommentJsonMigratorTest: Check change equivalence more explicitly
CommentJsonMigrator: Mark @UsedAt(GOOGLE)
Remove invocation of NoteDbChecker and NoteDbMode.CHECK
Remove Rebuild REST endpoint and ChangeRebuilder
Remove unused GroupRebuilder
ConsistencyChecker: Remove support for deleting patch sets from ReviewDb
ConsistencyCheckerIT: Remove ReviewDb only tests
BatchUpdate: Remove unused updateChangesInParallel flag
Remove ReviewDbBatchUpdate
Remove unused dependency on PostgreSQL
dev-inspector.txt: Remove references to ReviewDb
install.txt: Remove info about using external database
Remove unused DatabaseConfigModule and DatabaseConfigInitializer implementations
Remove UpgradeFrom2_0_x init step
Remove gsql SSH command and program
Remove ReviewDb resource config from Jetty configuration
Remove unused NotesMigrationStateListener
Remove unused MigrationException
MutableNotesMigration: Fix JavaDoc of setFrom method
InMemoryDatabase: Remove no-op drop method
Remove sql scripts to create indexes
Delete NoteDb migration code
Remove ThreadLimiter
Remove ReviewDb DataSource and schema setup
diff --git a/BUILD b/BUILD
index 5ddf8b1..f0b1954 100644
--- a/BUILD
+++ b/BUILD
@@ -23,7 +23,6 @@
cmd = ("cat bazel-out/volatile-status.txt bazel-out/stable-status.txt | " +
"grep STABLE_BUILD_GERRIT_LABEL | cut -d ' ' -f 2 > $@"),
stamp = 1,
- visibility = ["//visibility:public"],
)
genrule(
@@ -31,7 +30,6 @@
srcs = ["//Documentation:licenses.txt"],
outs = ["LICENSES.txt"],
cmd = "cp $< $@",
- visibility = ["//visibility:public"],
)
pkg_war(
diff --git a/Documentation/BUILD b/Documentation/BUILD
index b322fef..8a7a313 100644
--- a/Documentation/BUILD
+++ b/Documentation/BUILD
@@ -40,7 +40,6 @@
":prettify_files",
"//:LICENSES.txt",
],
- visibility = ["//visibility:public"],
)
license_map(
@@ -50,7 +49,6 @@
"//polygerrit-ui/app:polygerrit_ui",
"//java/com/google/gerrit/pgm",
],
- visibility = ["//visibility:public"],
)
license_map(
@@ -58,7 +56,6 @@
targets = [
"//polygerrit-ui/app:polygerrit_ui",
],
- visibility = ["//visibility:public"],
)
DOC_DIR = "Documentation"
@@ -86,7 +83,6 @@
srcs = SRCS,
attributes = documentation_attributes(),
backend = "html5",
- visibility = ["//visibility:public"],
)
genasciidoc_zip(
@@ -95,7 +91,6 @@
attributes = documentation_attributes(),
backend = "html5",
directory = DOC_DIR,
- visibility = ["//visibility:public"],
)
genasciidoc_zip(
@@ -105,5 +100,4 @@
backend = "html5",
directory = DOC_DIR,
searchbox = False,
- visibility = ["//visibility:public"],
)
diff --git a/Documentation/config-plugins.txt b/Documentation/config-plugins.txt
index 35f44c0..bda0b67 100644
--- a/Documentation/config-plugins.txt
+++ b/Documentation/config-plugins.txt
@@ -124,16 +124,6 @@
link:https://gerrit.googlesource.com/plugins/reviewnotes/+doc/master/src/main/resources/Documentation/about.md[
Documentation]
-[[review-strategy]]
-=== review-strategy
-
-This plugin allows users to configure different review strategies.
-
-link:https://gerrit-review.googlesource.com/admin/repos/plugins/review-strategy[
-Project] |
-link:https://gerrit.googlesource.com/plugins/review-strategy/+doc/master/src/main/resources/Documentation/about.md[
-Documentation]
-
[[singleusergroup]]
=== singleusergroup
@@ -566,6 +556,16 @@
link:https://gerrit.googlesource.com/plugins/reparent/+doc/master/src/main/resources/Documentation/config.md[
Configuration]
+[[review-strategy]]
+=== review-strategy
+
+This plugin allows users to configure different review strategies.
+
+link:https://gerrit-review.googlesource.com/admin/repos/plugins/review-strategy[
+Project] |
+link:https://gerrit.googlesource.com/plugins/review-strategy/+doc/master/src/main/resources/Documentation/about.md[
+Documentation]
+
[[reviewers]]
=== reviewers
diff --git a/WORKSPACE b/WORKSPACE
index 414220b..9e51fcd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -568,18 +568,18 @@
sha1 = "18d4d07010c24405129a6dbb0e92057f8779fb9d",
)
-AUTO_VALUE_VERSION = "1.6.2"
+AUTO_VALUE_VERSION = "1.6.3"
maven_jar(
name = "auto-value",
artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
- sha1 = "e7eae562942315a983eea3e191b72d755c153620",
+ sha1 = "8edb6675b9c09ffdcc19937428e7ef1e3d066e12",
)
maven_jar(
name = "auto-value-annotations",
artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
- sha1 = "ed193d86e0af90cc2342aedbe73c5d86b03fa09b",
+ sha1 = "b88c1bb7f149f6d2cc03898359283e57b08f39cc",
)
# Transitive dependency of commons-compress
@@ -1016,8 +1016,8 @@
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
- artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.1",
- sha1 = "d87892e24ef361b9fff5435246b0f0b8f4561fe8",
+ artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.2",
+ sha1 = "6ad0dd15affe56be7dfe638fe317bc5f7456b730",
)
JACKSON_VERSION = "2.9.7"
diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java
index c7d23e8..6e5158b 100644
--- a/java/com/google/gerrit/server/change/ConsistencyChecker.java
+++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java
@@ -502,7 +502,7 @@
List<ProblemInfo> currProblems = new ArrayList<>(3);
currProblems.add(notFound);
if (deleteOldPatchSetProblem != null) {
- currProblems.add(insertPatchSetProblem);
+ currProblems.add(deleteOldPatchSetProblem);
}
currProblems.add(insertPatchSetProblem);
diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
index 18eb37a..85fbfa6 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
@@ -27,6 +27,7 @@
import static java.util.stream.Collectors.toList;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.truth.Correspondence;
import com.google.common.util.concurrent.AtomicLongMap;
@@ -145,25 +146,6 @@
}
}
- // Creates a group, but with uniquified name.
- protected String createUniqueGroup() throws Exception {
- // TODO(hanwen): rewrite this test in terms of UUID. This requires redoing the assertion helpers
- // too.
- AccountGroup.UUID g = groupOperations.newGroup().ownerGroupUuid(adminGroupUuid()).create();
- return groupRef(g).getName();
- }
-
- protected String createGroup(String name, String owner) throws Exception {
- // TODO(hanwen): rewrite to use groupOperations. This requires passing the owner
- // group's UUID rathen than its name.
- name = name(name);
- GroupInput in = new GroupInput();
- in.name = name;
- in.ownerId = owner;
- gApi.groups().create(in);
- return name;
- }
-
@Override
protected ProjectResetter.Config resetProjects() {
// Don't reset All-Users since deleting users makes groups inconsistent (e.g. groups would
@@ -192,12 +174,14 @@
@Test
public void addRemoveMember() throws Exception {
- String g = createUniqueGroup();
- gApi.groups().id(g).addMembers("user");
- assertMembers(g, user);
+ AccountGroup.UUID group = groupOperations.newGroup().create();
- gApi.groups().id(g).removeMembers("user");
- assertNoMembers(g);
+ gApi.groups().id(group.get()).addMembers("user");
+ assertMembers(group.get(), user);
+
+ gApi.groups().id(group.get()).removeMembers("user");
+ ImmutableSet<Account.Id> members = groupOperations.group(group).get().members();
+ assertThat(members).isEmpty();
}
@Test
@@ -207,16 +191,15 @@
// Fill the cache for the observed account.
groupIncludeCache.getGroupsWithMember(accountId);
- String groupName = createUniqueGroup();
- AccountGroup.UUID groupUuid = new AccountGroup.UUID(gApi.groups().id(groupName).get().id);
+ AccountGroup.UUID groupUuid = groupOperations.newGroup().create();
- gApi.groups().id(groupName).addMembers(username);
+ gApi.groups().id(groupUuid.get()).addMembers(username);
Collection<AccountGroup.UUID> groupsWithMemberAfterAddition =
groupIncludeCache.getGroupsWithMember(accountId);
assertThat(groupsWithMemberAfterAddition).contains(groupUuid);
- gApi.groups().id(groupName).removeMembers(username);
+ gApi.groups().id(groupUuid.get()).removeMembers(username);
Collection<AccountGroup.UUID> groupsWithMemberAfterRemoval =
groupIncludeCache.getGroupsWithMember(accountId);
@@ -239,16 +222,16 @@
@Test
public void addMultipleMembers() throws Exception {
- String g = createUniqueGroup();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
String u1 = name("u1");
accountOperations.newAccount().username(u1).create();
String u2 = name("u2");
accountOperations.newAccount().username(u2).create();
- gApi.groups().id(g).addMembers(u1, u2);
+ gApi.groups().id(group.get()).addMembers(u1, u2);
- List<AccountInfo> members = gApi.groups().id(g).members();
+ List<AccountInfo> members = gApi.groups().id(group.get()).members();
assertThat(members)
.comparingElementsUsing(getAccountToUsernameCorrespondence())
.containsExactly(u1, u2);
@@ -256,13 +239,13 @@
@Test
public void membersWithAtSignInUsernameCanBeAdded() throws Exception {
- String g = createUniqueGroup();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
String usernameWithAt = name("u1@something");
accountOperations.newAccount().username(usernameWithAt).create();
- gApi.groups().id(g).addMembers(usernameWithAt);
+ gApi.groups().id(group.get()).addMembers(usernameWithAt);
- List<AccountInfo> members = gApi.groups().id(g).members();
+ List<AccountInfo> members = gApi.groups().id(group.get()).members();
assertThat(members)
.comparingElementsUsing(getAccountToUsernameCorrespondence())
.containsExactly(usernameWithAt);
@@ -270,7 +253,7 @@
@Test
public void membersWithAtSignInUsernameAreNotConfusedWithSimilarUsernames() throws Exception {
- String g = createUniqueGroup();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
String usernameWithAt = name("u1@something");
accountOperations.newAccount().username(usernameWithAt).create();
String usernameWithoutAt = name("u1something");
@@ -281,10 +264,10 @@
accountOperations.newAccount().username(usernameOnlySuffix).create();
gApi.groups()
- .id(g)
+ .id(group.get())
.addMembers(usernameWithAt, usernameWithoutAt, usernameOnlyPrefix, usernameOnlySuffix);
- List<AccountInfo> members = gApi.groups().id(g).members();
+ List<AccountInfo> members = gApi.groups().id(group.get()).members();
assertThat(members)
.comparingElementsUsing(getAccountToUsernameCorrespondence())
.containsExactly(usernameWithAt, usernameWithoutAt, usernameOnlyPrefix, usernameOnlySuffix);
@@ -292,49 +275,54 @@
@Test
public void includeRemoveGroup() throws Exception {
- String p = createUniqueGroup();
- String g = createUniqueGroup();
- gApi.groups().id(p).addGroups(g);
- assertIncludes(p, g);
+ AccountGroup.UUID parent = groupOperations.newGroup().create();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
+ gApi.groups().id(parent.get()).addGroups(group.get());
+ assertThat(groupOperations.group(parent).get().subgroups()).containsExactly(group);
- gApi.groups().id(p).removeGroups(g);
- assertNoIncludes(p);
+ gApi.groups().id(parent.get()).removeGroups(group.get());
+ assertThat(groupOperations.group(parent).get().subgroups()).isEmpty();
}
@Test
public void includeExternalGroup() throws Exception {
- String g = createUniqueGroup();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
String subgroupUuid = SystemGroupBackend.REGISTERED_USERS.get();
- gApi.groups().id(g).addGroups(subgroupUuid);
+ gApi.groups().id(group.get()).addGroups(subgroupUuid);
- List<GroupInfo> subgroups = gApi.groups().id(g).includedGroups();
+ List<GroupInfo> subgroups = gApi.groups().id(group.get()).includedGroups();
assertThat(subgroups).hasSize(1);
assertThat(subgroups.get(0).id).isEqualTo(subgroupUuid.replace(":", "%3A"));
assertThat(subgroups.get(0).name).isEqualTo("Registered Users");
assertThat(subgroups.get(0).groupId).isNull();
- List<? extends GroupAuditEventInfo> auditEvents = gApi.groups().id(g).auditLog();
+ List<? extends GroupAuditEventInfo> auditEvents = gApi.groups().id(group.get()).auditLog();
assertThat(auditEvents).hasSize(1);
assertSubgroupAuditEvent(auditEvents.get(0), Type.ADD_GROUP, admin.id, "Registered Users");
}
@Test
public void includeExistingGroup_OK() throws Exception {
- String p = createUniqueGroup();
- String g = createUniqueGroup();
- gApi.groups().id(p).addGroups(g);
- assertIncludes(p, g);
- gApi.groups().id(p).addGroups(g);
- assertIncludes(p, g);
+ AccountGroup.UUID parent = groupOperations.newGroup().create();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
+ groupOperations.group(parent).forUpdate().addSubgroup(group);
+
+ gApi.groups().id(parent.get()).addGroups(group.get());
+
+ ImmutableSet<AccountGroup.UUID> subgroups = groupOperations.group(parent).get().subgroups();
+ assertThat(subgroups).containsExactly(group);
}
@Test
public void addMultipleIncludes() throws Exception {
- String p = createUniqueGroup();
- String g1 = createUniqueGroup();
- String g2 = createUniqueGroup();
- gApi.groups().id(p).addGroups(g1, g2);
- assertIncludes(p, g1, g2);
+ AccountGroup.UUID parent = groupOperations.newGroup().create();
+ AccountGroup.UUID group1 = groupOperations.newGroup().create();
+ AccountGroup.UUID group2 = groupOperations.newGroup().create();
+
+ gApi.groups().id(parent.get()).addGroups(group1.get(), group2.get());
+
+ ImmutableSet<AccountGroup.UUID> subgroups = groupOperations.group(parent).get().subgroups();
+ assertThat(subgroups).containsExactly(group1, group2);
}
@Test
@@ -635,33 +623,39 @@
@Test
public void listEmptyGroupIncludes() throws Exception {
- String gx = createUniqueGroup();
- assertThat(gApi.groups().id(gx).includedGroups()).isEmpty();
+ AccountGroup.UUID gx = groupOperations.newGroup().create();
+ assertThat(gApi.groups().id(gx.get()).includedGroups()).isEmpty();
}
@Test
public void includeNonExistingGroup() throws Exception {
- String gx = createUniqueGroup();
+ AccountGroup.UUID gx = groupOperations.newGroup().create();
exception.expect(UnprocessableEntityException.class);
- gApi.groups().id(gx).addGroups("non-existing");
+ gApi.groups().id(gx.get()).addGroups("non-existing");
}
@Test
public void listNonEmptyGroupIncludes() throws Exception {
- String gx = createUniqueGroup();
- String gy = createUniqueGroup();
- String gz = createUniqueGroup();
- gApi.groups().id(gx).addGroups(gy);
- gApi.groups().id(gx).addGroups(gz);
- assertIncludes(gApi.groups().id(gx).includedGroups(), gy, gz);
+ AccountGroup.UUID gz = groupOperations.newGroup().create();
+ AccountGroup.UUID gy = groupOperations.newGroup().create();
+ AccountGroup.UUID gx = groupOperations.newGroup().subgroups(gy, gz).create();
+
+ List<GroupInfo> includes = gApi.groups().id(gx.get()).includedGroups();
+
+ String gyName = groupOperations.group(gy).get().name();
+ String gzName = groupOperations.group(gz).get().name();
+ assertIncludes(includes, gyName, gzName);
}
@Test
public void listOneIncludeMember() throws Exception {
- String gx = createUniqueGroup();
- String gy = createUniqueGroup();
- gApi.groups().id(gx).addGroups(gy);
- assertIncludes(gApi.groups().id(gx).includedGroups(), gy);
+ AccountGroup.UUID gy = groupOperations.newGroup().create();
+ AccountGroup.UUID gx = groupOperations.newGroup().subgroups(gy).create();
+
+ List<GroupInfo> includes = gApi.groups().id(gx.get()).includedGroups();
+
+ String gyName = groupOperations.group(gy).get().name();
+ assertIncludes(includes, gyName);
}
@Test
@@ -672,101 +666,101 @@
@Test
public void listEmptyGroupMembers() throws Exception {
- String group = createUniqueGroup();
- assertThat(gApi.groups().id(group).members()).isEmpty();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
+ assertThat(gApi.groups().id(group.get()).members()).isEmpty();
}
@Test
public void listNonEmptyGroupMembers() throws Exception {
- String group = createUniqueGroup();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
String user1 = name("user1");
accountOperations.newAccount().username(user1).create();
String user2 = name("user2");
accountOperations.newAccount().username(user2).create();
- gApi.groups().id(group).addMembers(user1, user2);
+ gApi.groups().id(group.get()).addMembers(user1, user2);
- assertMembers(gApi.groups().id(group).members(), user1, user2);
+ assertMembers(gApi.groups().id(group.get()).members(), user1, user2);
}
@Test
public void listOneGroupMember() throws Exception {
- String group = createUniqueGroup();
+ AccountGroup.UUID group = groupOperations.newGroup().create();
String user = name("user1");
accountOperations.newAccount().username(user).create();
- gApi.groups().id(group).addMembers(user);
+ gApi.groups().id(group.get()).addMembers(user);
- assertMembers(gApi.groups().id(group).members(), user);
+ assertMembers(gApi.groups().id(group.get()).members(), user);
}
@Test
public void listGroupMembersRecursively() throws Exception {
- String gx = createUniqueGroup();
+ AccountGroup.UUID gx = groupOperations.newGroup().create();
String ux = name("ux");
accountOperations.newAccount().username(ux).create();
- gApi.groups().id(gx).addMembers(ux);
+ gApi.groups().id(gx.get()).addMembers(ux);
- String gy = createUniqueGroup();
+ AccountGroup.UUID gy = groupOperations.newGroup().create();
String uy = name("uy");
accountOperations.newAccount().username(uy).create();
- gApi.groups().id(gy).addMembers(uy);
+ gApi.groups().id(gy.get()).addMembers(uy);
- String gz = createUniqueGroup();
+ AccountGroup.UUID gz = groupOperations.newGroup().create();
String uz = name("uz");
accountOperations.newAccount().username(uz).create();
- gApi.groups().id(gz).addMembers(uz);
+ gApi.groups().id(gz.get()).addMembers(uz);
- gApi.groups().id(gx).addGroups(gy);
- gApi.groups().id(gy).addGroups(gz);
- assertMembers(gApi.groups().id(gx).members(), ux);
- assertMembers(gApi.groups().id(gx).members(true), ux, uy, uz);
+ gApi.groups().id(gx.get()).addGroups(gy.get());
+ gApi.groups().id(gy.get()).addGroups(gz.get());
+ assertMembers(gApi.groups().id(gx.get()).members(), ux);
+ assertMembers(gApi.groups().id(gx.get()).members(true), ux, uy, uz);
}
@Test
public void usersSeeTheirDirectMembershipWhenListingMembersRecursively() throws Exception {
- String group = createUniqueGroup();
- gApi.groups().id(group).addMembers(user.username);
+ AccountGroup.UUID group = groupOperations.newGroup().create();
+ gApi.groups().id(group.get()).addMembers(user.username);
setApiUser(user);
- assertMembers(gApi.groups().id(group).members(true), user.fullName);
+ assertMembers(gApi.groups().id(group.get()).members(true), user.fullName);
}
@Test
public void usersDoNotSeeTheirIndirectMembershipWhenListingMembersRecursively() throws Exception {
- String group1 = createUniqueGroup();
- String group2 = createUniqueGroup();
- gApi.groups().id(group1).addGroups(group2);
- gApi.groups().id(group2).addMembers(user.username);
+ AccountGroup.UUID group1 = groupOperations.newGroup().ownerGroupUuid(adminGroupUuid()).create();
+ AccountGroup.UUID group2 = groupOperations.newGroup().ownerGroupUuid(adminGroupUuid()).create();
+ gApi.groups().id(group1.get()).addGroups(group2.get());
+ gApi.groups().id(group2.get()).addMembers(user.username);
setApiUser(user);
- List<AccountInfo> listedMembers = gApi.groups().id(group1).members(true);
+ List<AccountInfo> listedMembers = gApi.groups().id(group1.get()).members(true);
assertMembers(listedMembers);
}
@Test
public void adminsSeeTheirIndirectMembershipWhenListingMembersRecursively() throws Exception {
- String ownerGroup = createGroup("ownerGroup", null);
- String group1 = createGroup("group1", ownerGroup);
- String group2 = createGroup("group2", ownerGroup);
- gApi.groups().id(group1).addGroups(group2);
- gApi.groups().id(group2).addMembers(admin.username);
+ AccountGroup.UUID ownerGroup = groupOperations.newGroup().create();
+ AccountGroup.UUID group1 = groupOperations.newGroup().ownerGroupUuid(ownerGroup).create();
+ AccountGroup.UUID group2 = groupOperations.newGroup().ownerGroupUuid(ownerGroup).create();
+ gApi.groups().id(group1.get()).addGroups(group2.get());
+ gApi.groups().id(group2.get()).addMembers(admin.username);
- List<AccountInfo> listedMembers = gApi.groups().id(group1).members(true);
+ List<AccountInfo> listedMembers = gApi.groups().id(group1.get()).members(true);
assertMembers(listedMembers, admin.fullName);
}
@Test
public void ownersSeeTheirIndirectMembershipWhenListingMembersRecursively() throws Exception {
- String ownerGroup = createGroup("ownerGroup", null);
- String group1 = createGroup("group1", ownerGroup);
- String group2 = createGroup("group2", ownerGroup);
- gApi.groups().id(group1).addGroups(group2);
- gApi.groups().id(ownerGroup).addMembers(user.username);
- gApi.groups().id(group2).addMembers(user.username);
+ AccountGroup.UUID ownerGroup = groupOperations.newGroup().create();
+ AccountGroup.UUID group1 = groupOperations.newGroup().ownerGroupUuid(ownerGroup).create();
+ AccountGroup.UUID group2 = groupOperations.newGroup().ownerGroupUuid(ownerGroup).create();
+ gApi.groups().id(group1.get()).addGroups(group2.get());
+ gApi.groups().id(ownerGroup.get()).addMembers(user.username);
+ gApi.groups().id(group2.get()).addMembers(user.username);
setApiUser(user);
- List<AccountInfo> listedMembers = gApi.groups().id(group1).members(true);
+ List<AccountInfo> listedMembers = gApi.groups().id(group1.get()).members(true);
assertMembers(listedMembers, user.fullName);
}
@@ -789,18 +783,21 @@
@Test
public void getGroupsByOwner() throws Exception {
- String parent = createUniqueGroup();
- List<String> children =
- Arrays.asList(createGroup("test-child1", parent), createGroup("test-child2", parent));
+ AccountGroup.UUID parent = groupOperations.newGroup().ownerGroupUuid(adminGroupUuid()).create();
+ List<AccountGroup.UUID> children =
+ Arrays.asList(
+ groupOperations.newGroup().ownerGroupUuid(parent).create(),
+ groupOperations.newGroup().ownerGroupUuid(parent).create());
// By UUID
- List<GroupInfo> owned = gApi.groups().list().withOwnedBy(groupUuid(parent).get()).get();
- assertThat(owned.stream().map(g -> g.name).collect(toList()))
+ List<GroupInfo> owned = gApi.groups().list().withOwnedBy(parent.get()).get();
+ assertThat(owned.stream().map(g -> new AccountGroup.UUID(g.id)).collect(toList()))
.containsExactlyElementsIn(children);
// By name
- owned = gApi.groups().list().withOwnedBy(parent).get();
- assertThat(owned.stream().map(g -> g.name).collect(toList()))
+ String parentName = groupOperations.group(parent).get().name();
+ owned = gApi.groups().list().withOwnedBy(parentName).get();
+ assertThat(owned.stream().map(g -> new AccountGroup.UUID(g.id)).collect(toList()))
.containsExactlyElementsIn(children);
// By group that does not own any others
@@ -1495,24 +1492,12 @@
.inOrder();
}
- private void assertNoMembers(String group) throws Exception {
- assertThat(gApi.groups().id(group).members()).isEmpty();
- }
-
- private void assertIncludes(String group, String... expectedNames) throws Exception {
- assertIncludes(gApi.groups().id(group).includedGroups(), expectedNames);
- }
-
- private static void assertIncludes(Iterable<GroupInfo> includes, String... expectedNames) {
- Iterable<String> names = Iterables.transform(includes, i -> i.name);
+ private static void assertIncludes(List<GroupInfo> includes, String... expectedNames) {
+ List<String> names = includes.stream().map(i -> i.name).collect(toImmutableList());
assertThat(names).containsExactlyElementsIn(Arrays.asList(expectedNames));
assertThat(names).isOrdered();
}
- private void assertNoIncludes(String group) throws Exception {
- assertThat(gApi.groups().id(group).includedGroups()).isEmpty();
- }
-
private void assertBadRequest(ListRequest req) throws Exception {
try {
req.get();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java b/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
index 936feed..c2d3817 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
@@ -130,7 +130,7 @@
public void pushDraftsWithPrivateByDefaultAndDisablePrivateChangesTrue() throws Exception {
setPrivateByDefault(project2, InheritableBoolean.TRUE);
- RevCommit initialHead = getRemoteHead();
+ RevCommit initialHead = getRemoteHead(project2, "master");
TestRepository<InMemoryRepository> testRepo = cloneProject(project2);
PushOneCommit.Result result =
pushFactory.create(db, admin.getIdent(), testRepo).to("refs/for/master%draft");
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 14fe4de..19ea44b 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -45,7 +45,7 @@
case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
case V6_5:
- return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.1";
+ return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.2";
case V7_0:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-alpha1";
}
diff --git a/lib/commons/BUILD b/lib/commons/BUILD
index bb36389..93d3c2f 100644
--- a/lib/commons/BUILD
+++ b/lib/commons/BUILD
@@ -3,21 +3,18 @@
java_library(
name = "codec",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-codec//jar"],
)
java_library(
name = "compress",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-compress//jar"],
)
java_library(
name = "lang",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-lang//jar"],
)
@@ -30,14 +27,12 @@
java_library(
name = "net",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-net//jar"],
)
java_library(
name = "dbcp",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-dbcp//jar"],
runtime_deps = [":pool"],
)
@@ -45,20 +40,17 @@
java_library(
name = "pool",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-pool//jar"],
)
java_library(
name = "validator",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-validator//jar"],
)
java_library(
name = "io",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-io//jar"],
)
diff --git a/lib/elasticsearch-rest-client/BUILD b/lib/elasticsearch-rest-client/BUILD
index c6357d0..8df3c70 100644
--- a/lib/elasticsearch-rest-client/BUILD
+++ b/lib/elasticsearch-rest-client/BUILD
@@ -3,6 +3,5 @@
java_library(
name = "elasticsearch-rest-client",
data = ["//lib:LICENSE-elasticsearch"],
- visibility = ["//visibility:public"],
exports = ["@elasticsearch-rest-client//jar"],
)
diff --git a/lib/greenmail/BUILD b/lib/greenmail/BUILD
index b09f27b..5d8e1d6 100644
--- a/lib/greenmail/BUILD
+++ b/lib/greenmail/BUILD
@@ -13,7 +13,6 @@
name = "greenmail",
testonly = 1,
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@greenmail//jar"],
runtime_deps = select({
"//:java9": POST_JDK8_DEPS,
diff --git a/lib/httpcomponents/BUILD b/lib/httpcomponents/BUILD
index 74cca14..03d9b68 100644
--- a/lib/httpcomponents/BUILD
+++ b/lib/httpcomponents/BUILD
@@ -3,7 +3,6 @@
java_library(
name = "fluent-hc",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@fluent-hc//jar"],
runtime_deps = [":httpclient"],
)
@@ -11,7 +10,6 @@
java_library(
name = "httpclient",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@httpclient//jar"],
runtime_deps = [
":httpcore",
@@ -23,7 +21,6 @@
java_library(
name = "httpcore",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@httpcore//jar"],
)
diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 3d751ab..0034748 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -1,5 +1,3 @@
-package(default_visibility = ["//visibility:public"])
-
java_library(
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],
diff --git a/lib/lucene/BUILD b/lib/lucene/BUILD
index 421caed..eab2ac8 100644
--- a/lib/lucene/BUILD
+++ b/lib/lucene/BUILD
@@ -11,13 +11,11 @@
"@lucene-core//jar",
],
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
)
java_library(
name = "lucene-analyzers-common",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-analyzers-common//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -25,14 +23,12 @@
java_library(
name = "lucene-core",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-core//jar"],
)
java_library(
name = "lucene-misc",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-misc//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -40,7 +36,6 @@
java_library(
name = "lucene-queryparser",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-queryparser//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
diff --git a/lib/polymer_externs/BUILD b/lib/polymer_externs/BUILD
index 2f1bdbd..cd71d64 100644
--- a/lib/polymer_externs/BUILD
+++ b/lib/polymer_externs/BUILD
@@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package(
- default_visibility = ["//visibility:public"],
-)
+package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
diff --git a/plugins/reviewnotes b/plugins/reviewnotes
index 863130d..fdbadf3 160000
--- a/plugins/reviewnotes
+++ b/plugins/reviewnotes
@@ -1 +1 @@
-Subproject commit 863130de158605c19809956864870ff05d86b494
+Subproject commit fdbadf312d829990d3a4be3491d13a79d6c0cf5b
diff --git a/polygerrit-ui/BUILD b/polygerrit-ui/BUILD
index 384f835..5889ffd 100644
--- a/polygerrit-ui/BUILD
+++ b/polygerrit-ui/BUILD
@@ -1,6 +1,4 @@
-package(
- default_visibility = ["//visibility:public"],
-)
+package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
load("//tools/bzl:js.bzl", "bower_component_bundle")
@@ -51,7 +49,6 @@
"zip -qr $$ROOT/$@ fonts",
]),
output_to_bindir = 1,
- visibility = ["//visibility:public"],
)
go_binary(
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index c735746..0aa70b8 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -1,6 +1,4 @@
-package(
- default_visibility = ["//visibility:public"],
-)
+package(default_visibility = ["//visibility:public"])
load(":rules.bzl", "polygerrit_bundle")
load("//tools/bzl:genrule2.bzl", "genrule2")
