opendev/gerrit
Code Issues Proposed changes

Sort the group agreements for Schema_65.

Browse Source 
Currently the commits to All-Projects project.config history for the
migration to Schema_65 are not in time order. Updated
getAccountGroupAgreements() to sort the returned
AccountGroupAgreements.

Change-Id: Icb1d0037d7c845c10444ac3f9cf4ae183033219a
This commit is contained in:
Colby Ranger
2012-04-24 17:19:16 -07:00
parent 1eee2c9d8f
commit c785bee07c
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_65.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.server.schema;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.primitives.Longs;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.ContributorAgreement;
import com.google.gerrit.common.data.GlobalCapability;
@@ -55,6 +56,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Timestamp;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -447,6 +449,13 @@ public class Schema_65 extends SchemaVersion {
}
groupAgreements.add(a);
}
Collections.sort(groupAgreements, new Comparator<AccountGroupAgreement>() {
@Override
public int compare(
AccountGroupAgreement a1, AccountGroupAgreement a2) {
return Longs.compare(a1.getTime(), a2.getTime());
}
});
return groupAgreements;
} finally {
rs.close();