SAK-44840 - Assignments / grade report missing student record if same…

… name as another student (sakaiproject#8926)
chundcm · Jan 4, 2021 · 2fa4eab · 2fa4eab
1 parent ed77d6e
commit 2fa4eab
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java
@@ -34,6 +34,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
@@ -449,17 +450,8 @@ public int hashCode() {
 
         @Override
         public int compareTo(Submitter o) {
-            int value = Boolean.compare(this.anonymous, o.anonymous);
-            if (value == 0) {
-                if (anonymous) {
-                    // Sort by ID for anonymous ones
-                    value = this.id.compareTo(o.id);
-                } else {
-                    // Sort by sortName for normal ones.
-                    value = this.sortName.compareTo(o.sortName);
-                }
-            }
-            return value;
+            // Sort by sortName for normal ones, but id if they're the same
+            return new CompareToBuilder().append(this.sortName, o.sortName).append(this.id, o.id).toComparison();
         }
 
         void setNotes(Optional<List<String>> notes) {