diff --git a/java/com/google/gerrit/server/group/GetAuditLog.java b/java/com/google/gerrit/server/group/GetAuditLog.java index fcdafdc68c..52a9dd9afe 100644 --- a/java/com/google/gerrit/server/group/GetAuditLog.java +++ b/java/com/google/gerrit/server/group/GetAuditLog.java @@ -138,9 +138,7 @@ public class GetAuditLog implements RestReadView { 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; } } diff --git a/java/com/google/gerrit/server/group/db/Groups.java b/java/com/google/gerrit/server/group/db/Groups.java index 53f437a079..ba60fbc823 100644 --- a/java/com/google/gerrit/server/group/db/Groups.java +++ b/java/com/google/gerrit/server/group/db/Groups.java @@ -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 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 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(); } }