commit 53f55312bf64c2a53482ff7f75ee138c0baac6fd
author Edwin Kempin <ekempin@google.com> Tue Mar 20 11:37:38 2018 +0100
committer Edwin Kempin <ekempin@google.com> Thu Mar 22 08:27:09 2018 +0100
tree 5f925d7b578f9c24f2593662df6df6e9b8cdb23d
parent 0b992cc55e55bd4e1190f9bd6a579e5d41393948

GroupBundle.Factory: Make fromReviewDb method static

This will allow us to use this method from the schema migration that
implements the migration of Gerrit groups to NoteDb.

Change-Id: I12ba4a0217ae9479f32c6c5f3fc0a834fd127e30
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/group/db/GroupBundle.java

diff --git a/java/com/google/gerrit/server/group/db/GroupBundle.java b/java/com/google/gerrit/server/group/db/GroupBundle.java
index 086eeb4..2710ccb 100644
--- a/java/com/google/gerrit/server/group/db/GroupBundle.java
+++ b/java/com/google/gerrit/server/group/db/GroupBundle.java
@@ -154,7 +154,8 @@
           auditLogReader.getSubgroupsAudit(repo, uuid));
     }
 
-    public GroupBundle fromReviewDb(ReviewDb db, AccountGroup.Id groupId) throws OrmException {
+    public static GroupBundle fromReviewDb(ReviewDb db, AccountGroup.Id groupId)
+        throws OrmException {
       JdbcSchema jdbcSchema = ReviewDbWrapper.unwrapJbdcSchema(db);
       AccountGroup group = readAccountGroupFromReviewDb(jdbcSchema, groupId);
 

javatests/com/google/gerrit/acceptance/api/group/GroupRebuilderIT.java

diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupRebuilderIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupRebuilderIT.java
index 6da8bab..57225a8 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/GroupRebuilderIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/group/GroupRebuilderIT.java
@@ -86,7 +86,7 @@
   public void basicGroupProperties() throws Exception {
     GroupInfo createdGroup = gApi.groups().create(name("group")).get();
     GroupBundle reviewDbBundle =
-        bundleFactory.fromReviewDb(db, new AccountGroup.Id(createdGroup.groupId));
+        GroupBundle.Factory.fromReviewDb(db, new AccountGroup.Id(createdGroup.groupId));
     deleteGroupRefs(reviewDbBundle);
 
     assertMigratedCleanly(rebuild(reviewDbBundle), reviewDbBundle);
@@ -108,7 +108,7 @@
     }
 
     GroupBundle reviewDbBundle =
-        bundleFactory.fromReviewDb(db, new AccountGroup.Id(group1.groupId));
+        GroupBundle.Factory.fromReviewDb(db, new AccountGroup.Id(group1.groupId));
     deleteGroupRefs(reviewDbBundle);
 
     GroupBundle noteDbBundle = rebuild(reviewDbBundle);
@@ -169,7 +169,8 @@
     AccountGroupByIdAud audit = new AccountGroupByIdAud(byId, admin.id, TimeUtil.nowTs());
     db.accountGroupByIdAud().insert(Collections.singleton(audit));
 
-    GroupBundle reviewDbBundle = bundleFactory.fromReviewDb(db, new AccountGroup.Id(group.groupId));
+    GroupBundle reviewDbBundle =
+        GroupBundle.Factory.fromReviewDb(db, new AccountGroup.Id(group.groupId));
     deleteGroupRefs(reviewDbBundle);
 
     GroupBundle noteDbBundle = rebuild(reviewDbBundle);