From c74cb80787bf770d596541c53be1d0d6deeb8bf8 Mon Sep 17 00:00:00 2001
From: Changcheng Xiao <xchangcheng@google.com>
Date: Mon, 20 Nov 2017 08:47:36 +0100
Subject: [PATCH] Remove unnecessary sorts for reading audit log

Since we have been able to set time step in tests, now we only
need to sort those audit logs in the end.

Change-Id: Idee036fc93adb2ef8b8718274000dffa8ebe829a
---
 java/com/google/gerrit/server/group/GetAuditLog.java |  4 +---
 java/com/google/gerrit/server/group/db/Groups.java   | 12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/java/com/google/gerrit/server/group/GetAuditLog.java b/java/com/google/gerrit/server/group/GetAuditLog.java
index 58a057be8c..6bd9586b1b 100644
--- a/java/com/google/gerrit/server/group/GetAuditLog.java
+++ b/java/com/google/gerrit/server/group/GetAuditLog.java
@@ -127,9 +127,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;
   }
 }
diff --git a/java/com/google/gerrit/server/group/db/Groups.java b/java/com/google/gerrit/server/group/db/Groups.java
index 7f63021f9c..7116b40135 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;
@@ -329,10 +327,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();
   }
 
   /**
@@ -355,9 +350,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();
   }
 }