commit ba0ddab0b1219b1eba567de4dad757f7e5a3b66a
author Joerg Zieren <zieren@google.com> Wed Jul 08 17:40:39 2020 +0200
committer Joerg Zieren <zieren@google.com> Wed Jul 08 17:48:11 2020 +0200
tree c511fc8cf37482e386268bfef8a201adf526875b
parent d09b35cd04a8f437a3a5afca152bf10822ab1ea6

Fix: Sort copyValues

LabelType was converted to AutoValue in change 273359, but we forgot
to copy the code to sort this field.

Change-Id: Ie48f040e238cd3b62872b5bcbdc06c608b6457a5

java/com/google/gerrit/common/data/LabelType.java

diff --git a/java/com/google/gerrit/common/data/LabelType.java b/java/com/google/gerrit/common/data/LabelType.java
index 9c1423d..3e58be7 100644
--- a/java/com/google/gerrit/common/data/LabelType.java
+++ b/java/com/google/gerrit/common/data/LabelType.java
@@ -259,6 +259,8 @@
 
     protected abstract String getName();
 
+    protected abstract ImmutableList<Short> getCopyValues();
+
     protected abstract Builder setByValue(ImmutableMap<Short, LabelValue> byValue);
 
     @Nullable
@@ -290,6 +292,8 @@
       }
       setByValue(byValue.build());
 
+      setCopyValues(ImmutableList.sortedCopyOf(getCopyValues()));
+
       return autoBuild();
     }
   }