opendev/gerrit
Code Issues Proposed changes

Merge "Remove unnecessary sorts for reading audit log"

Browse Source
This commit is contained in:
Edwin Kempin
2017-11-20 08:27:02 +00:00
committed by Gerrit Code Review
parent 1df0328c38 c74cb80787
commit ca5029edf6
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/group/GetAuditLog.java
View File

@@ -138,9 +138,7 @@ public class GetAuditLog implements RestReadView<GroupResource> {
accountLoader.fill();
// sort by date and then reverse so that the newest audit event comes first
Collections.sort(auditEvents, comparing((GroupAuditEventInfo a) -> a.date));
Collections.reverse(auditEvents);
Collections.sort(auditEvents, comparing((GroupAuditEventInfo a) -> a.date).reversed());
return auditEvents;
}
}

12
java/com/google/gerrit/server/group/db/Groups.java
View File

@@ -15,7 +15,6 @@
package com.google.gerrit.server.group.db;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.Comparator.comparing;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -40,7 +39,6 @@ import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
@@ -331,10 +329,7 @@ public class Groups {
return ImmutableList.of();
}
List<AccountGroupMemberAudit> audits =
db.accountGroupMembersAudit().byGroup(group.get().getId()).toList();
Collections.sort(audits, comparing((AccountGroupMemberAudit a) -> a.getAddedOn()));
return audits;
return db.accountGroupMembersAudit().byGroup(group.get().getId()).toList();
}
/**
@@ -359,9 +354,6 @@ public class Groups {
return ImmutableList.of();
}
List<AccountGroupByIdAud> audits =
db.accountGroupByIdAud().byGroup(group.get().getId()).toList();
Collections.sort(audits, comparing((AccountGroupByIdAud a) -> a.getAddedOn()));
return audits;
return db.accountGroupByIdAud().byGroup(group.get().getId()).toList();
}
}